Stateful PCE module

- PCE changes to consider link & node states on path & graph calculation
- Modify PCE tests to include admin & oper state in node & link creation
- Added link and node states in topologies sample config xml file
- Set states for nodes, links and TPs in otn-topology to fix TAPI tests

JIRA: TRNSPRTPCE-361
Change-Id: I34db90b2fc3bf5d176f3a5aeb5dc83e9bfe66432
Signed-off-by: Javier <errea@eurecom.fr>

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java
index 12b69c3666eb1755c3bdbb29652883cb27bc6d13..101e52c2f85b0b1fbfe032f82f946f7b9c3f855c 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopology.java
@@ -20,7 +20,9 @@ import org.opendaylight.transportpce.networkmodel.dto.OtnTopoNode;
 import org.opendaylight.transportpce.networkmodel.dto.TopologyShard;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.Nodes;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.XpdrNodeTypes;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.AdminStates;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev200327.xpdr.odu.switching.pools.OduSwitchingPools;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev200327.xpdr.odu.switching.pools.OduSwitchingPoolsBuilder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev200327.xpdr.odu.switching.pools.OduSwitchingPoolsKey;
@@ -250,8 +252,10 @@ public final class OpenRoadmOtnTopology {
                 new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1Builder(
                         ietfLinkAZBldr.augmentation(
                             org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1.class))
-                    .setLinkType(OpenroadmLinkType.OTNLINK)
-                    .build());
+                        .setLinkType(OpenroadmLinkType.OTNLINK)
+                        .setOperationalState(State.InService)
+                        .setAdministrativeState(AdminStates.InService)
+                        .build());
         links.add(ietfLinkAZBldr.build());
         // create link Z-A
         LinkBuilder ietfLinkZABldr = TopologyUtils.createLink(nodeZTopo, nodeATopo, tpZ, tpA, linkIdPrefix);
@@ -262,8 +266,10 @@ public final class OpenRoadmOtnTopology {
                 new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1Builder(
                         ietfLinkZABldr.augmentation(
                             org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1.class))
-                    .setLinkType(OpenroadmLinkType.OTNLINK)
-                    .build());
+                        .setLinkType(OpenroadmLinkType.OTNLINK)
+                        .setOperationalState(State.InService)
+                        .setAdministrativeState(AdminStates.InService)
+                        .build());
         links.add(ietfLinkZABldr.build());
         return links;
     }
@@ -413,7 +419,10 @@ public final class OpenRoadmOtnTopology {
             .build();
         org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1 ocnNodeAug =
             new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1Builder()
-            .setNodeType(OpenroadmNodeType.TPDR).build();
+                    .setNodeType(OpenroadmNodeType.TPDR)
+                    .setOperationalState(State.InService)
+                    .setAdministrativeState(AdminStates.InService)
+                    .build();
         // create ietf node augmentation to add TP list
         Map<TerminationPointKey,TerminationPoint> tpMap = new HashMap<>();
         // creation of tps
@@ -474,7 +483,10 @@ public final class OpenRoadmOtnTopology {
             .build();
         org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1 ocnNodeAug =
             new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1Builder()
-            .setNodeType(OpenroadmNodeType.MUXPDR).build();
+                    .setNodeType(OpenroadmNodeType.MUXPDR)
+                    .setAdministrativeState(AdminStates.InService)
+                    .setOperationalState(State.InService)
+                    .build();
 
         // create ietf node augmentation to add TP list
         Map<TerminationPointKey, TerminationPoint> tpMap = new HashMap<>();
@@ -541,7 +553,10 @@ public final class OpenRoadmOtnTopology {
             .build();
         org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1 ocnNodeAug =
             new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1Builder()
-            .setNodeType(OpenroadmNodeType.SWITCH).build();
+                    .setNodeType(OpenroadmNodeType.SWITCH)
+                    .setOperationalState(State.InService)
+                    .setAdministrativeState(AdminStates.InService)
+                    .build();
 
         // create ietf node augmentation to add TP list
         Map<TerminationPointKey, TerminationPoint> tpMap = new HashMap<>();
@@ -721,7 +736,10 @@ public final class OpenRoadmOtnTopology {
         }
         org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1 ocnTp =
             new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1Builder()
-            .setTpType(tpType).build();
+                    .setTpType(tpType)
+                    .setAdministrativeState(AdminStates.InService)
+                    .setOperationalState(State.InService)
+                    .build();
 
         ietfTpBldr.setTpId(tpId)
             .withKey(new TerminationPointKey(tpId))

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PceGraph.java b/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PceGraph.java
index b29e4dbce8103d3af71e4f4204941659f7598ead..9f876f471d34a2a92b1cf48b05a97d56c99375d8 100644 (file)
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PceGraph.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PceGraph.java
@@ -24,6 +24,7 @@ import org.opendaylight.transportpce.pce.networkanalyzer.PceLink;
 import org.opendaylight.transportpce.pce.networkanalyzer.PceNode;
 import org.opendaylight.transportpce.pce.networkanalyzer.PceResult;
 import org.opendaylight.transportpce.pce.networkanalyzer.PceResult.LocalCause;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NodeId;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -180,8 +181,10 @@ public class PceGraph {
         Iterator<Map.Entry<NodeId, PceNode>> nodes = allPceNodes.entrySet().iterator();
         while (nodes.hasNext()) {
             Map.Entry<NodeId, PceNode> node = nodes.next();
-            weightedGraph.addVertex(node.getValue().getNodeId().getValue());
-            LOG.debug("In populateWithNodes in node :  {}", node.getValue());
+            if (State.InService.equals(node.getValue().getState())) {
+                weightedGraph.addVertex(node.getValue().getNodeId().getValue());
+                LOG.debug("In populateWithNodes in node :  {}", node.getValue());
+            }
         }
     }
 
@@ -203,11 +206,12 @@ public class PceGraph {
                 if (!validateLinkforGraph(link)) {
                     continue;
                 }
+                if (State.InService.equals(link.getState())) {
+                    PceGraphEdge graphLink = new PceGraphEdge(link);
+                    weightedGraph.addEdge(link.getSourceId().getValue(), link.getDestId().getValue(), graphLink);
 
-                PceGraphEdge graphLink = new PceGraphEdge(link);
-                weightedGraph.addEdge(link.getSourceId().getValue(), link.getDestId().getValue(), graphLink);
-
-                weightedGraph.setEdgeWeight(graphLink, chooseWeight(link));
+                    weightedGraph.setEdgeWeight(graphLink, chooseWeight(link));
+                }
             }
         }
         return true;

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java
index d3c73e8baa2404a3242f9030a817675181d77cb9..508191f3a350c67fb66fbc5cfda4041b02b7554f 100644 (file)
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java
@@ -29,7 +29,9 @@ import org.opendaylight.transportpce.common.network.NetworkTransactionService;
 import org.opendaylight.transportpce.pce.constraints.PceConstraints;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.PathComputationRequestInput;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev201012.network.nodes.McCapabilities;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmLinkType;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmNodeType;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NetworkId;
@@ -353,6 +355,7 @@ public class PceCalculation {
         NodeId destId = link.getDestination().getDestNode();
         PceNode source = allPceNodes.get(sourceId);
         PceNode dest = allPceNodes.get(destId);
+        State state = link.augmentation(Link1.class).getOperationalState();
 
         if (source == null) {
             LOG.debug("validateLink: Link is ignored due source node is rejected by node validation - {}",
@@ -365,6 +368,12 @@ public class PceCalculation {
             return false;
         }
 
+        if (State.OutOfService.equals(state)) {
+            LOG.debug("validateLink: Link is ignored due operational state - {}",
+                    state.getName());
+            return false;
+        }
+
         if ((StringConstants.SERVICE_TYPE_100GE.equals(serviceType))
                 || (StringConstants.SERVICE_TYPE_OTU4.equals(serviceType))) {
             // 100GE or OTU4 services are handled at WDM Layer
@@ -485,6 +494,11 @@ public class PceCalculation {
             LOG.error("getNodeType: no Node1 (type) Augmentation for node: [{}]. Node is ignored", node.getNodeId());
             return false;
         }
+        if (State.OutOfService.equals(node1.getOperationalState())) {
+            LOG.error("getNodeType: node is ignored due to operational state - {}", node1.getOperationalState()
+                    .getName());
+            return false;
+        }
         OpenroadmNodeType nodeType = node1.getNodeType();
         String deviceNodeId = MapUtils.getSupNetworkNode(node);
         // Should never happen but because of existing topology test files

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLink.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLink.java
index a752e41303eae0a5b6a2620353b95bfee5ba7f54..4c754507cc11aee21fbe68c44c61f4357694f746 100644 (file)
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLink.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLink.java
@@ -17,6 +17,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.AdminStates;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.span.attributes.LinkConcatenation;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.span.attributes.LinkConcatenation.FiberType;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.span.attributes.LinkConcatenationKey;
@@ -58,6 +60,8 @@ public class PceLink implements Serializable {
     private final String sourceCLLI;
     private final String destCLLI;
     private final LinkId oppositeLink;
+    private final AdminStates adminStates;
+    private final State state;
     private final Long latency;
     private final Long availableBandwidth;
     private final Long usedBandwidth;
@@ -92,6 +96,9 @@ public class PceLink implements Serializable {
 
         this.oppositeLink = calcOpposite(link);
 
+        this.adminStates = link.augmentation(Link1.class).getAdministrativeState();
+        this.state = link.augmentation(Link1.class).getOperationalState();
+
         if (this.linkType == OpenroadmLinkType.ROADMTOROADM) {
             this.omsAttributesSpan = MapUtils.getOmsAttributesSpan(link);
             this.srlgList = MapUtils.getSRLG(link);
@@ -210,6 +217,14 @@ public class PceLink implements Serializable {
         return oppositeLink;
     }
 
+    public AdminStates getAdminStates() {
+        return adminStates;
+    }
+
+    public State getState() {
+        return state;
+    }
+
     public Object getSourceTP() {
         return sourceTP;
     }
@@ -359,6 +374,10 @@ public class PceLink implements Serializable {
             LOG.error("PceLink: No Link type or opposite link is available. Link is ignored {}", linkId);
             return false;
         }
+        if ((this.adminStates == null) || (this.state == null)) {
+            LOG.error("PceLink: Link is not available. Link is ignored {}", linkId);
+            return false;
+        }
         if ((this.sourceId == null) || (this.destId == null) || (this.sourceTP == null) || (this.destTP == null)) {
             LOG.error("PceLink: No Link source or destination is available. Link is ignored {}", linkId);
             return false;

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceNode.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceNode.java
index 27f99331f43a527c03980ff534574fc4bbfe2ed0..bc28e0b9a0d7dc0699d7de846a4a83dd162c5b74 100644 (file)
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceNode.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceNode.java
@@ -12,6 +12,8 @@ import java.math.BigDecimal;
 import java.util.BitSet;
 import java.util.List;
 import java.util.Map;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.AdminStates;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NodeId;
 import org.opendaylight.yangtools.yang.common.Uint16;
 
@@ -32,6 +34,10 @@ public interface PceNode {
 
     List<PceLink> getOutgoingLinks();
 
+    AdminStates getAdminStates();
+
+    State getState();
+
     NodeId getNodeId();
 
     Map<String, List<Uint16>> getAvailableTribPorts();

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java
index fb463e762dddee4a9fc8e0f49e9e5d9387772faf..210a2c653cfb64fb4a2ba673d3d98aa6f6ec42cd 100644 (file)
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java
@@ -20,6 +20,8 @@ import java.util.TreeMap;
 import org.opendaylight.transportpce.common.fixedflex.GridConstant;
 import org.opendaylight.transportpce.pce.SortPortsByName;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.AdminStates;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.Node1;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmNodeType;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmTpType;
@@ -39,6 +41,8 @@ public class PceOpticalNode implements PceNode {
     private Node node;
     private NodeId nodeId;
     private OpenroadmNodeType nodeType;
+    private AdminStates adminStates;
+    private State state;
 
     private Map<String, OpenroadmTpType> availableSrgPp = new TreeMap<>();
     private Map<String, OpenroadmTpType> availableSrgCp = new TreeMap<>();
@@ -61,6 +65,10 @@ public class PceOpticalNode implements PceNode {
             this.nodeType = nodeType;
             this.version = version;
             this.slotWidthGranularity = slotWidthGranularity;
+            this.adminStates = node.augmentation(org.opendaylight.yang.gen.v1.http
+                    .org.openroadm.common.network.rev200529.Node1.class).getAdministrativeState();
+            this.state = node.augmentation(org.opendaylight.yang.gen.v1.http
+                    .org.openroadm.common.network.rev200529.Node1.class).getOperationalState();
         } else {
             LOG.error("PceNode: one of parameters is not populated : nodeId, node type, slot width granularity");
             this.valid = false;
@@ -97,8 +105,10 @@ public class PceOpticalNode implements PceNode {
                 case SRGTXRXCP:
                 case SRGRXCP:
                 case SRGTXCP:
-                    LOG.info("initSrgTpList: adding SRG-CP tp = {} ", tp.getTpId().getValue());
-                    this.availableSrgCp.put(tp.getTpId().getValue(), cntp1.getTpType());
+                    if (State.InService.equals(cntp1.getOperationalState())) {
+                        LOG.info("initSrgTpList: adding SRG-CP tp = {} ", tp.getTpId().getValue());
+                        this.availableSrgCp.put(tp.getTpId().getValue(), cntp1.getTpType());
+                    }
                     break;
                 case SRGRXPP:
                 case SRGTXPP:
@@ -107,6 +117,10 @@ public class PceOpticalNode implements PceNode {
                     if (isTerminationPointAvailable(nttp1)) {
                         LOG.info("initSrgTpList: adding SRG-PP tp '{}'", tp.getTpId().getValue());
                         this.availableSrgPp.put(tp.getTpId().getValue(), cntp1.getTpType());
+                        if (State.InService.equals(cntp1.getOperationalState())) {
+                            LOG.info("initSrgTpList: adding SRG-PP tp '{}'", tp.getTpId().getValue());
+                            this.availableSrgPp.put(tp.getTpId().getValue(), cntp1.getTpType());
+                        }
                     } else {
                         LOG.warn("initSrgTpList: SRG-PP tp = {} found is busy !!", tp.getTpId().getValue());
                     }
@@ -141,8 +155,16 @@ public class PceOpticalNode implements PceNode {
             return;
         }
         Node1 node1 = this.node.augmentation(Node1.class);
+        org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1 node11 =
+                this.node.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1
+                        .class);
         switch (this.nodeType) {
             case SRG :
+                if (!State.InService.equals(node11.getOperationalState())) {
+                    this.valid = false;
+                    LOG.error("initWLlist: SRG node {} is OOS/degraded", this);
+                    return;
+                }
                 if (!node1.getSrgAttributes().nonnullAvailFreqMaps().containsKey(freqMapKey)) {
                     LOG.error("initFrequenciesBitSet: SRG no cband available freq maps for node  {}", this);
                     this.valid = false;
@@ -152,6 +174,11 @@ public class PceOpticalNode implements PceNode {
                         .nonnullAvailFreqMaps().get(freqMapKey).getFreqMap());
                 break;
             case DEGREE :
+                if (!State.InService.equals(node11.getOperationalState())) {
+                    this.valid = false;
+                    LOG.error("initWLlist: Degree node {} is OOS/degraded", this);
+                    return;
+                }
                 if (!node1.getDegreeAttributes().nonnullAvailFreqMaps().containsKey(freqMapKey)) {
                     LOG.error("initFrequenciesBitSet: DEG no cband available freq maps for node  {}", this);
                     this.valid = false;
@@ -165,6 +192,11 @@ public class PceOpticalNode implements PceNode {
                 this.frequenciesBitSet = new BitSet(GridConstant.EFFECTIVE_BITS);
                 //set all bits to true (available)
                 this.frequenciesBitSet.set(0, GridConstant.EFFECTIVE_BITS);
+                if (!State.InService.equals(node11.getOperationalState())) {
+                    this.valid = false;
+                    LOG.error("initWLlist: XPDR node {} is OOS/degraded", this);
+                    return;
+                }
                 break;
             default:
                 LOG.error("initFrequenciesBitSet: unsupported node type {} in node {}", this.nodeType, this);
@@ -194,29 +226,30 @@ public class PceOpticalNode implements PceNode {
             org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.TerminationPoint1 nttp1 = tp
                 .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529
                 .TerminationPoint1.class);
-            if (cntp1.getTpType() == OpenroadmTpType.XPONDERNETWORK) {
-                if (nttp1 != null && nttp1.getXpdrNetworkAttributes().getWavelength() != null) {
-                    this.usedXpndrNWTps.add(tp.getTpId().getValue());
-                    LOG.info("initXndrTps: XPONDER tp = {} is used", tp.getTpId().getValue());
-                } else {
-                    this.valid = true;
-                }
-                // find Client of this network TP
-                String client;
-                org.opendaylight.yang.gen.v1.http.transportpce.topology.rev201019.TerminationPoint1 tpceTp1 =
+            if (cntp1.getTpType() != OpenroadmTpType.XPONDERNETWORK) {
+                LOG.warn("initXndrTps: {} is not an Xponder network port", cntp1.getTpType().getName());
+                continue;
+            }
+            if (!State.InService.equals(cntp1.getOperationalState())) {
+                LOG.warn("initXndrTps: XPONDER tp = {} is OOS/degraded", tp.getTpId().getValue());
+                this.valid = false;
+                continue;
+            }
+            if (nttp1 != null && nttp1.getXpdrNetworkAttributes().getWavelength() != null) {
+                this.usedXpndrNWTps.add(tp.getTpId().getValue());
+                LOG.info("initXndrTps: XPONDER tp = {} is used", tp.getTpId().getValue());
+            } else {
+                this.valid = true;
+            }
+            // find Client of this network TP
+            String client;
+            org.opendaylight.yang.gen.v1.http.transportpce.topology.rev201019.TerminationPoint1 tpceTp1 =
                     tp.augmentation(org.opendaylight.yang.gen.v1.http.transportpce.topology.rev201019
-                        .TerminationPoint1.class);
-                if (tpceTp1 != null) {
-                    client = tpceTp1.getAssociatedConnectionMapPort();
-                    if (client != null) {
-                        this.clientPerNwTp.put(tp.getTpId().getValue(), client);
-                        this.valid = true;
-                    } else {
-                        LOG.error("initXndrTps: XPONDER {} NW TP doesn't have defined Client {}",
-                            this, tp.getTpId().getValue());
-                    }
-                } else if (ServiceFormat.OTU.equals(serviceFormat)) {
-                    LOG.info("Infrastructure OTU4 connection");
+                            .TerminationPoint1.class);
+            if (tpceTp1 != null) {
+                client = tpceTp1.getAssociatedConnectionMapPort();
+                if (client != null) {
+                    this.clientPerNwTp.put(tp.getTpId().getValue(), client);
                     this.valid = true;
                 } else {
                     LOG.error("Service Format {} not managed yet", serviceFormat.getName());
@@ -299,8 +332,9 @@ public class PceOpticalNode implements PceNode {
 
     public boolean isValid() {
         if (node == null || nodeId == null || nodeType == null || this.getSupNetworkNodeId() == null
-            || this.getSupClliNodeId() == null) {
-            LOG.error("PceNode: one of parameters is not populated : nodeId, node type, supporting nodeId");
+            || this.getSupClliNodeId() == null || adminStates == null || state == null) {
+            LOG.error("PceNode: one of parameters is not populated : nodeId, node type, supporting nodeId, "
+                    + "admin state, operational state");
             valid = false;
         }
         return valid;
@@ -311,6 +345,16 @@ public class PceOpticalNode implements PceNode {
         return outgoingLinks;
     }
 
+    @Override
+    public AdminStates getAdminStates() {
+        return adminStates;
+    }
+
+    @Override
+    public State getState() {
+        return state;
+    }
+
     @Override
     public NodeId getNodeId() {
         return nodeId;

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNode.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNode.java
index 80fc4a13ec86f5b2896db0ca742fe7083ad1ac41..736539d9404ed7b3289b607f566d6d2db1f4573d 100644 (file)
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNode.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNode.java
@@ -19,6 +19,8 @@ import java.util.TreeMap;
 import java.util.stream.Collectors;
 import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.transportpce.common.StringConstants;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.AdminStates;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev200327.xpdr.odu.switching.pools.OduSwitchingPools;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev200327.xpdr.odu.switching.pools.odu.switching.pools.NonBlockingList;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmNodeType;
@@ -56,6 +58,9 @@ public class PceOtnNode implements PceNode {
     private final String pceNodeType;
     private final String otnServiceType;
     private String modeType;
+    // TODO: not adding state check in this class as otn topology has not been modified
+    private final AdminStates adminStates;
+    private final State state;
 
     private Map<String, List<Uint16>> tpAvailableTribPort = new TreeMap<>();
     private Map<String, List<Uint16>> tpAvailableTribSlot = new TreeMap<>();
@@ -83,6 +88,10 @@ public class PceOtnNode implements PceNode {
         this.usedXpdrClientTps.clear();
         this.availableXpdrClientTps = new ArrayList<>();
         this.usableXpdrClientTps = new ArrayList<>();
+        this.adminStates = node.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529
+                .Node1.class).getAdministrativeState();
+        this.state = node.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529
+                .Node1.class).getOperationalState();
         this.tpAvailableTribPort.clear();
         checkAvailableTribPort();
         this.tpAvailableTribSlot.clear();
@@ -467,6 +476,16 @@ public class PceOtnNode implements PceNode {
         return outgoingLinks;
     }
 
+    @Override
+    public AdminStates getAdminStates() {
+        return adminStates;
+    }
+
+    @Override
+    public State getState() {
+        return state;
+    }
+
     @Override
     public String getXpdrClient(String tp) {
         return this.clientPerNwTp.get(tp);

diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLinkTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLinkTest.java
index 2bccf8c35f4dd230cc753dc6596fdf13b78b0ee2..d07c0140799d8cb15be007111562a993399f6198 100644 (file)
--- a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLinkTest.java
+++ b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceLinkTest.java
@@ -21,6 +21,8 @@ import org.opendaylight.transportpce.test.AbstractTest;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.link.types.rev191129.RatioDB;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1Builder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1Builder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.AdminStates;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.span.attributes.LinkConcatenation;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.span.attributes.LinkConcatenationBuilder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.span.attributes.LinkConcatenationKey;
@@ -166,7 +168,9 @@ public class PceLinkTest extends AbstractTest {
 
     private static LinkBuilder createOTNLink(String srcNode, String destNode, String srcTp, String destTp) {
         Link1Builder link1Builder = new Link1Builder()
-                .setLinkType(OpenroadmLinkType.OTNLINK);
+                .setLinkType(OpenroadmLinkType.OTNLINK)
+                .setOperationalState(State.InService)
+                .setAdministrativeState(AdminStates.InService);
 
         //create source link
         return createLinkBuilder(srcNode, destNode, srcTp, destTp, link1Builder);
@@ -175,7 +179,9 @@ public class PceLinkTest extends AbstractTest {
 
     private static LinkBuilder createXponderLink(String srcNode, String destNode, String srcTp, String destTp) {
         Link1Builder link1Builder = new Link1Builder()
-                .setLinkType(OpenroadmLinkType.XPONDERINPUT);
+                .setLinkType(OpenroadmLinkType.XPONDERINPUT)
+                .setAdministrativeState(AdminStates.InService)
+                .setOperationalState(State.InService);
 
         //create source link
         return createLinkBuilder(srcNode, destNode, srcTp, destTp, link1Builder);
@@ -229,6 +235,8 @@ public class PceLinkTest extends AbstractTest {
     private static LinkBuilder createRoadmToRoadm(String srcNode, String destNode, String srcTp, String destTp) {
         Link1Builder link1Builder = new Link1Builder()
                 .setLinkLatency(Uint32.valueOf(100))
+                .setAdministrativeState(AdminStates.InService)
+                .setOperationalState(State.InService)
                 .setLinkType(OpenroadmLinkType.ROADMTOROADM);
         return createLinkBuilder(srcNode, destNode, srcTp, destTp, link1Builder);
 
@@ -268,17 +276,22 @@ public class PceLinkTest extends AbstractTest {
                 .withKey(new TerminationPointKey(new TpId("xpdr")));
         TerminationPoint1Builder tp1Bldr = new TerminationPoint1Builder();
 
-        tp1Bldr.setTpType(OpenroadmTpType.XPONDERNETWORK);
+        tp1Bldr.setTpType(OpenroadmTpType.XPONDERNETWORK).setAdministrativeState(AdminStates.InService)
+                .setOperationalState(State.InService);
         xpdrTpBldr.addAugmentation(tp1Bldr.build());
         TerminationPoint xpdr = xpdrTpBldr.build();
         org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1 node1 =
-                new Node1Builder().setTerminationPoint(Map.of(xpdr.key(),xpdr)).build();
+            new Node1Builder().setTerminationPoint(Map.of(xpdr.key(),xpdr)).build();
+        org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1 node11 =
+            new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1Builder()
+                .setOperationalState(State.InService).setAdministrativeState(AdminStates.InService).build();
 
 
         return new NodeBuilder()
                 .setNodeId(new NodeId("node 1"))
                 .withKey(new NodeKey(new NodeId("node 1")))
                 .addAugmentation(node1)
+                .addAugmentation(node11)
                 .setSupportingNode(supportingNodes1);
     }
 

diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNodeTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNodeTest.java
index 06f7565d4d4bd937d1d20d160e1bd61896b4b7a9..935a5d8a57581fc6a3a0263bfbdcec6e9e714512 100644 (file)
--- a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNodeTest.java
+++ b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNodeTest.java
@@ -21,9 +21,12 @@ import org.opendaylight.transportpce.common.StringConstants;
 import org.opendaylight.transportpce.common.fixedflex.GridConstant;
 import org.opendaylight.transportpce.common.fixedflex.GridUtils;
 import org.opendaylight.transportpce.test.AbstractTest;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1Builder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.optical.channel.types.rev200529.FrequencyGHz;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.optical.channel.types.rev200529.FrequencyTHz;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.AdminStates;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.networks.network.node.DegreeAttributes;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.networks.network.node.DegreeAttributesBuilder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.networks.network.node.SrgAttributes;
@@ -231,6 +234,8 @@ public class PceOpticalNodeTest extends AbstractTest {
                 new Node1Builder()
                         .setTerminationPoint(Map.of(xpdr.key(),xpdr))
                         .build();
+        Node1 node11 = new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1Builder()
+                .setAdministrativeState(AdminStates.InService).setOperationalState(State.InService).build();
 
 
         return new NodeBuilder()
@@ -238,6 +243,7 @@ public class PceOpticalNodeTest extends AbstractTest {
                 .withKey(new NodeKey(new NodeId("node 1")))
                 .addAugmentation(node1Rev180226)
                 .addAugmentation(node1)
+                .addAugmentation(node11)
                 .setSupportingNode(supportingNodes1);
     }
 
@@ -255,6 +261,8 @@ public class PceOpticalNodeTest extends AbstractTest {
                 new Node1Builder()
                         .setTerminationPoint(Map.of(xpdr.key(),xpdr))
                         .build();
+        Node1 node11 = new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1Builder()
+                .setAdministrativeState(AdminStates.InService).setOperationalState(State.InService).build();
 
 
         return new NodeBuilder()
@@ -262,6 +270,7 @@ public class PceOpticalNodeTest extends AbstractTest {
                 .withKey(new NodeKey(new NodeId("node 1")))
                 .addAugmentation(node1Rev180226)
                 .addAugmentation(node1)
+                .addAugmentation(node11)
                 .setSupportingNode(supportingNodes1);
     }
 
@@ -318,7 +327,8 @@ public class PceOpticalNodeTest extends AbstractTest {
 
     private TerminationPoint1Builder getTerminationPoint1Builder(OpenroadmTpType openroadmTpType) {
 
-        return new TerminationPoint1Builder().setTpType(openroadmTpType);
+        return new TerminationPoint1Builder().setTpType(openroadmTpType).setOperationalState(State.InService)
+                .setAdministrativeState(AdminStates.InService);
 
     }
 

diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNodeTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNodeTest.java
index 39311a9014e1aeb9dca8c63550c546071ba3e366..dee898e3511d60fe95f25f496ace33ad5bcfdbe8 100644 (file)
--- a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNodeTest.java
+++ b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNodeTest.java
@@ -18,7 +18,10 @@ import org.opendaylight.transportpce.common.NetworkUtils;
 import org.opendaylight.transportpce.common.StringConstants;
 import org.opendaylight.transportpce.common.fixedflex.GridUtils;
 import org.opendaylight.transportpce.test.AbstractTest;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1Builder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.AdminStates;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.networks.network.node.DegreeAttributes;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.networks.network.node.DegreeAttributesBuilder;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.networks.network.node.SrgAttributes;
@@ -230,6 +233,8 @@ public class PceOtnNodeTest extends AbstractTest {
                         .Node1Builder()
                         .setTerminationPoint(Map.of(xpdr.key(),xpdr))
                         .build();
+        Node1 node11 = new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1Builder()
+                .setOperationalState(State.InService).setAdministrativeState(AdminStates.InService).build();
 
         return new NodeBuilder()
                 .setNodeId(new NodeId("node_test"))
@@ -237,6 +242,7 @@ public class PceOtnNodeTest extends AbstractTest {
                 .addAugmentation(node1Rev180226)
                 .addAugmentation(node1)
                 .addAugmentation(nodeIetf)
+                .addAugmentation(node11)
                 .setSupportingNode(supportingNodes1);
     }
 
@@ -254,6 +260,8 @@ public class PceOtnNodeTest extends AbstractTest {
                 new Node1Builder()
                         .setTerminationPoint(Map.of(xpdr.key(),xpdr))
                         .build();
+        Node1 node11 = new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1Builder()
+                .setOperationalState(State.InService).setAdministrativeState(AdminStates.InService).build();
 
 
         return new NodeBuilder()
@@ -261,6 +269,7 @@ public class PceOtnNodeTest extends AbstractTest {
                 .withKey(new NodeKey(new NodeId("node 1")))
                 .addAugmentation(node1Rev180226)
                 .addAugmentation(node1)
+                .addAugmentation(node11)
                 .setSupportingNode(supportingNodes1);
     }
 
@@ -309,7 +318,8 @@ public class PceOtnNodeTest extends AbstractTest {
     private TerminationPoint1Builder getTerminationPoint1Builder(OpenroadmTpType openroadmTpType) {
 
         return new TerminationPoint1Builder()
-                .setTpType(openroadmTpType);
+                .setTpType(openroadmTpType).setAdministrativeState(AdminStates.InService)
+                .setOperationalState(State.InService);
 
     }
 
@@ -369,7 +379,8 @@ public class PceOtnNodeTest extends AbstractTest {
             .TerminationPoint1Builder createAnother2TerminationPoint(OpenroadmTpType openroadmTpType) {
         return new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529
                 .TerminationPoint1Builder()
-                .setTpType(openroadmTpType);
+                .setTpType(openroadmTpType).setOperationalState(State.InService)
+                .setAdministrativeState(AdminStates.InService);
     }
 
 }

diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/utils/NodeUtils.java b/pce/src/test/java/org/opendaylight/transportpce/pce/utils/NodeUtils.java
index 87909027bd9af0e098a77b6044ef48d572766d95..ef47c7963e0ceff769e5ad3c4de3d2380ce54f6f 100644 (file)
--- a/pce/src/test/java/org/opendaylight/transportpce/pce/utils/NodeUtils.java
+++ b/pce/src/test/java/org/opendaylight/transportpce/pce/utils/NodeUtils.java
@@ -18,7 +18,9 @@ import org.opendaylight.transportpce.common.fixedflex.GridUtils;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.link.types.rev191129.FiberPmd;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.link.types.rev191129.RatioDB;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Link1Builder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1Builder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.AdminStates;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.amplified.link.attributes.AmplifiedLink;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev200529.amplified.link.attributes.AmplifiedLinkKey;
@@ -114,7 +116,9 @@ public class NodeUtils {
     public static LinkBuilder createRoadmToRoadm(String srcNode, String destNode, String srcTp, String destTp) {
         Link1Builder link1Builder = new Link1Builder()
                 .setLinkLatency(Uint32.valueOf(30))
-                .setLinkType(OpenroadmLinkType.ROADMTOROADM);
+                .setLinkType(OpenroadmLinkType.ROADMTOROADM)
+                .setAdministrativeState(AdminStates.InService)
+                .setOperationalState(State.InService);
         return createLinkBuilder(srcNode, destNode, srcTp, destTp, link1Builder);
 
     }
@@ -144,18 +148,27 @@ public class NodeUtils {
         TerminationPointBuilder xpdrTpBldr = new TerminationPointBuilder()
                 .withKey(new TerminationPointKey(new TpId("xpdr")));
         TerminationPoint1Builder tp1Bldr = new TerminationPoint1Builder();
+        org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1Builder tp11Bldr =
+            new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1Builder()
+                .setAdministrativeState(AdminStates.InService)
+                .setOperationalState(State.InService);
 
         tp1Bldr.setTpType(OpenroadmTpType.XPONDERNETWORK);
         xpdrTpBldr.addAugmentation(tp1Bldr.build());
+        xpdrTpBldr.addAugmentation(tp11Bldr.build());
         TerminationPoint xpdr = xpdrTpBldr.build();
         org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1 node1 =
-                new Node1Builder().setTerminationPoint(Map.of(xpdr.key(),xpdr)).build();
+            new Node1Builder().setTerminationPoint(Map.of(xpdr.key(),xpdr)).build();
+        Node1 node11 = new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1Builder()
+            .setAdministrativeState(AdminStates.InService)
+            .setOperationalState(State.InService).build();
 
 
         return new NodeBuilder()
                 .setNodeId(new NodeId("node 1"))
                 .withKey(new NodeKey(new NodeId("node 1")))
                 .addAugmentation(node1)
+                .addAugmentation(node11)
                 .setSupportingNode(supportingNodes1);
     }
 
@@ -233,6 +246,8 @@ public class NodeUtils {
                                 .setSpan(new SpanBuilder().build())
                                 .build())
                         .build();
+        Augmentation<Link> aug111 = new Link1Builder().setAdministrativeState(AdminStates.InService)
+                .setOperationalState(State.InService).build();
 
         TransactionUtils.getNetworkForSpanLoss();
         return new LinkBuilder()
@@ -246,6 +261,7 @@ public class NodeUtils {
                                 .setDestNode(new NodeId("OpenROADM-3-1-DEG1"))
                                 .setDestTp("DEG1-TTP-RX").build())
                 .addAugmentation(aug11)
+                .addAugmentation(aug111)
                 .build();
 
 
@@ -434,6 +450,8 @@ public class NodeUtils {
             .TerminationPoint1Builder createAnother2TerminationPoint(OpenroadmTpType openroadmTpType) {
         return new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529
                 .TerminationPoint1Builder()
+                .setOperationalState(State.InService)
+                .setAdministrativeState(AdminStates.InService)
                 .setTpType(openroadmTpType);
     }
 

diff --git a/tests/sample_configs/NW-for-test-5-4.xml b/tests/sample_configs/NW-for-test-5-4.xml
index 53852252fc12d777db8b1e90908dea8378aceb73..b534c602e27663b8d17e565407f3499ef11efdcd 100644 (file)
--- a/tests/sample_configs/NW-for-test-5-4.xml
+++ b/tests/sample_configs/NW-for-test-5-4.xml
@@ -1,11 +1,17 @@
 <network xmlns="urn:ietf:params:xml:ns:yang:ietf-network">
  <network-id>openroadm-topology</network-id>
 <node>    <node-id>OpenROADM-1-1-DEG1</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -19,11 +25,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli11</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-1-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -37,11 +49,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli11</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-1-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
     <degree-attributes xmlns="http://org/openroadm/network/topology">
       <avail-freq-maps>
         <map-name>cband</map-name>
@@ -55,6 +73,8 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli11</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-1-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli11</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -70,96 +90,139 @@
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
-
 </node>
 <node>        <node-id>XPONDER-1-1</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-1-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE1</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
 </node>
 <node>    <node-id>OpenROADM-1-2-DEG1</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -173,11 +236,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli12</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-2-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -191,11 +260,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli12</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-2-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -209,6 +284,8 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli12</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-1-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli12</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -224,96 +301,139 @@
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
-
 </node>
 <node>        <node-id>XPONDER-1-2</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-1-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE1</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
 </node>
 <node>    <node-id>OpenROADM-1-3-DEG1</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -327,11 +447,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli13</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-3-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -345,11 +471,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli13</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-3-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -363,6 +495,8 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli13</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-1-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli13</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -378,96 +512,139 @@
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
-
 </node>
 <node>        <node-id>XPONDER-1-3</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-1-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE1</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
 </node>
 <node>    <node-id>OpenROADM-1-4-DEG1</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -481,11 +658,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli14</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-4-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -499,11 +682,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli14</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-4-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -517,6 +706,8 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli14</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-1-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli14</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -532,96 +723,139 @@
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
-
 </node>
 <node>        <node-id>XPONDER-1-4</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-1-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE1</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
 </node>
 <node>    <node-id>OpenROADM-2-1-DEG1</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -635,11 +869,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli21</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-1-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -653,11 +893,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli21</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-1-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -671,6 +917,8 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli21</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-2-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli21</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -686,96 +934,139 @@
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
-
 </node>
 <node>        <node-id>XPONDER-2-1</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-2-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE2</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
 </node>
 <node>    <node-id>OpenROADM-2-2-DEG1</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -789,11 +1080,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli22</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-2-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -807,11 +1104,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli22</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-2-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -825,6 +1128,8 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli22</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-2-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli22</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -840,96 +1145,139 @@
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
-
 </node>
 <node>        <node-id>XPONDER-2-2</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-2-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE2</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
 </node>
 <node>    <node-id>OpenROADM-2-3-DEG1</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -943,11 +1291,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli23</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-3-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -961,11 +1315,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli23</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-3-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -979,6 +1339,8 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli23</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-2-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli23</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -994,96 +1356,139 @@
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
-
 </node>
 <node>        <node-id>XPONDER-2-3</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-2-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE2</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
 </node>
 <node>    <node-id>OpenROADM-2-4-DEG1</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -1097,11 +1502,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli24</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-4-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -1115,11 +1526,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli24</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-4-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -1133,6 +1550,8 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli24</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-2-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli24</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -1148,96 +1567,139 @@
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
-
 </node>
 <node>        <node-id>XPONDER-2-4</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-2-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE2</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
 </node>
 <node>    <node-id>OpenROADM-3-1-DEG1</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -1251,11 +1713,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli31</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-1-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -1269,11 +1737,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli31</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-1-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -1287,6 +1761,8 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli31</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-3-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli31</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -1302,96 +1778,139 @@
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
-
 </node>
 <node>        <node-id>XPONDER-3-1</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-3-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE3</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
 </node>
 <node>    <node-id>OpenROADM-3-2-DEG1</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -1405,11 +1924,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli32</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-2-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -1423,11 +1948,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli32</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-2-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -1441,6 +1972,8 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli32</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-3-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli32</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -1456,96 +1989,139 @@
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
-
 </node>
 <node>        <node-id>XPONDER-3-2</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-3-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE3</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
 </node>
 <node>    <node-id>OpenROADM-3-3-DEG1</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -1559,11 +2135,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli33</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-3-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -1577,11 +2159,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli33</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-3-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -1595,6 +2183,8 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli33</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-3-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli33</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -1610,96 +2200,139 @@
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
-
 </node>
 <node>        <node-id>XPONDER-3-3</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-3-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE3</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
 </node>
 <node>    <node-id>OpenROADM-3-4-DEG1</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -1713,11 +2346,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli34</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-4-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -1731,11 +2370,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli34</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-4-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -1749,6 +2394,8 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli34</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-3-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli34</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -1764,96 +2411,139 @@
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
-
 </node>
 <node>        <node-id>XPONDER-3-4</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-3-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE3</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
 </node>
 <node>    <node-id>OpenROADM-4-1-DEG1</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -1867,11 +2557,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli41</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-1-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -1885,11 +2581,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli41</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-1-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -1903,6 +2605,8 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli41</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-4-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli41</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -1918,96 +2622,139 @@
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
-
 </node>
 <node>        <node-id>XPONDER-4-1</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-4-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE4</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
 </node>
 <node>    <node-id>OpenROADM-4-2-DEG1</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -2021,11 +2768,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli42</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-2-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -2039,11 +2792,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli42</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-2-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -2057,6 +2816,8 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli42</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-4-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli42</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -2072,96 +2833,139 @@
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
-
 </node>
 <node>        <node-id>XPONDER-4-2</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-4-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE4</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
 </node>
 <node>    <node-id>OpenROADM-4-3-DEG1</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -2175,11 +2979,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli43</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-3-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -2193,11 +3003,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli43</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-3-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -2211,6 +3027,8 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli43</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-4-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli43</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -2226,96 +3044,139 @@
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
-
 </node>
 <node>        <node-id>XPONDER-4-3</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-4-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE4</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
 </node>
 <node>    <node-id>OpenROADM-4-4-DEG1</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -2329,11 +3190,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli44</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-4-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -2347,11 +3214,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli44</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-4-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -2365,6 +3238,8 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli44</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-4-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli44</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -2380,96 +3255,139 @@
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
-
 </node>
 <node>        <node-id>XPONDER-4-4</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-4-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE4</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
 </node>
 <node>    <node-id>OpenROADM-5-1-DEG1</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -2483,11 +3401,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli51</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-1-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -2501,11 +3425,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli51</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-1-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -2519,6 +3449,8 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli51</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-5-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli51</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -2534,96 +3466,139 @@
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
-
 </node>
 <node>        <node-id>XPONDER-5-1</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-5-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE5</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
 </node>
 <node>    <node-id>OpenROADM-5-2-DEG1</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -2637,11 +3612,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli52</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-2-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -2655,11 +3636,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli52</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-2-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -2673,6 +3660,8 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli52</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-5-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli52</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -2688,96 +3677,139 @@
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
-
 </node>
 <node>        <node-id>XPONDER-5-2</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-5-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE5</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
 </node>
 <node>    <node-id>OpenROADM-5-3-DEG1</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -2791,11 +3823,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli53</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-3-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -2809,11 +3847,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli53</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-3-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -2827,6 +3871,8 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli53</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-5-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli53</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -2842,96 +3888,139 @@
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
-
 </node>
 <node>        <node-id>XPONDER-5-3</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-5-3</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE5</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
 </node>
 <node>    <node-id>OpenROADM-5-4-DEG1</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -2945,11 +4034,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli54</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-4-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -2963,11 +4058,17 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli54</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-4-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -2981,6 +4082,8 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli54</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-5-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli54</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -2996,410 +4099,687 @@
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-RX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-TX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
-
 </node>
 <node>        <node-id>XPONDER-5-4</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-5-4</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE5</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
 </node>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW1-TX-toOpenROADM-1-1-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-PP1-TX-to-XPONDER-1-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP1-TX-to-XPONDER-1-1XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-1XPDR-NW1-TX-toOpenROADM-1-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW2-TX-toOpenROADM-1-1-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-PP2-TX-to-XPONDER-1-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP2-TX-to-XPONDER-1-1XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-1XPDR-NW2-TX-toOpenROADM-1-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW3-TX-toOpenROADM-1-1-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-PP3-TX-to-XPONDER-1-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP3-TX-to-XPONDER-1-1XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-1XPDR-NW3-TX-toOpenROADM-1-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW4-TX-toOpenROADM-1-1-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-PP4-TX-to-XPONDER-1-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP4-TX-to-XPONDER-1-1XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-1XPDR-NW4-TX-toOpenROADM-1-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-PP1-TX-to-XPONDER-1-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP1-TX-to-XPONDER-1-2XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW2-TX-toOpenROADM-1-2-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-PP2-TX-to-XPONDER-1-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP2-TX-to-XPONDER-1-2XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-2XPDR-NW2-TX-toOpenROADM-1-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW3-TX-toOpenROADM-1-2-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-PP3-TX-to-XPONDER-1-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP3-TX-to-XPONDER-1-2XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-2XPDR-NW3-TX-toOpenROADM-1-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW4-TX-toOpenROADM-1-2-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-PP4-TX-to-XPONDER-1-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP4-TX-to-XPONDER-1-2XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-2XPDR-NW4-TX-toOpenROADM-1-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-3XPDR-NW1-TX-toOpenROADM-1-3-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-PP1-TX-to-XPONDER-1-3XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-SRG1-SRG1-PP1-TX-to-XPONDER-1-3XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-3XPDR-NW1-TX-toOpenROADM-1-3-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-3XPDR-NW2-TX-toOpenROADM-1-3-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-PP2-TX-to-XPONDER-1-3XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-SRG1-SRG1-PP2-TX-to-XPONDER-1-3XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-3XPDR-NW2-TX-toOpenROADM-1-3-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-3XPDR-NW3-TX-toOpenROADM-1-3-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-PP3-TX-to-XPONDER-1-3XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-SRG1-SRG1-PP3-TX-to-XPONDER-1-3XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-3XPDR-NW3-TX-toOpenROADM-1-3-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-3XPDR-NW4-TX-toOpenROADM-1-3-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-PP4-TX-to-XPONDER-1-3XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-SRG1-SRG1-PP4-TX-to-XPONDER-1-3XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-3XPDR-NW4-TX-toOpenROADM-1-3-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-4XPDR-NW1-TX-toOpenROADM-1-4-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-PP1-TX-to-XPONDER-1-4XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-SRG1-SRG1-PP1-TX-to-XPONDER-1-4XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-4XPDR-NW1-TX-toOpenROADM-1-4-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-4XPDR-NW2-TX-toOpenROADM-1-4-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-PP2-TX-to-XPONDER-1-4XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-SRG1-SRG1-PP2-TX-to-XPONDER-1-4XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-4XPDR-NW2-TX-toOpenROADM-1-4-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-4XPDR-NW3-TX-toOpenROADM-1-4-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-PP3-TX-to-XPONDER-1-4XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-SRG1-SRG1-PP3-TX-to-XPONDER-1-4XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-4XPDR-NW3-TX-toOpenROADM-1-4-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-4XPDR-NW4-TX-toOpenROADM-1-4-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-PP4-TX-to-XPONDER-1-4XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-SRG1-SRG1-PP4-TX-to-XPONDER-1-4XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-4XPDR-NW4-TX-toOpenROADM-1-4-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1</opposite-link>
@@ -3409,6 +4789,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -3433,6 +4815,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -3457,6 +4841,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -3481,6 +4867,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -3505,6 +4893,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -3529,6 +4919,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -3553,6 +4945,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -3577,6 +4971,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -3595,323 +4991,563 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW1-TX-toOpenROADM-2-1-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-PP1-TX-to-XPONDER-2-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP1-TX-to-XPONDER-2-1XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-1XPDR-NW1-TX-toOpenROADM-2-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW2-TX-toOpenROADM-2-1-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-PP2-TX-to-XPONDER-2-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP2-TX-to-XPONDER-2-1XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-1XPDR-NW2-TX-toOpenROADM-2-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW3-TX-toOpenROADM-2-1-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-PP3-TX-to-XPONDER-2-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP3-TX-to-XPONDER-2-1XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-1XPDR-NW3-TX-toOpenROADM-2-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW4-TX-toOpenROADM-2-1-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-PP4-TX-to-XPONDER-2-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP4-TX-to-XPONDER-2-1XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-1XPDR-NW4-TX-toOpenROADM-2-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW1-TX-toOpenROADM-2-2-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-PP1-TX-to-XPONDER-2-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP1-TX-to-XPONDER-2-2XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-2XPDR-NW1-TX-toOpenROADM-2-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW2-TX-toOpenROADM-2-2-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-PP2-TX-to-XPONDER-2-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP2-TX-to-XPONDER-2-2XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-2XPDR-NW2-TX-toOpenROADM-2-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW3-TX-toOpenROADM-2-2-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-PP3-TX-to-XPONDER-2-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP3-TX-to-XPONDER-2-2XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-2XPDR-NW3-TX-toOpenROADM-2-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW4-TX-toOpenROADM-2-2-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-PP4-TX-to-XPONDER-2-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP4-TX-to-XPONDER-2-2XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-2XPDR-NW4-TX-toOpenROADM-2-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-3XPDR-NW1-TX-toOpenROADM-2-3-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-PP1-TX-to-XPONDER-2-3XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-SRG1-SRG1-PP1-TX-to-XPONDER-2-3XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-3XPDR-NW1-TX-toOpenROADM-2-3-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-3XPDR-NW2-TX-toOpenROADM-2-3-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-PP2-TX-to-XPONDER-2-3XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-SRG1-SRG1-PP2-TX-to-XPONDER-2-3XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-3XPDR-NW2-TX-toOpenROADM-2-3-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-3XPDR-NW3-TX-toOpenROADM-2-3-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-PP3-TX-to-XPONDER-2-3XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-SRG1-SRG1-PP3-TX-to-XPONDER-2-3XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-3XPDR-NW3-TX-toOpenROADM-2-3-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-3XPDR-NW4-TX-toOpenROADM-2-3-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-PP4-TX-to-XPONDER-2-3XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-SRG1-SRG1-PP4-TX-to-XPONDER-2-3XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-3XPDR-NW4-TX-toOpenROADM-2-3-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-4XPDR-NW1-TX-toOpenROADM-2-4-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-PP1-TX-to-XPONDER-2-4XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-SRG1-SRG1-PP1-TX-to-XPONDER-2-4XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-4XPDR-NW1-TX-toOpenROADM-2-4-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-4XPDR-NW2-TX-toOpenROADM-2-4-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-PP2-TX-to-XPONDER-2-4XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-SRG1-SRG1-PP2-TX-to-XPONDER-2-4XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-4XPDR-NW2-TX-toOpenROADM-2-4-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-4XPDR-NW3-TX-toOpenROADM-2-4-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-PP3-TX-to-XPONDER-2-4XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-SRG1-SRG1-PP3-TX-to-XPONDER-2-4XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-4XPDR-NW3-TX-toOpenROADM-2-4-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-4XPDR-NW4-TX-toOpenROADM-2-4-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-PP4-TX-to-XPONDER-2-4XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-SRG1-SRG1-PP4-TX-to-XPONDER-2-4XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-4XPDR-NW4-TX-toOpenROADM-2-4-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1</opposite-link>
@@ -3921,6 +5557,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -3945,6 +5583,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -3969,6 +5609,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -3993,6 +5635,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -4017,6 +5661,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -4041,6 +5687,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -4065,6 +5713,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -4089,6 +5739,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -4110,324 +5762,563 @@
         <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</opposite-link>
         <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW1-TX-toOpenROADM-3-1-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-PP1-TX-to-XPONDER-3-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP1-TX-to-XPONDER-3-1XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-1XPDR-NW1-TX-toOpenROADM-3-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW2-TX-toOpenROADM-3-1-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-PP2-TX-to-XPONDER-3-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP2-TX-to-XPONDER-3-1XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-1XPDR-NW2-TX-toOpenROADM-3-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW3-TX-toOpenROADM-3-1-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-PP3-TX-to-XPONDER-3-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP3-TX-to-XPONDER-3-1XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-1XPDR-NW3-TX-toOpenROADM-3-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW4-TX-toOpenROADM-3-1-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-PP4-TX-to-XPONDER-3-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP4-TX-to-XPONDER-3-1XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-1XPDR-NW4-TX-toOpenROADM-3-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW1-TX-toOpenROADM-3-2-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-PP1-TX-to-XPONDER-3-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP1-TX-to-XPONDER-3-2XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-2XPDR-NW1-TX-toOpenROADM-3-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW2-TX-toOpenROADM-3-2-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-PP2-TX-to-XPONDER-3-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP2-TX-to-XPONDER-3-2XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-2XPDR-NW2-TX-toOpenROADM-3-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW3-TX-toOpenROADM-3-2-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-PP3-TX-to-XPONDER-3-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP3-TX-to-XPONDER-3-2XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-2XPDR-NW3-TX-toOpenROADM-3-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW4-TX-toOpenROADM-3-2-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-PP4-TX-to-XPONDER-3-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP4-TX-to-XPONDER-3-2XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-2XPDR-NW4-TX-toOpenROADM-3-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-3XPDR-NW1-TX-toOpenROADM-3-3-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-PP1-TX-to-XPONDER-3-3XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-SRG1-SRG1-PP1-TX-to-XPONDER-3-3XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-3XPDR-NW1-TX-toOpenROADM-3-3-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-3XPDR-NW2-TX-toOpenROADM-3-3-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-PP2-TX-to-XPONDER-3-3XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-SRG1-SRG1-PP2-TX-to-XPONDER-3-3XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-3XPDR-NW2-TX-toOpenROADM-3-3-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-3XPDR-NW3-TX-toOpenROADM-3-3-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-PP3-TX-to-XPONDER-3-3XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-SRG1-SRG1-PP3-TX-to-XPONDER-3-3XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-3XPDR-NW3-TX-toOpenROADM-3-3-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-3XPDR-NW4-TX-toOpenROADM-3-3-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-PP4-TX-to-XPONDER-3-3XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-SRG1-SRG1-PP4-TX-to-XPONDER-3-3XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-3XPDR-NW4-TX-toOpenROADM-3-3-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-4XPDR-NW1-TX-toOpenROADM-3-4-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-PP1-TX-to-XPONDER-3-4XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-SRG1-SRG1-PP1-TX-to-XPONDER-3-4XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-4XPDR-NW1-TX-toOpenROADM-3-4-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-4XPDR-NW2-TX-toOpenROADM-3-4-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-PP2-TX-to-XPONDER-3-4XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-SRG1-SRG1-PP2-TX-to-XPONDER-3-4XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-4XPDR-NW2-TX-toOpenROADM-3-4-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-4XPDR-NW3-TX-toOpenROADM-3-4-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-PP3-TX-to-XPONDER-3-4XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-SRG1-SRG1-PP3-TX-to-XPONDER-3-4XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-4XPDR-NW3-TX-toOpenROADM-3-4-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-4XPDR-NW4-TX-toOpenROADM-3-4-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-PP4-TX-to-XPONDER-3-4XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-SRG1-SRG1-PP4-TX-to-XPONDER-3-4XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-4XPDR-NW4-TX-toOpenROADM-3-4-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1</opposite-link>
@@ -4437,6 +6328,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -4461,6 +6354,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -4485,6 +6380,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -4509,6 +6406,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -4533,6 +6432,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -4557,6 +6458,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -4581,6 +6484,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -4605,6 +6510,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -4623,323 +6530,563 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW1-TX-toOpenROADM-4-1-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-PP1-TX-to-XPONDER-4-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP1-TX-to-XPONDER-4-1XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-1XPDR-NW1-TX-toOpenROADM-4-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW2-TX-toOpenROADM-4-1-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-PP2-TX-to-XPONDER-4-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP2-TX-to-XPONDER-4-1XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-1XPDR-NW2-TX-toOpenROADM-4-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW3-TX-toOpenROADM-4-1-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-PP3-TX-to-XPONDER-4-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP3-TX-to-XPONDER-4-1XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-1XPDR-NW3-TX-toOpenROADM-4-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW4-TX-toOpenROADM-4-1-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-PP4-TX-to-XPONDER-4-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP4-TX-to-XPONDER-4-1XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-1XPDR-NW4-TX-toOpenROADM-4-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW1-TX-toOpenROADM-4-2-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-PP1-TX-to-XPONDER-4-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP1-TX-to-XPONDER-4-2XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-2XPDR-NW1-TX-toOpenROADM-4-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW2-TX-toOpenROADM-4-2-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-PP2-TX-to-XPONDER-4-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP2-TX-to-XPONDER-4-2XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-2XPDR-NW2-TX-toOpenROADM-4-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW3-TX-toOpenROADM-4-2-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-PP3-TX-to-XPONDER-4-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP3-TX-to-XPONDER-4-2XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-2XPDR-NW3-TX-toOpenROADM-4-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW4-TX-toOpenROADM-4-2-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-PP4-TX-to-XPONDER-4-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP4-TX-to-XPONDER-4-2XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-2XPDR-NW4-TX-toOpenROADM-4-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-3XPDR-NW1-TX-toOpenROADM-4-3-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-PP1-TX-to-XPONDER-4-3XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-SRG1-SRG1-PP1-TX-to-XPONDER-4-3XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-3XPDR-NW1-TX-toOpenROADM-4-3-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-3XPDR-NW2-TX-toOpenROADM-4-3-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-PP2-TX-to-XPONDER-4-3XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-SRG1-SRG1-PP2-TX-to-XPONDER-4-3XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-3XPDR-NW2-TX-toOpenROADM-4-3-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-3XPDR-NW3-TX-toOpenROADM-4-3-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-PP3-TX-to-XPONDER-4-3XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-SRG1-SRG1-PP3-TX-to-XPONDER-4-3XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-3XPDR-NW3-TX-toOpenROADM-4-3-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-3XPDR-NW4-TX-toOpenROADM-4-3-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-PP4-TX-to-XPONDER-4-3XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-SRG1-SRG1-PP4-TX-to-XPONDER-4-3XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-3XPDR-NW4-TX-toOpenROADM-4-3-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-4XPDR-NW1-TX-toOpenROADM-4-4-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-PP1-TX-to-XPONDER-4-4XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-SRG1-SRG1-PP1-TX-to-XPONDER-4-4XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-4XPDR-NW1-TX-toOpenROADM-4-4-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-4XPDR-NW2-TX-toOpenROADM-4-4-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-PP2-TX-to-XPONDER-4-4XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-SRG1-SRG1-PP2-TX-to-XPONDER-4-4XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-4XPDR-NW2-TX-toOpenROADM-4-4-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-4XPDR-NW3-TX-toOpenROADM-4-4-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-PP3-TX-to-XPONDER-4-4XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-SRG1-SRG1-PP3-TX-to-XPONDER-4-4XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-4XPDR-NW3-TX-toOpenROADM-4-4-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-4XPDR-NW4-TX-toOpenROADM-4-4-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-PP4-TX-to-XPONDER-4-4XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-SRG1-SRG1-PP4-TX-to-XPONDER-4-4XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-4XPDR-NW4-TX-toOpenROADM-4-4-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1</opposite-link>
@@ -4949,6 +7096,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -4973,6 +7122,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -4997,6 +7148,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -5021,6 +7174,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -5045,6 +7200,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -5069,6 +7226,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -5093,6 +7252,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -5117,6 +7278,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -5135,323 +7298,563 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW1-TX-toOpenROADM-5-1-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-PP1-TX-to-XPONDER-5-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP1-TX-to-XPONDER-5-1XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-1XPDR-NW1-TX-toOpenROADM-5-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW2-TX-toOpenROADM-5-1-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-PP2-TX-to-XPONDER-5-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP2-TX-to-XPONDER-5-1XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-1XPDR-NW2-TX-toOpenROADM-5-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW3-TX-toOpenROADM-5-1-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-PP3-TX-to-XPONDER-5-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP3-TX-to-XPONDER-5-1XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-1XPDR-NW3-TX-toOpenROADM-5-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW4-TX-toOpenROADM-5-1-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-PP4-TX-to-XPONDER-5-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP4-TX-to-XPONDER-5-1XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-1XPDR-NW4-TX-toOpenROADM-5-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW1-TX-toOpenROADM-5-2-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-PP1-TX-to-XPONDER-5-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP1-TX-to-XPONDER-5-2XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-2XPDR-NW1-TX-toOpenROADM-5-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW2-TX-toOpenROADM-5-2-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-PP2-TX-to-XPONDER-5-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP2-TX-to-XPONDER-5-2XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-2XPDR-NW2-TX-toOpenROADM-5-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW3-TX-toOpenROADM-5-2-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-PP3-TX-to-XPONDER-5-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP3-TX-to-XPONDER-5-2XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-2XPDR-NW3-TX-toOpenROADM-5-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW4-TX-toOpenROADM-5-2-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-PP4-TX-to-XPONDER-5-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP4-TX-to-XPONDER-5-2XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-2XPDR-NW4-TX-toOpenROADM-5-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-3XPDR-NW1-TX-toOpenROADM-5-3-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-PP1-TX-to-XPONDER-5-3XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-SRG1-SRG1-PP1-TX-to-XPONDER-5-3XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-3XPDR-NW1-TX-toOpenROADM-5-3-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-3XPDR-NW2-TX-toOpenROADM-5-3-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-PP2-TX-to-XPONDER-5-3XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-SRG1-SRG1-PP2-TX-to-XPONDER-5-3XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-3XPDR-NW2-TX-toOpenROADM-5-3-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-3XPDR-NW3-TX-toOpenROADM-5-3-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-PP3-TX-to-XPONDER-5-3XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-SRG1-SRG1-PP3-TX-to-XPONDER-5-3XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-3XPDR-NW3-TX-toOpenROADM-5-3-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-3XPDR-NW4-TX-toOpenROADM-5-3-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-PP4-TX-to-XPONDER-5-3XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-SRG1-SRG1-PP4-TX-to-XPONDER-5-3XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-3XPDR-NW4-TX-toOpenROADM-5-3-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-4XPDR-NW1-TX-toOpenROADM-5-4-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-PP1-TX-to-XPONDER-5-4XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-SRG1-SRG1-PP1-TX-to-XPONDER-5-4XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-4XPDR-NW1-TX-toOpenROADM-5-4-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-4XPDR-NW2-TX-toOpenROADM-5-4-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-PP2-TX-to-XPONDER-5-4XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-SRG1-SRG1-PP2-TX-to-XPONDER-5-4XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-4XPDR-NW2-TX-toOpenROADM-5-4-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-4XPDR-NW3-TX-toOpenROADM-5-4-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-PP3-TX-to-XPONDER-5-4XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-SRG1-SRG1-PP3-TX-to-XPONDER-5-4XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-4XPDR-NW3-TX-toOpenROADM-5-4-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-4XPDR-NW4-TX-toOpenROADM-5-4-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-PP4-TX-to-XPONDER-5-4XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-SRG1-SRG1-PP4-TX-to-XPONDER-5-4XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-4XPDR-NW4-TX-toOpenROADM-5-4-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1</opposite-link>
@@ -5461,6 +7864,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -5485,6 +7890,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -5509,6 +7916,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -5533,6 +7942,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -5557,6 +7968,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -5581,6 +7994,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -5605,6 +8020,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -5629,6 +8046,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -5653,6 +8072,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -5677,6 +8098,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -5701,6 +8124,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -5725,6 +8150,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -5749,6 +8176,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -5773,6 +8202,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -5797,6 +8228,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -5821,6 +8254,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -5845,6 +8280,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -5869,6 +8306,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -5893,6 +8332,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -5917,6 +8358,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -5941,6 +8384,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -5965,6 +8410,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -5988,6 +8435,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -6011,6 +8460,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -6034,6 +8485,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -6057,6 +8510,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -6080,6 +8535,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -6103,6 +8560,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>

diff --git a/tests/sample_configs/NW-simple-topology.xml b/tests/sample_configs/NW-simple-topology.xml
index 6519ff434a52f8f6f9294708e498426a1d78a8b9..600db4deb71e13f4f12b935f6265ccb0d31b388c 100644 (file)
--- a/tests/sample_configs/NW-simple-topology.xml
+++ b/tests/sample_configs/NW-simple-topology.xml
@@ -1,15 +1,25 @@
 <network xmlns="urn:ietf:params:xml:ns:yang:ietf-network">
  <network-id>openroadm-topology</network-id>
 <node>    <node-id>OpenROADM-1-1-DEG1</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
+    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -23,15 +33,25 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli11</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-1-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
+    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type><administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -45,15 +65,25 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli11</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-1-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
+    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -67,6 +97,8 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli11</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-1-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli11</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -80,29 +112,53 @@
             </avail-freq-maps>
         </srg-attributes>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>              <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>             <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP5-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP5-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 </node>
 <node>
     <node-id>XPONDER-1-1</node-id>
@@ -115,30 +171,42 @@
         <node-ref>ORANGE1</node-ref>
     </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-1</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-2</tp-id>
@@ -149,16 +217,22 @@
         <tp-id>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-3</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-RX</tp-id>
@@ -169,38 +243,58 @@
         <tp-id>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-4</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW5-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW5-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-5</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW5</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
 </node>
 <node>    <node-id>OpenROADM-1-2-DEG1</node-id>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
+    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -214,15 +308,25 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli12</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-2-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
+    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -236,15 +340,25 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli12</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-1-2-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
+    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -258,6 +372,8 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli12</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-1-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli12</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -271,120 +387,186 @@
             </avail-freq-maps>
         </srg-attributes>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP5-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP5-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 </node>
 <node>        <node-id>XPONDER-1-2</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-1-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE1</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-1</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-2</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-3</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-4</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW5-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW5-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-5</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW5</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
 </node>
 <node>    <node-id>OpenROADM-2-1-DEG1</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
+    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -398,15 +580,25 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli21</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-1-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
+    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -420,15 +612,25 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli21</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-1-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
+    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -442,6 +644,8 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli21</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-2-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli21</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -455,120 +659,186 @@
             </avail-freq-maps>
         </srg-attributes>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>           <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP5-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP5-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 </node>
 <node>        <node-id>XPONDER-2-1</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-2-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE2</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-1</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-2</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-3</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-4</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW5-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW5-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-5</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW5</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
 </node>
 <node>    <node-id>OpenROADM-2-2-DEG1</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
+    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -582,15 +852,25 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli22</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-2-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
+    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -604,15 +884,25 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli22</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-2-2-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
+    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -626,6 +916,8 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli22</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-2-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli22</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -639,120 +931,186 @@
             </avail-freq-maps>
         </srg-attributes>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP5-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP5-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 </node>
 <node>        <node-id>XPONDER-2-2</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-2-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE2</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-1</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-2</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-3</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-4</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW5-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW5-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-5</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW5</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
 </node>
 <node>    <node-id>OpenROADM-3-1-DEG1</node-id>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
+    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -766,15 +1124,25 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli31</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-1-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
+    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -788,15 +1156,25 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli31</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-1-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
+    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -810,6 +1188,8 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli31</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-3-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli31</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -823,120 +1203,186 @@
             </avail-freq-maps>
         </srg-attributes>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>     <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP5-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP5-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 </node>
 <node>        <node-id>XPONDER-3-1</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-3-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE3</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-1</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-2</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-3</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-4</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW5-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW5-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-5</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW5</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
 </node>
 <node>    <node-id>OpenROADM-3-2-DEG1</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
+    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -950,15 +1396,25 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli32</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-2-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
+    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -972,15 +1428,25 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli32</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-3-2-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
+    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -994,6 +1460,8 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli32</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-3-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli32</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -1007,120 +1475,186 @@
             </avail-freq-maps>
         </srg-attributes>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP5-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP5-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 </node>
 <node>        <node-id>XPONDER-3-2</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-3-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE3</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-1</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-2</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-3</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-4</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW5-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW5-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-5</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW5</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
 </node>
 <node>    <node-id>OpenROADM-4-1-DEG1</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
+    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -1134,15 +1668,25 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli41</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-1-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
+    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -1156,15 +1700,25 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli41</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-1-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
+    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -1178,6 +1732,8 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli41</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-4-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli41</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -1191,120 +1747,186 @@
             </avail-freq-maps>
         </srg-attributes>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP5-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP5-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 </node>
 <node>        <node-id>XPONDER-4-1</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-4-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE4</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-1</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-2</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-3</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-4</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW5-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW5-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-5</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW5</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
 </node>
 <node>    <node-id>OpenROADM-4-2-DEG1</node-id>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
+    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -1318,15 +1940,25 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli42</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-2-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
+    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -1340,15 +1972,25 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli42</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-4-2-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
+    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -1362,6 +2004,8 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli42</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-4-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli42</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -1375,120 +2019,186 @@
             </avail-freq-maps>
         </srg-attributes>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>              <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>              <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP5-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP5-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 </node>
 <node>        <node-id>XPONDER-4-2</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-4-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE4</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-1</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-2</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-3</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-4</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW5-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW5-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-5</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW5</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
 </node>
 <node>    <node-id>OpenROADM-5-1-DEG1</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
+    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -1503,14 +2213,24 @@
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli51</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-1-DEG2</node-id>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
+    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -1524,15 +2244,25 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli51</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-1-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
+    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -1546,6 +2276,8 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli51</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-5-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli51</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -1559,120 +2291,186 @@
             </avail-freq-maps>
         </srg-attributes>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>              <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP5-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP5-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 </node>
 <node>        <node-id>XPONDER-5-1</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-5-1</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE5</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW1-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-1</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW1</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW2-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-2</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW2</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW3-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-3</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW3</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW4-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-4</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW4</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW5-RX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>XPDR-NW5-TX</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">Client-5</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <tp-id>Client-5</tp-id>
         <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
         <associated-connection-map-port xmlns="http://transportpce/topology">XPDR-NW5</associated-connection-map-port>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     </termination-point>
 </node>
 <node>    <node-id>OpenROADM-5-2-DEG1</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
+    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -1686,15 +2484,25 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli52</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-2-DEG2</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
+    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -1708,15 +2516,25 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli52</node-ref>    </supporting-node></node>
 <node>    <node-id>OpenROADM-5-2-DEG3</node-id>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
+  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
     <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type></termination-point>
+    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </termination-point>
   <degree-attributes xmlns="http://org/openroadm/network/topology">
             <avail-freq-maps>
                 <map-name>cband</map-name>
@@ -1730,6 +2548,8 @@
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>clli52</node-ref>    </supporting-node></node>
 <node>   <node-id>OpenROADM-5-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node>
         <supporting-node><network-ref>clli-network</network-ref><node-ref>clli52</node-ref>    </supporting-node>
         <srg-attributes xmlns="http://org/openroadm/network/topology">
@@ -1743,261 +2563,449 @@
             </avail-freq-maps>
         </srg-attributes>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP5-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP5-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               </termination-point>
+   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</termination-point>
 </node>
 <node>        <node-id>XPONDER-5-2</node-id>
     <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-5-2</node-ref>    </supporting-node>
     <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE5</node-ref>    </supporting-node>
     <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW5-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-5</tail-equipment-id></xpdr-network-attributes>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW5-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
         <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
         <tail-equipment-id>Client-5</tail-equipment-id></xpdr-network-attributes>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
 <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-5</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
 </node>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW1-TX-toOpenROADM-1-1-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-PP1-TX-to-XPONDER-1-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP1-TX-to-XPONDER-1-1XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-1XPDR-NW1-TX-toOpenROADM-1-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW2-TX-toOpenROADM-1-1-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-PP2-TX-to-XPONDER-1-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP2-TX-to-XPONDER-1-1XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-1XPDR-NW2-TX-toOpenROADM-1-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW3-TX-toOpenROADM-1-1-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-PP3-TX-to-XPONDER-1-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP3-TX-to-XPONDER-1-1XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-1XPDR-NW3-TX-toOpenROADM-1-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW4-TX-toOpenROADM-1-1-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-PP4-TX-to-XPONDER-1-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP4-TX-to-XPONDER-1-1XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-1XPDR-NW4-TX-toOpenROADM-1-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW5-TX-toOpenROADM-1-1-SRG1-SRG1-PP5-RX</link-id>
         <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW5-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-PP5-TX-to-XPONDER-1-1XPDR-NW5-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP5-TX-to-XPONDER-1-1XPDR-NW5-RX</link-id>
         <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-1XPDR-NW5-TX-toOpenROADM-1-1-SRG1-SRG1-PP5-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-PP1-TX-to-XPONDER-1-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP1-TX-to-XPONDER-1-2XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW2-TX-toOpenROADM-1-2-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-PP2-TX-to-XPONDER-1-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP2-TX-to-XPONDER-1-2XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-2XPDR-NW2-TX-toOpenROADM-1-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW3-TX-toOpenROADM-1-2-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-PP3-TX-to-XPONDER-1-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP3-TX-to-XPONDER-1-2XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-2XPDR-NW3-TX-toOpenROADM-1-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW4-TX-toOpenROADM-1-2-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-PP4-TX-to-XPONDER-1-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP4-TX-to-XPONDER-1-2XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-2XPDR-NW4-TX-toOpenROADM-1-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW5-TX-toOpenROADM-1-2-SRG1-SRG1-PP5-RX</link-id>
         <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW5-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-PP5-TX-to-XPONDER-1-2XPDR-NW5-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP5-TX-to-XPONDER-1-2XPDR-NW5-RX</link-id>
         <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-2XPDR-NW5-TX-toOpenROADM-1-2-SRG1-SRG1-PP5-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1</opposite-link>
@@ -2006,6 +3014,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -2029,6 +3039,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -2052,6 +3064,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -2075,6 +3089,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -2093,185 +3109,319 @@
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+</link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW1-TX-toOpenROADM-2-1-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-PP1-TX-to-XPONDER-2-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP1-TX-to-XPONDER-2-1XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-1XPDR-NW1-TX-toOpenROADM-2-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW2-TX-toOpenROADM-2-1-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-PP2-TX-to-XPONDER-2-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP2-TX-to-XPONDER-2-1XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-1XPDR-NW2-TX-toOpenROADM-2-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW3-TX-toOpenROADM-2-1-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-PP3-TX-to-XPONDER-2-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP3-TX-to-XPONDER-2-1XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-1XPDR-NW3-TX-toOpenROADM-2-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW4-TX-toOpenROADM-2-1-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-PP4-TX-to-XPONDER-2-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP4-TX-to-XPONDER-2-1XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-1XPDR-NW4-TX-toOpenROADM-2-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW5-TX-toOpenROADM-2-1-SRG1-SRG1-PP5-RX</link-id>
         <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW5-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-PP5-TX-to-XPONDER-2-1XPDR-NW5-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP5-TX-to-XPONDER-2-1XPDR-NW5-RX</link-id>
         <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-1XPDR-NW5-TX-toOpenROADM-2-1-SRG1-SRG1-PP5-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW1-TX-toOpenROADM-2-2-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-PP1-TX-to-XPONDER-2-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP1-TX-to-XPONDER-2-2XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-2XPDR-NW1-TX-toOpenROADM-2-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW2-TX-toOpenROADM-2-2-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-PP2-TX-to-XPONDER-2-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP2-TX-to-XPONDER-2-2XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-2XPDR-NW2-TX-toOpenROADM-2-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW3-TX-toOpenROADM-2-2-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-PP3-TX-to-XPONDER-2-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP3-TX-to-XPONDER-2-2XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-2XPDR-NW3-TX-toOpenROADM-2-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW4-TX-toOpenROADM-2-2-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-PP4-TX-to-XPONDER-2-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP4-TX-to-XPONDER-2-2XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-2XPDR-NW4-TX-toOpenROADM-2-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW5-TX-toOpenROADM-2-2-SRG1-SRG1-PP5-RX</link-id>
         <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW5-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-PP5-TX-to-XPONDER-2-2XPDR-NW5-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP5-TX-to-XPONDER-2-2XPDR-NW5-RX</link-id>
         <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-2XPDR-NW5-TX-toOpenROADM-2-2-SRG1-SRG1-PP5-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1</opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -2293,6 +3443,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -2314,6 +3466,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -2335,6 +3489,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -2353,185 +3509,319 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW1-TX-toOpenROADM-3-1-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-PP1-TX-to-XPONDER-3-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP1-TX-to-XPONDER-3-1XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-1XPDR-NW1-TX-toOpenROADM-3-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW2-TX-toOpenROADM-3-1-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-PP2-TX-to-XPONDER-3-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP2-TX-to-XPONDER-3-1XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-1XPDR-NW2-TX-toOpenROADM-3-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW3-TX-toOpenROADM-3-1-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-PP3-TX-to-XPONDER-3-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP3-TX-to-XPONDER-3-1XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-1XPDR-NW3-TX-toOpenROADM-3-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW4-TX-toOpenROADM-3-1-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-PP4-TX-to-XPONDER-3-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP4-TX-to-XPONDER-3-1XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-1XPDR-NW4-TX-toOpenROADM-3-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW5-TX-toOpenROADM-3-1-SRG1-SRG1-PP5-RX</link-id>
         <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW5-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-PP5-TX-to-XPONDER-3-1XPDR-NW5-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP5-TX-to-XPONDER-3-1XPDR-NW5-RX</link-id>
         <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-1XPDR-NW5-TX-toOpenROADM-3-1-SRG1-SRG1-PP5-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW1-TX-toOpenROADM-3-2-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-PP1-TX-to-XPONDER-3-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP1-TX-to-XPONDER-3-2XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-2XPDR-NW1-TX-toOpenROADM-3-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW2-TX-toOpenROADM-3-2-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-PP2-TX-to-XPONDER-3-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP2-TX-to-XPONDER-3-2XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-2XPDR-NW2-TX-toOpenROADM-3-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW3-TX-toOpenROADM-3-2-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-PP3-TX-to-XPONDER-3-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP3-TX-to-XPONDER-3-2XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-2XPDR-NW3-TX-toOpenROADM-3-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW4-TX-toOpenROADM-3-2-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-PP4-TX-to-XPONDER-3-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP4-TX-to-XPONDER-3-2XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-2XPDR-NW4-TX-toOpenROADM-3-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW5-TX-toOpenROADM-3-2-SRG1-SRG1-PP5-RX</link-id>
         <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW5-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-PP5-TX-to-XPONDER-3-2XPDR-NW5-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP5-TX-to-XPONDER-3-2XPDR-NW5-RX</link-id>
         <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-2XPDR-NW5-TX-toOpenROADM-3-2-SRG1-SRG1-PP5-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1</opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -2553,6 +3843,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -2574,6 +3866,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -2595,6 +3889,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -2613,185 +3909,319 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW1-TX-toOpenROADM-4-1-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-PP1-TX-to-XPONDER-4-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP1-TX-to-XPONDER-4-1XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-1XPDR-NW1-TX-toOpenROADM-4-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW2-TX-toOpenROADM-4-1-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-PP2-TX-to-XPONDER-4-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP2-TX-to-XPONDER-4-1XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-1XPDR-NW2-TX-toOpenROADM-4-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW3-TX-toOpenROADM-4-1-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-PP3-TX-to-XPONDER-4-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP3-TX-to-XPONDER-4-1XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-1XPDR-NW3-TX-toOpenROADM-4-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW4-TX-toOpenROADM-4-1-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-PP4-TX-to-XPONDER-4-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP4-TX-to-XPONDER-4-1XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-1XPDR-NW4-TX-toOpenROADM-4-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW5-TX-toOpenROADM-4-1-SRG1-SRG1-PP5-RX</link-id>
         <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW5-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-PP5-TX-to-XPONDER-4-1XPDR-NW5-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP5-TX-to-XPONDER-4-1XPDR-NW5-RX</link-id>
         <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-1XPDR-NW5-TX-toOpenROADM-4-1-SRG1-SRG1-PP5-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW1-TX-toOpenROADM-4-2-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-PP1-TX-to-XPONDER-4-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP1-TX-to-XPONDER-4-2XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-2XPDR-NW1-TX-toOpenROADM-4-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW2-TX-toOpenROADM-4-2-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-PP2-TX-to-XPONDER-4-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP2-TX-to-XPONDER-4-2XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-2XPDR-NW2-TX-toOpenROADM-4-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW3-TX-toOpenROADM-4-2-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-PP3-TX-to-XPONDER-4-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP3-TX-to-XPONDER-4-2XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-2XPDR-NW3-TX-toOpenROADM-4-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW4-TX-toOpenROADM-4-2-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-PP4-TX-to-XPONDER-4-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP4-TX-to-XPONDER-4-2XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-2XPDR-NW4-TX-toOpenROADM-4-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW5-TX-toOpenROADM-4-2-SRG1-SRG1-PP5-RX</link-id>
         <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW5-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-PP5-TX-to-XPONDER-4-2XPDR-NW5-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP5-TX-to-XPONDER-4-2XPDR-NW5-RX</link-id>
         <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-2XPDR-NW5-TX-toOpenROADM-4-2-SRG1-SRG1-PP5-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1</opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -2813,6 +4243,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -2834,6 +4266,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -2855,6 +4289,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -2873,185 +4309,319 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW1-TX-toOpenROADM-5-1-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-PP1-TX-to-XPONDER-5-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP1-TX-to-XPONDER-5-1XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-1XPDR-NW1-TX-toOpenROADM-5-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW2-TX-toOpenROADM-5-1-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-PP2-TX-to-XPONDER-5-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP2-TX-to-XPONDER-5-1XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-1XPDR-NW2-TX-toOpenROADM-5-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW3-TX-toOpenROADM-5-1-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-PP3-TX-to-XPONDER-5-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP3-TX-to-XPONDER-5-1XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-1XPDR-NW3-TX-toOpenROADM-5-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW4-TX-toOpenROADM-5-1-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-PP4-TX-to-XPONDER-5-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP4-TX-to-XPONDER-5-1XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-1XPDR-NW4-TX-toOpenROADM-5-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW5-TX-toOpenROADM-5-1-SRG1-SRG1-PP5-RX</link-id>
         <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW5-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-PP5-TX-to-XPONDER-5-1XPDR-NW5-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP5-TX-to-XPONDER-5-1XPDR-NW5-RX</link-id>
         <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-1XPDR-NW5-TX-toOpenROADM-5-1-SRG1-SRG1-PP5-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</link-id>
         <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</link-id>
             <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
         <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</link-id>
             <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
             <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type></link>
+            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+        </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW1-TX-toOpenROADM-5-2-SRG1-SRG1-PP1-RX</link-id>
         <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-PP1-TX-to-XPONDER-5-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP1-TX-to-XPONDER-5-2XPDR-NW1-RX</link-id>
         <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-2XPDR-NW1-TX-toOpenROADM-5-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW2-TX-toOpenROADM-5-2-SRG1-SRG1-PP2-RX</link-id>
         <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-PP2-TX-to-XPONDER-5-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP2-TX-to-XPONDER-5-2XPDR-NW2-RX</link-id>
         <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-2XPDR-NW2-TX-toOpenROADM-5-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW3-TX-toOpenROADM-5-2-SRG1-SRG1-PP3-RX</link-id>
         <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-PP3-TX-to-XPONDER-5-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP3-TX-to-XPONDER-5-2XPDR-NW3-RX</link-id>
         <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-2XPDR-NW3-TX-toOpenROADM-5-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW4-TX-toOpenROADM-5-2-SRG1-SRG1-PP4-RX</link-id>
         <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-PP4-TX-to-XPONDER-5-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP4-TX-to-XPONDER-5-2XPDR-NW4-RX</link-id>
         <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-2XPDR-NW4-TX-toOpenROADM-5-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW5-TX-toOpenROADM-5-2-SRG1-SRG1-PP5-RX</link-id>
         <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW5-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-PP5-TX-to-XPONDER-5-2XPDR-NW5-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type></link>
+        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
+    </link>
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP5-TX-to-XPONDER-5-2XPDR-NW5-RX</link-id>
         <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
         <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-2XPDR-NW5-TX-toOpenROADM-5-2-SRG1-SRG1-PP5-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type></link>
+       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
+
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state></link>
 <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
     <link-id>OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1</link-id>
     <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1</opposite-link>
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>    
-    <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>    
+    <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -3073,6 +4643,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -3094,6 +4666,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -3115,6 +4689,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -3136,6 +4712,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -3157,6 +4735,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -3178,6 +4758,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -3199,6 +4781,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -3220,6 +4804,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -3241,6 +4827,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -3262,6 +4850,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -3283,6 +4873,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -3304,6 +4896,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>
@@ -3325,6 +4919,8 @@
     <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
     <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
     <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
+    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
     <OMS-attributes xmlns="http://org/openroadm/network/topology">
         <span>
             <auto-spanloss>true</auto-spanloss>

diff --git a/tests/sample_configs/honeynode-topo.xml b/tests/sample_configs/honeynode-topo.xml
index 5d8c513f6ccc42984164131fad1055e72aa6ba25..86f80015b039260d09fb63742dc35484cecfc0c7 100644 (file)
--- a/tests/sample_configs/honeynode-topo.xml
+++ b/tests/sample_configs/honeynode-topo.xml
@@ -3,6 +3,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>DEG1-CTP-TXRX</dest-tp>
             <dest-node>ROADMA01-DEG1</dest-node>
@@ -16,6 +18,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>DEG2-CTP-TXRX</dest-tp>
             <dest-node>ROADMC01-DEG2</dest-node>
@@ -29,6 +33,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>DEG1-CTP-TXRX</dest-tp>
             <dest-node>ROADMA01-DEG1</dest-node>
@@ -42,6 +48,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>SRG1-PP1-TXRX</dest-tp>
             <dest-node>ROADMA01-SRG1</dest-node>
@@ -55,6 +63,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>DEG2-CTP-TXRX</dest-tp>
             <dest-node>ROADMA01-DEG2</dest-node>
@@ -68,6 +78,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>DEG1-CTP-TXRX</dest-tp>
             <dest-node>ROADMC01-DEG1</dest-node>
@@ -81,6 +93,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>DEG2-CTP-TXRX</dest-tp>
             <dest-node>ROADMC01-DEG2</dest-node>
@@ -94,6 +108,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>SRG1-CP-TXRX</dest-tp>
             <dest-node>ROADMA01-SRG1</dest-node>
@@ -107,6 +123,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>SRG1-CP-TXRX</dest-tp>
             <dest-node>ROADMA01-SRG1</dest-node>
@@ -120,6 +138,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <clfi xmlns="http://org/openroadm/common/network">fiberA01C01</clfi>
         <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
         <destination>
@@ -150,6 +170,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>XPDR1-NETWORK1</dest-tp>
             <dest-node>XPDRA01-XPDR1</dest-node>
@@ -163,6 +185,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <clfi xmlns="http://org/openroadm/common/network">fiberC01A01</clfi>
         <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
         <destination>
@@ -193,6 +217,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>SRG1-CP-TXRX</dest-tp>
             <dest-node>ROADMC01-SRG1</dest-node>
@@ -206,6 +232,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>DEG1-CTP-TXRX</dest-tp>
             <dest-node>ROADMC01-DEG1</dest-node>
@@ -219,6 +247,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>SRG1-CP-TXRX</dest-tp>
             <dest-node>ROADMC01-SRG1</dest-node>
@@ -232,6 +262,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMC01-SRG1-SRG1-PP1-TXRXtoXPDRC01-XPDR1-XPDR1-NETWORK1</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">XPDRC01-XPDR1-XPDR1-NETWORK1toROADMC01-SRG1-SRG1-PP1-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>XPDR1-NETWORK1</dest-tp>
             <dest-node>XPDRC01-XPDR1</dest-node>
@@ -245,6 +277,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>DEG2-CTP-TXRX</dest-tp>
             <dest-node>ROADMA01-DEG2</dest-node>
@@ -258,6 +292,8 @@
     <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
         <link-id>XPDRC01-XPDR1-XPDR1-NETWORK1toROADMC01-SRG1-SRG1-PP1-TXRX</link-id>
         <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-SRG1-SRG1-PP1-TXRXtoXPDRC01-XPDR1-XPDR1-NETWORK1</opposite-link>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <destination>
             <dest-tp>SRG1-PP1-TXRX</dest-tp>
             <dest-node>ROADMC01-SRG1</dest-node>
@@ -273,73 +309,109 @@
     </network-types>
     <node>
         <node-id>ROADMC01-SRG1</node-id>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP12-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP15-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP5-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP8-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP6-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP9-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP10-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP14-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP16-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP7-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP11-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP13-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <supporting-node>
             <network-ref>openroadm-network</network-ref>
@@ -363,13 +435,19 @@
     </node>
     <node>
         <node-id>ROADMC01-DEG1</node-id>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>DEG1-CTP-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>DEG1-TTP-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
         <supporting-node>
@@ -394,13 +472,19 @@
     </node>
     <node>
         <node-id>ROADMC01-DEG2</node-id>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>DEG2-TTP-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>DEG2-CTP-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
         <supporting-node>
@@ -425,73 +509,109 @@
     </node>
     <node>
         <node-id>ROADMA01-SRG1</node-id>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP12-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP15-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP1-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP2-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-CP-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-CP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP5-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP8-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP6-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP9-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP3-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP10-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP14-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP16-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP7-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP11-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP13-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>SRG1-PP4-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <supporting-node>
             <network-ref>openroadm-network</network-ref>
@@ -515,25 +635,35 @@
     </node>
     <node>
         <node-id>XPDRA01-XPDR1</node-id>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-NETWORK2</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
             <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT2</associated-connection-map-port>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-CLIENT2</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
             <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK2</associated-connection-map-port>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-CLIENT1</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
             <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK1</associated-connection-map-port>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-NETWORK1</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
             <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT1</associated-connection-map-port>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
         <supporting-node>
@@ -547,13 +677,19 @@
     </node>
     <node>
         <node-id>ROADMA01-DEG2</node-id>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>DEG2-TTP-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>DEG2-CTP-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
         <supporting-node>
@@ -578,25 +714,35 @@
     </node>
     <node>
         <node-id>XPDRC01-XPDR1</node-id>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-NETWORK2</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
             <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT2</associated-connection-map-port>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-CLIENT2</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
             <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK2</associated-connection-map-port>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-CLIENT1</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
             <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-NETWORK1</associated-connection-map-port>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>XPDR1-NETWORK1</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
             <associated-connection-map-port xmlns="http://transportpce/topology">XPDR1-CLIENT1</associated-connection-map-port>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
         <supporting-node>
@@ -610,13 +756,19 @@
     </node>
     <node>
         <node-id>ROADMA01-DEG1</node-id>
+        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>DEG1-CTP-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
             <tp-id>DEG1-TTP-TXRX</tp-id>
             <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
+            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
+            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
         </termination-point>
         <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
         <supporting-node>