Add TAPI Topology simulated network function type.

Issue-ID: SIM-81
Change-Id: I475311b789b8ac7599e9604af7b3e467b3f322f3
Signed-off-by: Alex Stancu <alexandru.stancu@highstreet-technologies.com>
diff --git a/ntsimulator/deploy/smo-nts-ng-topology-server/Dockerfile b/ntsimulator/deploy/smo-nts-ng-topology-server/Dockerfile
new file mode 100644
index 0000000..14a94c5
--- /dev/null
+++ b/ntsimulator/deploy/smo-nts-ng-topology-server/Dockerfile
@@ -0,0 +1,43 @@
+#
+# Copyright 2020 highstreet technologies GmbH and others
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+################
+#### DEVICE ####
+################
+
+FROM nexus3.o-ran-sc.org:10004/o-ran-sc/nts-ng-base:latest
+LABEL maintainer="alexandru.stancu@highstreet-technologies.com / adrian.lita@highstreet-technologies.com"
+
+# ntsim-ng configuration and deployment
+COPY ./yang /opt/dev/deploy/yang
+COPY ./data /opt/dev/deploy/data
+COPY ./config.json /opt/dev/ntsim-ng/config/config.json
+
+# ntsim-ng init docker
+RUN /opt/dev/ntsim-ng/ntsim-ng --container-init -w /opt/dev/ntsim-ng
+
+# finishing container build
+ARG BUILD_DATE
+LABEL build-date=$BUILD_DATE
+
+# add exposed ports
+EXPOSE 830-929
+EXPOSE 21-22
+
+ENV NTS_FUNCTION_TYPE=NTS_FUNCTION_TYPE_TOPOLOGY_SERVER
+
+# run
+WORKDIR /opt/dev/workspace
+CMD ["/opt/dev/ntsim-ng/ntsim-ng", "-w/opt/dev/ntsim-ng", "--supervisor"]
diff --git a/ntsimulator/deploy/smo-nts-ng-topology-server/config.json b/ntsimulator/deploy/smo-nts-ng-topology-server/config.json
new file mode 100644
index 0000000..6a8587e
--- /dev/null
+++ b/ntsimulator/deploy/smo-nts-ng-topology-server/config.json
@@ -0,0 +1,65 @@
+{
+    "container-rules": {
+        "excluded-modules": [
+            "tapi-connectivity",
+            "tapi-equipment",
+            "tapi-eth",
+            "tapi-notification",
+            "tapi-oam",
+            "tapi-odu",
+            "tapi-path-computation",
+            "tapi-photonic-media",
+            "tapi-streaming",
+            "tapi-virtual-network"
+        ],
+        "excluded-features": []
+    },
+
+    "supervisor-rules": {
+        "netopeer": {
+            "path": "/usr/local/bin/netopeer2-server",
+            "args": ["-d", "-v2"],
+            "autorestart": true,
+            "stdout": "log/netopeer-stdout.log",
+            "stderr": "log/netopeer-stderr.log"
+        },
+
+        "ntsim-network-function": {
+            "path": "/opt/dev/ntsim-ng/ntsim-ng",
+            "args": ["-w/opt/dev/ntsim-ng", "-f"],
+            "nomanual": false
+        }
+    },
+
+    "datastore-random-generation-rules" : {
+        "excluded-modules": [
+            "sysrepo",
+            "sysrepo-monitoring",
+            "ietf-yang-library",
+            "ietf-netconf-acm",
+            "ietf-netconf-monitoring",
+            "nc-notifications",
+            "ietf-keystore",
+            "ietf-truststore",
+            "ietf-system",
+            "ietf-netconf-server",
+            "nts-network-function"
+        ],
+
+        "debug-max-string-size" : 50,
+        
+        "default-list-instances": 1,
+        "custom-list-instances" : []
+    },
+
+    "datastore-populate-rules": {
+        "random-generation-enabled": false,
+
+        "pre-generated-operational-data": [
+            
+        ],
+        "pre-generated-running-data": [
+            
+        ]
+    }
+}
diff --git a/ntsimulator/deploy/smo-nts-ng-topology-server/container-tag.yaml b/ntsimulator/deploy/smo-nts-ng-topology-server/container-tag.yaml
new file mode 100644
index 0000000..05ecadb
--- /dev/null
+++ b/ntsimulator/deploy/smo-nts-ng-topology-server/container-tag.yaml
@@ -0,0 +1,2 @@
+---
+tag: 1.3.6
\ No newline at end of file
diff --git a/ntsimulator/deploy/smo-nts-ng-topology-server/data/README.md b/ntsimulator/deploy/smo-nts-ng-topology-server/data/README.md
new file mode 100644
index 0000000..7b501f4
--- /dev/null
+++ b/ntsimulator/deploy/smo-nts-ng-topology-server/data/README.md
@@ -0,0 +1,2 @@
+This folder should contain XML/JSON data for pre-populating running/operational.
+Data files by themselves are not taken into account until added to config.json
diff --git a/ntsimulator/deploy/smo-nts-ng-topology-server/local.Dockerfile b/ntsimulator/deploy/smo-nts-ng-topology-server/local.Dockerfile
new file mode 100644
index 0000000..ca9257c
--- /dev/null
+++ b/ntsimulator/deploy/smo-nts-ng-topology-server/local.Dockerfile
@@ -0,0 +1,43 @@
+#
+# Copyright 2020 highstreet technologies GmbH and others
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+################
+#### DEVICE ####
+################
+
+FROM o-ran-sc/nts-ng-base:latest
+LABEL maintainer="alexandru.stancu@highstreet-technologies.com / adrian.lita@highstreet-technologies.com"
+
+# ntsim-ng configuration and deployment
+COPY ./yang /opt/dev/deploy/yang
+COPY ./data /opt/dev/deploy/data
+COPY ./config.json /opt/dev/ntsim-ng/config/config.json
+
+# ntsim-ng init docker
+RUN /opt/dev/ntsim-ng/ntsim-ng --container-init -w /opt/dev/ntsim-ng
+
+# finishing container build
+ARG BUILD_DATE
+LABEL build-date=$BUILD_DATE
+
+# add exposed ports
+EXPOSE 830-929
+EXPOSE 21-22
+
+ENV NTS_FUNCTION_TYPE=NTS_FUNCTION_TYPE_TOPOLOGY_SERVER
+
+# run
+WORKDIR /opt/dev/workspace
+CMD ["/opt/dev/ntsim-ng/ntsim-ng", "-w/opt/dev/ntsim-ng", "--supervisor"]
diff --git a/ntsimulator/deploy/smo-nts-ng-topology-server/yang/iana-hardware.yang b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/iana-hardware.yang
new file mode 100644
index 0000000..52bcaf3
--- /dev/null
+++ b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/iana-hardware.yang
@@ -0,0 +1,180 @@
+module iana-hardware {
+yang-version 1.1;
+namespace "urn:ietf:params:xml:ns:yang:iana-hardware";
+prefix ianahw;
+
+organization "IANA";
+contact
+  "        Internet Assigned Numbers Authority
+   Postal: ICANN
+           12025 Waterfront Drive, Suite 300
+           Los Angeles, CA  90094-2536
+           United States of America
+   Tel:    +1 310 301 5800
+   E-Mail: iana@iana.org>";
+
+description
+  "IANA-defined identities for hardware class.
+   The latest revision of this YANG module can be obtained from
+   the IANA website.
+   Requests for new values should be made to IANA via
+   email (iana@iana.org).
+   Copyright (c) 2018 IETF Trust and the persons identified as
+   authors of the code.  All rights reserved.
+   Redistribution and use in source and binary forms, with or
+   without modification, is permitted pursuant to, and subject
+   to the license terms contained in, the Simplified BSD License
+   set forth in Section 4.c of the IETF Trust's Legal Provisions
+   Relating to IETF Documents
+   (https://trustee.ietf.org/license-info).
+   The initial version of this YANG module is part of RFC 8348;
+   see the RFC itself for full legal notices.";
+reference
+  "https://www.iana.org/assignments/yang-parameters";
+
+revision 2018-03-13 {
+  description
+    "Initial revision.";
+  reference
+    "RFC 8348: A YANG Data Model for Hardware Management";
+}
+
+/*
+ * Identities
+ */
+
+identity hardware-class {
+  description
+    "This identity is the base for all hardware class
+     identifiers.";
+}
+
+identity unknown {
+  base ianahw:hardware-class;
+  description
+    "This identity is applicable if the hardware class is unknown
+     to the server.";
+}
+
+identity chassis {
+  base ianahw:hardware-class;
+  description
+    "This identity is applicable if the hardware class is an
+     overall container for networking equipment.  Any class of
+     physical component, except a stack, may be contained within a
+     chassis; a chassis may only be contained within a stack.";
+}
+
+identity backplane {
+  base ianahw:hardware-class;
+  description
+    "This identity is applicable if the hardware class is some sort
+     of device for aggregating and forwarding networking traffic,
+     such as a shared backplane in a modular ethernet switch.  Note
+     that an implementation may model a backplane as a single
+     physical component, which is actually implemented as multiple
+     discrete physical components (within a chassis or stack).";
+}
+
+identity container {
+  base ianahw:hardware-class;
+  description
+    "This identity is applicable if the hardware class is capable
+     of containing one or more removable physical entities,
+     possibly of different types.  For example, each (empty or
+     full) slot in a chassis will be modeled as a container.  Note
+     that all removable physical components should be modeled
+     within a container component, such as field-replaceable
+     modules, fans, or power supplies.  Note that all known
+     containers should be modeled by the agent, including empty
+     containers.";
+}
+
+identity power-supply {
+  base ianahw:hardware-class;
+  description
+    "This identity is applicable if the hardware class is a
+     power-supplying component.";
+}
+
+identity fan {
+  base ianahw:hardware-class;
+  description
+    "This identity is applicable if the hardware class is a fan or
+     other heat-reduction component.";
+}
+
+identity sensor {
+  base ianahw:hardware-class;
+  description
+    "This identity is applicable if the hardware class is some sort
+     of sensor, such as a temperature sensor within a router
+     chassis.";
+}
+
+identity module {
+  base ianahw:hardware-class;
+  description
+    "This identity is applicable if the hardware class is some sort
+     of self-contained sub-system.  If a module component is
+     removable, then it should be modeled within a container
+     component; otherwise, it should be modeled directly within
+     another physical component (e.g., a chassis or another
+     module).";
+}
+
+identity port {
+  base ianahw:hardware-class;
+  description
+    "This identity is applicable if the hardware class is some sort
+     of networking port capable of receiving and/or transmitting
+     networking traffic.";
+}
+
+identity stack {
+  base ianahw:hardware-class;
+  description
+    "This identity is applicable if the hardware class is some sort
+     of super-container (possibly virtual) intended to group
+     together multiple chassis entities.  A stack may be realized
+     by a virtual cable, a real interconnect cable attached to
+     multiple chassis, or multiple interconnect cables.  A stack
+     should not be modeled within any other physical components,
+     but a stack may be contained within another stack.  Only
+     chassis components should be contained within a stack.";
+}
+
+identity cpu {
+  base ianahw:hardware-class;
+  description
+    "This identity is applicable if the hardware class is some sort
+     of central processing unit.";
+}
+
+identity energy-object {
+  base ianahw:hardware-class;
+  description
+    "This identity is applicable if the hardware class is some sort
+     of energy object, i.e., it is a piece of equipment that is
+     part of or attached to a communications network that is
+     monitored, it is controlled, or it aids in the management of
+     another device for Energy Management.";
+}
+
+identity battery {
+  base ianahw:hardware-class;
+  description
+    "This identity is applicable if the hardware class is some sort
+     of battery.";
+}
+
+identity storage-drive {
+  base ianahw:hardware-class;
+  description
+    "This identity is applicable if the hardware class is some sort
+     of component with data storage capability as its main
+     functionality, e.g., hard disk drive (HDD), solid-state device
+     (SSD), solid-state hybrid drive (SSHD), object storage device
+     (OSD), or other.";
+}
+}
diff --git a/ntsimulator/deploy/smo-nts-ng-topology-server/yang/o-ran-common-identity-refs.yang b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/o-ran-common-identity-refs.yang
new file mode 100644
index 0000000..85c3a6c
--- /dev/null
+++ b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/o-ran-common-identity-refs.yang
@@ -0,0 +1,312 @@
+module o-ran-common-identity-refs {
+  yang-version 1.1;
+  namespace "urn:o-ran:wg1identityref:1.0";
+  prefix o-ran-iref;
+
+  import iana-hardware {
+    prefix ianahw;
+  }
+
+  organization
+    "O-RAN Alliance";
+  contact
+    "www.o-ran.org";
+  description
+    "This module defines a set of re-usable identity references, that can be
+     re-used across O-RAN working groups.
+
+     Copyright 2021 the O-RAN Alliance.
+
+     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS'
+     AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+     IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+     ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+     LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+     POSSIBILITY OF SUCH DAMAGE.
+
+     Redistribution and use in source and binary forms, with or without
+     modification, are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the above disclaimer.
+     * Redistributions in binary form must reproduce the above copyright notice,
+     this list of conditions and the above disclaimer in the documentation
+     and/or other materials provided with the distribution.
+     * Neither the Members of the O-RAN Alliance nor the names of its
+     contributors may be used to endorse or promote products derived from
+     this software without specific prior written permission.";
+
+  revision 2021-10-12 {
+    description
+      "O-RAN SC: added SMO and UE functions";
+    reference
+      "O-RAN SC SIM project.";
+  }
+
+  revision 2021-07-16 {
+    description
+      "version 1.0.1
+
+       1) Updates according to change requests:
+         CR#xyz
+         CR#xyz";
+    reference
+      "O-RAN-WG2.IM.0-v02.00";
+  }
+  revision 2020-11-01 {
+    description
+      "version 1.0.0
+
+       1) initial version.";
+    reference
+      "ORAN-WG1.IM.0-v01.00";
+  }
+
+  // O-RAN functional identity types
+
+  identity o-ran-function-base {
+    description
+      "Base identity from which all O-RAN defined functions are derived.
+       This identity is abstract and MUST NOT be used as a value.";
+    reference
+      "O-RAN.WG1.O-RAN-Architecture-Description
+       Chapter: 1.3.1	Definitions";
+  }
+
+  identity o-ru-function {
+    base o-ran-function-base;
+    description
+      "An identity corresponding to an O-RAN Radio Unit Function.";
+  }
+
+  identity o-du-function {
+    base o-ran-function-base;
+    description
+      "An identity corresponding to an O-RAN Distributed Unit Function.";
+  }
+
+  identity o-cu-function {
+    base o-ran-function-base;
+    description
+      "An identity corresponding to all O-RAN Central Unit Functions.
+       This identity is abstract and MUST NOT be used as a value.";
+  }
+
+  identity o-cu-up-function {
+    base o-cu-function;
+    description
+      "An identity corresponding to an O-RAN Central Unit User Plane Function.";
+  }
+
+  identity o-cu-cp-function {
+    base o-cu-function;
+    description
+      "An identity corresponding to an O-RAN Central Unit Control Plane 
+       Function.";
+  }
+
+  identity o-enb-function {
+    base o-ran-function-base;
+    description
+      "An identity corresponding to an O-RAN E-UTRAN Node B Function.
+       E-UTRAN: evolved UMTS Terrestrial Radio Access";
+  }
+
+  identity near-rt-ric-function {
+    base o-ran-function-base;
+    description
+      "An identity corresponding to an O-RAN Near real-time RAN intelligent
+       controller Function.";
+  }
+
+  identity user-equipment-function {
+    base o-ran-function-base;
+    description
+      "An identity corresponding to an UE Function.";
+  }
+  
+  identity smo-function {
+    base o-ran-function-base;
+    description
+      "An identity corresponding to an O-RAN SMO Function.";
+  }
+
+  identity managed-application-function {
+    base o-ran-function-base;
+    description
+      "An identity corresponding to an O-RAN managed application function
+       (also called 'xApp').";
+  }
+
+  // TODO to be aligned with OAM Architecture
+  //      2021-07-21: email to Lyndon send - CR required 
+
+  identity fronthaul-gateway-function {
+    base o-ran-function-base;
+    description
+      "An identity corresponding to an O-RAN Fronthaul Gateway Function.";
+  }
+
+  identity fronthaul-multiplexer-function {
+    base o-ran-function-base;
+    description
+      "An identity corresponding to an O-RAN Fronthaul Multiplexer Function.";
+  }
+  
+  identity transport-node-function {
+    base o-ran-function-base;
+    description
+      "An identity corresponding to a Transport Node Function 
+       (such as  Transponders, Muxponders, ROADM, Wavelength Selected Switch, 
+       Optical Amplifier, Optical Terminal, Optical Repeater, Optical Filter, 
+       Optical Multiplexer, Microwave Terminal, Carrier Ethernet Routers, ... .";
+  }
+
+  identity o-cloud-ims-function {
+    base o-ran-function-base;
+    description
+      "An identity corresponding to an Infrastructure Management Service 
+       Function.";
+  }
+
+  identity o-cloud-dms-function {
+    base o-ran-function-base;
+    description
+      "An identity corresponding to a Deployment Management Service Function.";
+  }
+
+  // O-RAN radio technology identity types
+
+  identity o-ran-radio-technology-base {
+    description
+      "Base identity for O-RAN defined radio technology types.
+
+       This identity is abstract and MUST NOT be used as a value.";
+  }
+
+  identity new-radio-technology {
+    base o-ran-radio-technology-base;
+    description
+      "An identity corresponding to new radio technology.
+
+       This identity is abstract and MUST NOT be used as a value.";
+  }
+
+  identity lte-technology {
+    base o-ran-radio-technology-base;
+    description
+      "An identity corresponding to lte technology.
+
+       This identity is abstract and MUST NOT be used as a value.";
+  }
+
+  identity nb-iot {
+    base lte-technology;
+    description
+      "An identity corresponding to nb-iot technology.
+
+       This identity is abstract and MUST NOT be used as a value.";
+  }
+
+  // O-RAN Transport technology identity types
+
+  identity o-ran-transport-technology-base {
+    description
+      "Base identity from which all O-RAN defined transport technology identities are derived.
+
+       This identity is abstract and MUST NOT be used as a value.";
+  }
+
+  // O-RAN Fronthaul transport identity types
+
+  identity o-ran-fronthaul-transport-base {
+    description
+      "Base identity from which all O-RAN defined fronthaul transports are derived.
+
+       This identity is abstract and MUST NOT be used as a value.";
+  }
+
+  identity ethernet-fronthaul-transport {
+    base o-ran-fronthaul-transport-base;
+    description
+      "an identity corresponding to fronthaul transport using ethernet based flows.
+
+       This identity is abstract and MUST NOT be used as a value.";
+  }
+
+  // Hardware component identity types
+
+  identity o-ran-module {
+    base ianahw:module;
+    description
+      "Any O-RAN module that represents a self-contained sub-system.
+
+       This identity is abstract and MUST NOT be used as a value.";
+  }
+
+  identity o-ran-hardware-class {
+    base ianahw:hardware-class;
+    description
+      "This identity corresponding to a generic O-RAN hardware class.
+
+       This identity is abstract and MUST NOT be used as a value.";
+  }
+
+  identity fpga {
+    base o-ran-hardware-class;
+    description
+      "Represent an FPGA.
+
+       This identity is abstract and MUST NOT be used as a value.";
+  }
+
+  // O-RAN management interface identifiers
+
+  identity management-interface-id {
+    description
+      "Base identity for entity types. A unique identification of the
+       management interface.
+       This identity is abstract and MUST NOT be used for entries.";
+  }
+
+  identity o1 {
+    base management-interface-id;
+    description
+      "An identity for the operation and maintenance management interface
+       for network functions as defined by the O-RAN-Alliance WG10 as extension
+       to 3GPP NG NRM.";
+    reference
+      "O-RAN OAM Interface Specification by WG10";
+  }
+
+  identity o2 {
+    base management-interface-id;
+    description
+      "An identity for the operation and maintenance management interface
+       for a cloud infrastructure service and a could deployment service
+       (O-Cloud) as defined by O-RAN-Alliance WG 6.";
+    reference
+      "O-RAN xxx by WG6
+       TODO update!";
+  }
+
+  identity open-fronthaul-management-plane {
+    base management-interface-id;
+    description
+      "An identity for the operation and maintenance management interface for
+       O-RU functions as defined by O-RAN-Alliance WG 4.";
+    reference
+      "O-RAN Management Plane Specification by WG4";
+  }
+
+  identity transport-management-interface {
+    base management-interface-id;
+    description
+      "An identity for a yang based management interface for transport nodes.";
+  }
+}
diff --git a/ntsimulator/deploy/smo-nts-ng-topology-server/yang/o-ran-topology.yang b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/o-ran-topology.yang
new file mode 100644
index 0000000..ec3512b
--- /dev/null
+++ b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/o-ran-topology.yang
@@ -0,0 +1,90 @@
+module o-ran-topology {
+  yang-version 1.1;
+  namespace "urn:o-ran-common:topology:1.0";
+  prefix o-ran-topo;
+
+  import tapi-common {
+    prefix tapi-common;
+  }
+  import tapi-topology {
+    prefix tapi-topology;
+  }
+  import o-ran-common-identity-refs {
+    prefix o-ran-common;
+  }
+
+  organization
+    "O-RAN Alliance";
+  contact
+    "www.o-ran.org";
+  description
+    "This module contains YANG definitions for the O-RAN Topology augmentation of TAPI Topology.";
+
+  revision 2021-08-06 {
+    description
+      "Initial revision";
+    reference
+      "O-RAN";
+  }
+
+  typedef geographic-coordinate-degree {
+    type decimal64 {
+      fraction-digits 8;
+    }
+    description
+      "Decimal degree (DD) used to express latitude and longitude
+       geographic coordinates.
+       Copied from ietf-te-topology@2020-08-06.yang";
+  }
+
+  // geographic-coordinate-degree
+
+  grouping geolocation-container {
+    description
+      "Contains a GPS location.
+       Copied from ietf-te-topology@2020-08-06.yang";
+    container geolocation {
+      description
+        "Contains a GPS location.";
+      leaf altitude {
+        type int64;
+        units "millimeters";
+        description
+          "Distance above sea level.";
+      }
+      leaf latitude {
+        type geographic-coordinate-degree {
+          range "-90..90";
+        }
+        description
+          "Relative position north or south on the Earth's surface.";
+      }
+      leaf longitude {
+        type geographic-coordinate-degree {
+          range "-180..180";
+        }
+        description
+          "Angular distance east or west on the Earth's surface.";
+      }
+    }
+    // geolocation
+  }
+
+  augment "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node" {
+    description
+      "Augments the TAPI Topology node Context with geolocation information.";
+    uses geolocation-container;
+  }
+
+  augment "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node" {
+    description
+      "Augments the TAPI Topology node Context with the network function type";
+    leaf function {
+      type identityref {
+        base o-ran-common:o-ran-function-base;
+      }
+      description
+        "The type of the Network Function.";
+    }
+  }
+}
diff --git a/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-common@2020-04-23.yang b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-common@2020-04-23.yang
new file mode 100644
index 0000000..f0cf183
--- /dev/null
+++ b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-common@2020-04-23.yang
@@ -0,0 +1,706 @@
+module tapi-common {

+    namespace "urn:onf:otcc:yang:tapi-common";

+    prefix tapi-common;

+    organization "ONF OTCC (Open Transport Configuration & Control) Project";

+    contact "

+         Project Web: <https://wiki.opennetworking.org/display/OTCC/TAPI>

+         Project List: <mailto:transport-api@opennetworking.org>

+         Editor: Karthik Sethuraman <mailto:karthik.sethuraman@necam.com>

+         Andrea Mazzin <mailto:andrea.mazzini@nokia.com>

+         Arturo Mayoral <mailto:arturo.mayoral@telefonica.com>

+         Nigel Davis <mailto:ndavis@ciena.com>";

+    description "

+        This module contains TAPI Common Model definitions.

+        Source: TapiCommon.uml

+        - The TAPI YANG models included in this TAPI release are a *normative* part of the TAPI SDK.

+        - The YANG specifications have been generated from the corresponding UML model using the [ONF EAGLE UML2YANG mapping tool]

+        <https://github.com/OpenNetworkingFoundation/EagleUmlYang>

+        and further edited manually to comply with the [ONF IISOMI UML2YANG mapping guidelines]

+        <https://wiki.opennetworking.org/display/OIMT/UML+-+YANG+Guidelines>

+        - Status of YANG model artifacts can be determined by referring to the corresponding UML artifacts.

+        As described in the UML models, some artifacts are considered *experimental*, and thus the corresponding YANG artifacts.

+        - The ONF TAPI release process does not guarantee backward compatibility of YANG models across major versions of TAPI releases.

+        The YANG model backward compatibility criteria are outlined in section 11 of <https://tools.ietf.org/html/rfc7950>.

+        YANG models included in this release may not be backward compatible with previous TAPI releases.

+        Copyright (c) 2018 Open Networking Foundation (ONF). All rights reserved.

+        License: This module is distributed under the Apache License 2.0.";

+    revision 2020-04-23 {

+        description "ONF Transport API version 2.1.3.

+                   Changes included in this TAPI release (v2.1.3) are listed in

+                   <https://github.com/OpenNetworkingFoundation/TAPI/blob/develop_v2_1/CHANGE_LOG/change-log.2.1.3.md>";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML>";

+    }

+    revision 2019-07-16 {

+        description "ONF Transport API version 2.1.2.

+                   Changes included in this TAPI release (v2.1.2) are listed in

+                   <https://github.com/OpenNetworkingFoundation/TAPI/blob/develop_v2_1/CHANGE_LOG/change-log.2.1.2.md>";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML>";

+    }

+    revision 2018-12-10 {

+        description "ONF Transport API version 2.1.1.

+                   Changes included in this TAPI release (v2.1.1) are listed in

+                   <https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.1.1.md>";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML>";

+    }

+    revision 2018-10-16 {

+        description "ONF Transport API version 2.1.0.

+                   Changes included in this TAPI release (v2.1.0) are listed in

+                   <https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.1.0.md>";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML>";

+    }

+    revision 2018-03-07 {

+        description "ONF Transport API version 2.0.2

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.2.md>";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.2/UML>";

+    }

+    revision 2018-02-16 {

+        description "ONF Transport API version 2.0.1

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.1.md>";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.1/UML>";

+    }

+    revision 2018-01-02 {

+        description "ONF Transport API version 2.0.0

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.0.md>";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.0/UML>";

+    }

+   /**************************

+    * definitions of refrences

+    **************************/

+    grouping service-interface-point-ref {

+        leaf service-interface-point-uuid {

+            type leafref {

+                path '/tapi-common:context/tapi-common:service-interface-point/tapi-common:uuid';

+            }

+            description "none";

+        }

+        description "none";

+    }

+

+   /**************************

+    * package object-classes

+    **************************/ 

+    grouping admin-state-pac {

+        leaf administrative-state {

+            type administrative-state;

+            description "none";

+        }

+        leaf operational-state {

+            type operational-state;

+            config false;

+            description "none";

+        }

+        leaf lifecycle-state {

+            type lifecycle-state;

+            config false;

+            description "none";

+        }

+        description "Provides state attributes that are applicable to an entity that can be administered. Such an entity also has operational and lifecycle aspects.";

+    }

+    grouping global-class {

+        leaf uuid {

+            type uuid;

+            description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. An UUID carries no semantics with respect to the purpose or state of the entity.

+                UUID here uses string representation as defined in RFC 4122.  The canonical representation uses lowercase characters.

+                Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} 

+                Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6";

+        }

+        list name {

+            key 'value-name';

+            uses name-and-value;

+            description "List of names. A property of an entity with a value that is unique in some namespace but may change during the life of the entity. A name carries no semantics with respect to the purpose of the entity.";

+        }

+        description "The TAPI GlobalComponent serves as the super class for all TAPI entities that can be directly retrieved by their ID. As such, these are first class entities and their ID is expected to be globally unique. ";

+    }

+    grouping lifecycle-state-pac {

+        leaf lifecycle-state {

+            type lifecycle-state;

+            config false;

+            description "none";

+        }

+        description "Provides state attributes for an entity that has lifeccycle aspects only.";

+    }

+    grouping local-class {

+        leaf local-id {

+            type string;

+            description "none";

+        }

+        list name {

+            key 'value-name';

+            uses name-and-value;

+            description "List of names. A property of an entity with a value that is unique in some namespace but may change during the life of the entity. A name carries no semantics with respect to the purpose of the entity.";

+        }

+        description "The TAPI GlobalComponent serves as the super class for all TAPI entities that can be directly retrieved by their ID. As such, these are first class entities and their ID is expected to be globally unique. ";

+    }

+    grouping operational-state-pac {

+        leaf operational-state {

+            type operational-state;

+            config false;

+            description "none";

+        }

+        leaf lifecycle-state {

+            type lifecycle-state;

+            config false;

+            description "none";

+        }

+        description "Provides state attributes that are applicable to an entity that reflects operational aspects. Such an entity is expected to also have lifecycle aspects.";

+    }

+    container context {

+        uses tapi-context;

+        presence "Root container for all TAPI interaction";

+        description "none";

+    }

+    grouping tapi-context {

+        list service-interface-point {

+            key 'uuid';

+            uses service-interface-point;

+            description "none";

+        }

+        uses global-class;

+        description "The Network Control Domain (NCD) object class represents the scope of control that a particular SDN controller has with respect to a particular network, (i.e., encompassing a designated set of interconnected (virtual) network elements).";

+    }

+    grouping resource-spec {

+        uses global-class;

+        description "none";

+    }

+    grouping service-spec {

+        uses global-class;

+        description "none";

+    }

+    grouping service-interface-point {

+        leaf layer-protocol-name {

+            type layer-protocol-name;

+            config false;

+            description "Usage of layerProtocolName [>1]  in the ServiceInterfacePoint should be considered experimental";

+        }

+        leaf-list supported-layer-protocol-qualifier {

+            type layer-protocol-qualifier;

+            config false;

+            min-elements 1;

+            description "none";

+        }

+        leaf direction {

+            type port-direction;

+            description "If direction attribute is missing the SIP instance is to be intended as 'BIDIRECTIONAL'";

+        }

+        uses resource-spec;

+        uses admin-state-pac;

+        uses capacity-pac;

+        description "The LogicalTerminationPoint (LTP) object class encapsulates the termination and adaptation functions of one or more transport layers. 

+            The structure of LTP supports all transport protocols including circuit and packet forms.";

+    }

+    grouping capacity-pac {

+        container total-potential-capacity {

+            config false;

+            uses capacity;

+            description "An optimistic view of the capacity of the TopologicalEntity assuming that any shared capacity is available to be taken.";

+        }

+        container available-capacity {

+            config false;

+            uses capacity;

+            description "Capacity available to be assigned.";

+        }

+        description "The TopologicalEntity derives capacity from the underlying realization. 

+            A TopologicalEntity may be an abstraction and virtualization of a subset of the underlying capability offered in a view or may be directly reflecting the underlying realization.

+            A TopologicalEntity may be directly used in the view or may be assigned to another view for use.

+            The clients supported by a multi-layer TopologicalEntity may interact such that the resources used by one client may impact those available to another. This is derived from the LTP spec details.

+            Represents the capacity available to user (client) along with client interaction and usage. 

+            A TopologicalEntity may reflect one or more client protocols and one or more members for each profile.";

+    }

+    grouping termination-pac {

+        leaf termination-direction {

+            type termination-direction;

+            config false;

+            description "The overall directionality of the LP. 

+                - A BIDIRECTIONAL LP will have some SINK and/or SOURCE flowss.

+                - A SINK LP can only contain elements with SINK flows or CONTRA_DIRECTION_SOURCE flows

+                - A SOURCE LP can only contain SOURCE flows or CONTRA_DIRECTION_SINK flows";

+        }

+        leaf termination-state {

+            type termination-state;

+            config false;

+            description "Indicates whether the layer is terminated and if so how.";

+        }

+        description "Each transport layer is represented by a LayerProtocol (LP) instance. The LayerProtocol instances it can be used for controlling termination and monitoring functionality. 

+            It can also be used for controlling the adaptation (i.e. encapsulation and/or multiplexing of client signal), tandem connection monitoring, traffic conditioning and/or shaping functionality at an intermediate point along a connection. 

+            Where the client – server relationship is fixed 1:1 and immutable, the layers can be encapsulated in a single LTP instance. Where the is a n:1 relationship between client and server, the layers must be split over two separate instances of LTP. ";

+    }

+

+    /**************************

+    * package type-definitions

+    **************************/ 

+    identity LAYER_PROTOCOL_QUALIFIER {

+        description "none";

+    }

+    identity LAYER_PROTOCOL_QUALIFIER_UNSPECIFIED {

+        base LAYER_PROTOCOL_QUALIFIER;

+        description "none";

+    }

+    typedef administrative-state {

+        type enumeration {

+            enum LOCKED {

+                description "Users are administratively prohibited from making use of the resource.";

+            }

+            enum UNLOCKED {

+                description "Users are allowed to use the resource";

+            }

+        }

+        description "The possible values of the administrativeState.";

+    }

+    typedef date-and-time {

+        type string;

+        description "This primitive type defines the date and time according to the following structure:

+            yyyyMMddhhmmss.s[Z|{+|-}HHMm] where:

+            yyyy    0000..9999    year

+            MM    01..12            month

+            dd        01..31            day

+            hh        00..23            hour

+            mm    00..59            minute

+            ss        00..59            second

+            s        .0...9            tenth of second (set to .0 if EMS or NE cannot support this granularity)

+            Z        Z                indicates UTC (rather than local time)

+            {+|-}    + or -            delta from UTC

+            HH        00..23            time zone difference in hours

+            Mm    00..59            time zone difference in minutes.";

+    }

+    typedef directive-value {

+        type enumeration {

+            enum MINIMIZE {

+                description "none";

+            }

+            enum MAXIMIZE {

+                description "none";

+            }

+            enum ALLOW {

+                description "none";

+            }

+            enum DISALLOW {

+                description "none";

+            }

+            enum DONT_CARE {

+                description "none";

+            }

+        }

+        description "none";

+    }

+    typedef forwarding-direction {

+        type enumeration {

+            enum BIDIRECTIONAL {

+                description "The Fowarding entity supports both BIDIRECTIONAL flows at all Ports (i.e. all Ports have both an INPUT flow and an OUTPUT flow defined)";

+            }

+            enum UNIDIRECTIONAL {

+                description "The Forwarding entity has Ports that are either INPUT or OUTPUT. It has no BIDIRECTIONAL Ports.";

+            }

+            enum UNDEFINED_OR_UNKNOWN {

+                description "Not a normal state. The system is unable to determine the correct value.";

+            }

+        }

+        description "The directionality of a Forwarding entity.";

+    }

+    typedef layer-protocol-name {

+        type enumeration {

+            enum ODU {

+                description "Models the ODU layer as per ITU-T G.872";

+            }

+            enum ETH {

+                description "Models the ETH layer as per ITU-T G.8010";

+            }

+            enum DSR {

+                description "Models a Digital Signal of an unspecified rate. This value can be used when the intent is to respresent an generic digital layer signal without making any statement on its format or overhead (processing) capabilities.";

+            }

+            enum PHOTONIC_MEDIA {

+                description "Models the OCH, OTSi, OTSiA, OTSiG, OMS, OTS and Media channels as per ITU-T G.872 (2017) version 4";

+            }

+        }

+        description "Provides a controlled list of layer protocol names and indicates the naming authority.

+            Note that it is expected that attributes will be added to this structure to convey the naming authority name, the name of the layer protocol using a human readable string and any particular standard reference.

+            Layer protocol names include:

+            -    Layer 1 (L1): OTU, ODU

+            -    Layer 2 (L2): Carrier Grade Ethernet (ETY, ETH), MPLS-TP (MT)

+            ";

+    }

+    typedef lifecycle-state {

+        type enumeration {

+            enum PLANNED {

+                description "The resource is planned but is not present in the network.";

+            }

+            enum POTENTIAL_AVAILABLE {

+                description "The supporting resources are present in the network but are shared with other clients; or require further configuration before they can be used; or both.

+                    o    When a potential resource is configured and allocated to a client it is moved to the installed state for that client.

+                    o    If the potential resource has been consumed (e.g. allocated to another client) it is moved to the planned state for all other clients.";

+            }

+            enum POTENTIAL_BUSY {

+                description "The supporting resources are present in the network but are shared with other clients; or require further configuration before they can be used; or both.

+                    o    When a potential resource is configured and allocated to a client it is moved to the installed state for that client.

+                    o    If the potential resource has been consumed (e.g. allocated to another client) it is moved to the planned state for all other clients.";

+            }

+            enum INSTALLED {

+                description "The resource is present in the network and is capable of providing the service expected.";

+            }

+            enum PENDING_REMOVAL {

+                description "The resource has been marked for removal";

+            }

+        }

+        description "The possible values of the lifecycleState.";

+    }

+    grouping name-and-value {

+        leaf value-name {

+            type string;

+            description "The name of the value. The value need not have a name.";

+        }

+        leaf value {

+            type string;

+            description "The value";

+        }

+        description "A scoped name-value pair";

+    }

+    typedef operational-state {

+        type enumeration {

+            enum DISABLED {

+                description "The resource is unable to meet the SLA of the user of the resource. If no (explicit) SLA is defined the resource is disabled if it is totally inoperable and unable to provide service to the user.";

+            }

+            enum ENABLED {

+                description "The resource is partially or fully operable and available for use";

+            }

+        }

+        description "The possible values of the operationalState.";

+    }

+    typedef port-direction {

+        type enumeration {

+            enum BIDIRECTIONAL {

+                description "The Port has both an INPUT flow and an OUTPUT flow defined.";

+            }

+            enum INPUT {

+                description "The Port only has definition for a flow into the Forwarding entity, (i.e. an ingress flow of the Link or Connection, hence egress flow of NEP or CEP, CSEP etc.)";

+            }

+            enum OUTPUT {

+                description "The Port only has definition for a flow out of the Forwarding entity ((i.e. an egress flow of the Link or Connection, hence ingress flow of NEP or CEP, CSEP etc.)";

+            }

+            enum UNIDENTIFIED_OR_UNKNOWN {

+                description "Not a normal state. The system is unable to determine the correct value.";

+            }

+        }

+        description "The orientation of flow at the Port of a Forwarding entity";

+    }

+    typedef port-role {

+        type enumeration {

+            enum SYMMETRIC {

+                description "none";

+            }

+            enum ROOT {

+                description "none";

+            }

+            enum LEAF {

+                description "none";

+            }

+            enum TRUNK {

+                description "none";

+            }

+            enum UNKNOWN {

+                description "none";

+            }

+        }

+        description "The role of an end in the context of the function of the forwarding entity that it bounds";

+    }

+    typedef termination-direction {

+        type enumeration {

+            enum BIDIRECTIONAL {

+                description "A Termination with both SINK and SOURCE flows.";

+            }

+            enum SINK {

+                description "The flow is up the layer stack from the server side to the client side. 

+                    Considering an example of a Termination function within the termination entity, a SINK flow:

+                    - will arrive at at the base of the termination function (the server side) where it is essentially at an INPUT to the termination component

+                    - then will be decoded and deconstructed 

+                    - then relevant parts of the flow will be sent out of the termination function (the client side) where it is essentially at an OUTPUT from the termination component

+                    A SINK termination is one that only supports a SINK flow.

+                    A SINK termiation can be bound to an OUTPUT Port of a Forwarding entity";

+            }

+            enum SOURCE {

+                description "The flow is down the layer stack from the server side to the client side. 

+                    Considering an example of a Termination function within the termination entity, a SOURCE flow:

+                    - will arrive at at the top of the termination function (the client side) where it is essentially at an INPUT to the termination component

+                    - then will be assembled with various overheads etc and will be coded 

+                    - then coded form of the assembly of flow will be sent out of the termination function (the server side) where it is essentially at an OUTPUT from the termination component

+                    A SOURCE termination is one that only supports a SOURCE flow.

+                    A SOURCE termiation can be bound to an INPUT Port of a Forwarding entity";

+            }

+            enum UNDEFINED_OR_UNKNOWN {

+                description "Not a normal state. The system is unable to determine the correct value.";

+            }

+        }

+        description "The directionality of a termination entity";

+    }

+    typedef termination-state {

+        type enumeration {

+            enum LP_CAN_NEVER_TERMINATE {

+                description "A non-flexible case that can never be terminated.";

+            }

+            enum LT_NOT_TERMINATED {

+                description "A flexible termination that can terminate but is currently not terminated.";

+            }

+            enum TERMINATED_SERVER_TO_CLIENT_FLOW {

+                description "A flexible termination that is currently terminated for server to client flow only.";

+            }

+            enum TERMINATED_CLIENT_TO_SERVER_FLOW {

+                description "A flexible termination that is currently terminated for client to server flow only.";

+            }

+            enum TERMINATED_BIDIRECTIONAL {

+                description "A flexible termination that is currently terminated in both directions of flow.";

+            }

+            enum LT_PERMENANTLY_TERMINATED {

+                description "A non-flexible termination that is always terminated (in both directions of flow for a bidirectional case and in the one direction of flow for both unidirectional cases).";

+            }

+            enum TERMINATION_STATE_UNKNOWN {

+                description "There TerminationState cannot be determined.";

+            }

+        }

+        description "Provides support for the range of behaviours and specific states that an LP can take with respect to termination of the signal.

+            Indicates to what degree the LayerTermination is terminated.";

+    }

+    typedef uuid {

+        type string;

+        description "The univeral ID value where the mechanism for generation is defned by some authority not directly referenced in the structure.

+            UUID here uses string representation as defined in RFC 4122.  The canonical representation uses lowercase characters.

+            Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} 

+            Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6";

+    }

+    grouping capacity {

+        container total-size {

+            uses capacity-value;

+            description "Total capacity of the TopologicalEntity in MB/s. In case of bandwidthProfile, this is expected to same as the committedInformationRate.";

+        }

+        container bandwidth-profile {

+            uses bandwidth-profile;

+            description "none";

+        }

+        description "Information on capacity of a particular TopologicalEntity.";

+    }

+    grouping bandwidth-profile {

+        leaf bw-profile-type {

+            type bandwidth-profile-type;

+            description "none";

+        }

+        container committed-information-rate {

+            uses capacity-value;

+            description "none";

+        }

+        container committed-burst-size {

+            uses capacity-value;

+            description "none";

+        }

+        container peak-information-rate {

+            uses capacity-value;

+            description "none";

+        }

+        container peak-burst-size {

+            uses capacity-value;

+            description "none";

+        }

+        leaf color-aware {

+            type boolean;

+            description "none";

+        }

+        leaf coupling-flag {

+            type boolean;

+            description "none";

+        }

+        description "none";

+    }

+    grouping capacity-value {

+        leaf value {

+            type uint64;

+            description "none";

+        }

+        leaf unit {

+            type capacity-unit;

+            description "none";

+        }

+        description "The Capacity (Bandwidth) values that are applicable for digital layers.";

+    }

+    typedef capacity-unit {

+        type enumeration {

+            enum TB {

+                description "Indicates that the integer CapacityValue is in TeraBytes";

+            }

+            enum TBPS {

+                description "Indicates that the integer CapacityValue is in Terabit-per-second";

+            }

+            enum GB {

+                description "Indicates that the integer CapacityValue is in GigaBytes";

+            }

+            enum GBPS {

+                description "Indicates that the integer CapacityValue is in Gigabit-per-second";

+            }

+            enum MB {

+                description "Indicates that the integer CapacityValue is in MegaBytes";

+            }

+            enum MBPS {

+                description "Indicates that the integer CapacityValue is in Megabit-per-second";

+            }

+            enum KB {

+                description "Indicates that the integer CapacityValue is in KiloBytes";

+            }

+            enum KBPS {

+                description "Indicates that the integer CapacityValue is in Kilobit-per-second";

+            }

+            enum GHz {

+                description "none";

+            }

+            enum MHz {

+                description "none";

+            }

+        }

+        description "none";

+    }

+    typedef bandwidth-profile-type {

+        type enumeration {

+            enum MEF_10.x {

+                description "none";

+            }

+            enum RFC_2697 {

+                description "none";

+            }

+            enum RFC_2698 {

+                description "none";

+            }

+            enum RFC_4115 {

+                description "none";

+            }

+        }

+        description "none";

+    }

+    grouping time-range {

+        leaf end-time {

+            type date-and-time;

+            description "none";

+        }

+        leaf start-time {

+            type date-and-time;

+            description "none";

+        }

+        description "none";

+    }

+    grouping time-period {

+        leaf value {

+            type uint64;

+            description "none";

+        }

+        leaf unit {

+            type time-unit;

+            description "none";

+        }

+        description "none";

+    }

+    typedef time-unit {

+        type enumeration {

+            enum YEARS {

+                description "none";

+            }

+            enum MONTHS {

+                description "none";

+            }

+            enum DAYS {

+                description "none";

+            }

+            enum HOURS {

+                description "none";

+            }

+            enum MINUTES {

+                description "none";

+            }

+            enum SECONDS {

+                description "none";

+            }

+            enum MILLISECONDS {

+                description "none";

+            }

+            enum MICROSECONDS {

+                description "none";

+            }

+            enum NANOSECONDS {

+                description "none";

+            }

+            enum PICOSECONDS {

+                description "none";

+            }

+        }

+        description "none";

+    }

+    grouping time-interval {

+        list period {

+            key 'unit';

+            min-elements 1;

+            max-elements 5;

+            uses time-period;

+            description "none";

+        }

+        description "none";

+    }

+    typedef layer-protocol-qualifier {

+        type identityref {

+            base LAYER_PROTOCOL_QUALIFIER;

+        }

+        description "This enumeration is used to qualify the sub-layers (if applicable) for a specific LayerProtocol.

+            This extensible enumeration is intentionally empty in the common module and will be augmented with layer-specific values in the respective technology-specific modules.

+            Examples:

+            - LayerProtocolName := OPTICAL_DATA_UNIT

+            LayerProtocolQualifier := 'ODU_FLEX', 'ODU_0', 'ODU_1', 'ODU_2', 'ODU_2E', 'ODU_3', 'ODU_4'', 'ODU_CBR'', 'ODU_GFP'', 'ODU_GFP_HAO', etc

+            - LayerProtocolName := DIGITAL_SIGNAL_RATE

+            LayerProtocolQualifier := 'GBE', '10_GBE_WAN', '10_GBE_LAN', '100_GBE', 'FC_100', 'FC_200', 'FC_400', 'FC_800', 'FC_1200', 'FC_1600', 'FC_3200', 'STM_1', 'STM_4', 'STM_16', 'STM_64', 'STM_256', 'OC_3', 'OC_12', 'OC_48', 'OC_192', 'OC_768', 'OTU_1', 'OTU_2', 'OTU_2E', 'OTU_3', 'OTU_4', 'GPON', 'XGPON', 'IB_SDR', 'IB_DDR', 'IB_QDR', 'SBCON_ESCON', 'DVB_ASI', 'SDI', 'SDI_1G5', 'SDI_3G', etc

+            - LayerProtocolName := PHOTONIC_MEDIA

+            LayerProtocolQualifier := OCH, OTSi, OTSiA, NMC, NMCA, SMC, SMCA, OMS, OTS

+            ";

+    }

+

+    /**************************

+    * package interfaces

+    **************************/ 

+    rpc get-service-interface-point-details {

+        description "none";

+        input {

+            leaf sip-id-or-name {

+                type string;

+                description "none";

+            }

+        }

+        output {

+            container sip {

+                uses service-interface-point;

+                description "none";

+            }

+        }

+    }

+    rpc get-service-interface-point-list {

+        description "none";

+        output {

+            list sip {

+                uses service-interface-point;

+                description "none";

+            }

+        }

+    }

+    rpc update-service-interface-point {

+        description "none";

+        input {

+            leaf sip-id-or-name {

+                type string;

+                description "none";

+            }

+            leaf state {

+                type administrative-state;

+                description "none";

+            }

+        }

+    }

+

+}

diff --git a/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-connectivity@2020-06-16.yang b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-connectivity@2020-06-16.yang
new file mode 100644
index 0000000..2dda923
--- /dev/null
+++ b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-connectivity@2020-06-16.yang
@@ -0,0 +1,884 @@
+module tapi-connectivity {

+    namespace "urn:onf:otcc:yang:tapi-connectivity";

+    prefix tapi-connectivity;

+    import tapi-common {

+        prefix tapi-common;

+    }

+    import tapi-topology {

+        prefix tapi-topology;

+    }

+    import tapi-path-computation {

+        prefix tapi-path-computation;

+    }

+    organization "ONF OTCC (Open Transport Configuration & Control) Project";

+    contact "

+         Project Web: <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OTCC/TAPI__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_yiFzE6g$ >

+         Project List: <mailto:transport-api@opennetworking.org>

+         Editor: Karthik Sethuraman <mailto:karthik.sethuraman@necam.com>

+         Andrea Mazzini <mailto:andrea.mazzini@nokia.com>

+         Arturo Mayoral <mailto:arturo.mayoral@telefonica.com>

+         Nigel Davis <mailto:ndavis@ciena.com>";

+    description "

+        This module contains TAPI Connectivity Model definitions.

+        Source: TapiConnectivity.uml

+        - The TAPI YANG models included in this TAPI release are a *normative* part of the TAPI SDK.

+        - The YANG specifications have been generated from the corresponding UML model using the [ONF EAGLE UML2YANG mapping tool]

+        <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$ >

+        and further edited manually to comply with the [ONF IISOMI UML2YANG mapping guidelines]

+        <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$ >

+        - Status of YANG model artifacts can be determined by referring to the corresponding UML artifacts.

+        As described in the UML models, some artifacts are considered *experimental*, and thus the corresponding YANG artifacts.

+        - The ONF TAPI release process does not guarantee backward compatibility of YANG models across major versions of TAPI releases.

+        The YANG model backward compatibility criteria are outlined in section 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$ >.

+        YANG models included in this release may not be backward compatible with previous TAPI releases.

+        Copyright (c) 2018 Open Networking Foundation (ONF). All rights reserved.

+        License: This module is distributed under the Apache License 2.0.";

+    revision 2020-06-16 {

+        description "ONF Transport API version 2.1.3.

+                   - Minor corrections in comments.

+                   Changes included in this TAPI release (v2.1.3) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop_v2_1/CHANGE_LOG/change-log.2.1.3.md__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_xm1nx_D$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_8UH3XnH$ >";

+    }

+    revision 2019-07-16 {

+        description "ONF Transport API version 2.1.2.

+                   Changes included in this TAPI release (v2.1.2) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop_v2_1/CHANGE_LOG/change-log.2.1.2.md__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_0xFu4bN$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_8UH3XnH$ >";

+    }

+    revision 2018-12-10 {

+        description "ONF Transport API version 2.1.1.

+                   Changes included in this TAPI release (v2.1.1) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.1.1.md__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur__2p0od1$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_8UH3XnH$ >";

+    }

+    revision 2018-10-16 {

+        description "ONF Transport API version 2.1.0.

+                   Changes included in this TAPI release (v2.1.0) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.1.0.md__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_4DGi8ul$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_8UH3XnH$ >";

+    }

+    revision 2018-03-07 {

+        description "ONF Transport API version 2.0.2

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.2.md__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_8KlxwJZ$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.2/UML__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_-hMD5Xl$ >";

+    }

+    revision 2018-02-16 {

+        description "ONF Transport API version 2.0.1

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.1.md__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur__C1vuym$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.1/UML__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_5DYNwzZ$ >";

+    }

+    revision 2018-01-02 {

+        description "ONF Transport API version 2.0.0

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.0.md__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_1xZSBRA$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.0/UML__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_xt-GtqY$ >";

+    }

+    augment "/tapi-common:context" {

+        container connectivity-context {

+            uses connectivity-context;

+            description "Augments the base TAPI Context with ConnectivityService information";

+        }

+        description "Augments the base TAPI Context with ConnectivityService information";

+    }

+    augment "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point" {

+        container cep-list {

+            uses cep-list;

+            description "none";

+        }

+        description "none";

+    }

+   /**************************

+    * definitions of references

+    **************************/

+    grouping connectivity-service-ref {

+        leaf connectivity-service-uuid {

+            type leafref {

+                path '/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:uuid';

+            }

+            description "none";

+        }

+        description "none";

+    }

+    grouping connectivity-service-end-point-ref {

+        uses connectivity-service-ref;

+        leaf connectivity-service-end-point-local-id {

+            type leafref {

+                path '/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:end-point/tapi-connectivity:local-id';

+            }

+            description "none";

+        }

+        description "none";

+    }

+    grouping connection-end-point-ref {

+        uses tapi-topology:node-edge-point-ref;

+        leaf connection-end-point-uuid {

+            type leafref {

+                path '/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-connectivity:cep-list/tapi-connectivity:connection-end-point/tapi-connectivity:uuid';

+            }

+            description "none";

+        }

+        description "none";

+    }

+    grouping connection-ref {

+        leaf connection-uuid {

+            type leafref {

+                path '/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connection/tapi-connectivity:uuid';

+            }

+            description "none";

+        }

+        description "none";

+    }

+    grouping switch-control-ref {

+        uses connection-ref;

+        leaf switch-control-uuid {

+            type leafref {

+                path '/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connection/tapi-connectivity:switch-control/tapi-connectivity:uuid';

+            }

+            description "none";

+        }

+        description "none";

+    }

+    grouping route-ref {

+        uses connection-ref;

+        leaf route-local-id {

+            type leafref {

+                path '/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connection/tapi-connectivity:route/tapi-connectivity:local-id';

+            }

+            description "none";

+        }

+        description "none";

+    }

+

+   /**************************

+    * package object-classes

+    **************************/ 

+    grouping connection {

+        list connection-end-point {

+            uses connection-end-point-ref;

+            key 'topology-uuid node-uuid node-edge-point-uuid connection-end-point-uuid';

+            config false;

+            min-elements 2;

+            description "none";

+        }

+        list lower-connection {

+            uses connection-ref;

+            key 'connection-uuid';

+            config false;

+            description "An Connection object supports a recursive aggregation relationship such that the internal construction of an Connection can be exposed as multiple lower level Connection objects (partitioning).

+                Aggregation is used as for the Node/Topology  to allow changes in hierarchy. 

+                Connection aggregation reflects Node/Topology aggregation. 

+                The FC represents a Cross-Connection in an NE. The Cross-Connection in an NE is not necessarily the lowest level of FC partitioning.";

+        }

+        list supported-client-link {

+            uses tapi-topology:link-ref;

+            key 'topology-uuid link-uuid';

+            config false;

+            description "none";

+        }

+        list route {

+            key 'local-id';

+            config false;

+            uses route;

+            description "none";

+        }

+        list switch-control {

+            key 'uuid';

+            config false;

+            uses switch-control;

+            description "none";

+        }

+        leaf direction {

+            type tapi-common:forwarding-direction;

+            config false;

+            description "none";

+        }

+        leaf layer-protocol-name {

+            type tapi-common:layer-protocol-name;

+            config false;

+            description "none";

+        }

+        container connection-spec-reference {

+            config false;

+            uses connection-spec-reference;

+            description "Provides the reference to the spec that defines the connection type and cepRoles.";

+        }

+        uses tapi-common:resource-spec;

+        uses tapi-common:operational-state-pac;

+        description "The ForwardingConstruct (FC) object class models enabled potential for forwarding between two or more LTPs and like the LTP supports any transport protocol including all circuit and packet forms.

+            At the lowest level of recursion, a FC represents a cross-connection within an NE.";

+    }

+    grouping connection-end-point {

+        leaf layer-protocol-name {

+            type tapi-common:layer-protocol-name;

+            config false;

+            description "none";

+        }

+        leaf layer-protocol-qualifier {

+            type tapi-common:layer-protocol-qualifier;

+            config false;

+            description "none";

+        }

+        container parent-node-edge-point {

+            uses tapi-topology:node-edge-point-ref;

+            config false;

+            description "none";

+        }

+        list client-node-edge-point {

+            uses tapi-topology:node-edge-point-ref;

+            key 'topology-uuid node-uuid node-edge-point-uuid';

+            config false;

+            description "none";

+        }

+        list aggregated-connection-end-point {

+            uses connection-end-point-ref;

+            key 'topology-uuid node-uuid node-edge-point-uuid connection-end-point-uuid';

+            config false;

+            description "none";

+        }

+        leaf connection-port-direction {

+            type tapi-common:port-direction;

+            config false;

+            description "The orientation of defined flow at the EndPoint.";

+        }

+        leaf connection-port-role {

+            type tapi-common:port-role;

+            config false;

+            description "Each EP of the FC has a role (e.g., working, protection, protected, symmetric, hub, spoke, leaf, root)  in the context of the FC with respect to the FC function. ";

+        }

+        list cep-role {

+            uses cep-role;

+			config false;

+            description "Defines the role of the CEP in the context of the connection spec.

+                There may be many cep role - connection spec combinations for a particular CEP where each corresponds to a specific connection associated with the CEP.";

+        }

+        uses tapi-common:resource-spec;

+        uses tapi-common:operational-state-pac;

+        uses tapi-common:termination-pac;

+        description "The LogicalTerminationPoint (LTP) object class encapsulates the termination and adaptation functions of one or more transport layers. 

+            The structure of LTP supports all transport protocols including circuit and packet forms.";

+    }

+    grouping connectivity-constraint {

+        leaf service-layer {

+            type tapi-common:layer-protocol-name;

+            description "none";

+        }

+        leaf service-type {

+            type service-type;

+            description "none";

+        }

+        leaf service-level {

+            type string;

+            description "An abstract value the meaning of which is mutually agreed – typically represents metrics such as - Class of service, priority, resiliency, availability";

+        }

+        container requested-capacity {

+            uses tapi-common:capacity;

+            description "none";

+        }

+        leaf connectivity-direction {

+            type tapi-common:forwarding-direction;

+            description "none";

+        }

+        container schedule {

+            uses tapi-common:time-range;

+            description "none";

+        }

+        container coroute-inclusion {

+            uses connectivity-service-ref;

+            description "none";

+        }

+        list diversity-exclusion {

+            uses connectivity-service-ref;

+            key 'connectivity-service-uuid';

+            description "none";

+        }

+        leaf-list connection-exclusion {

+            type tapi-common:uuid;

+            description "none";

+        }

+        leaf-list connection-inclusion {

+            type tapi-common:uuid;

+            description "A ConnectivityService may use one or more existing Connections.

+                A common traditional strategy is to set up “stranded” connectivity in the core of the network as “express channels” (this is essentially a serial compound link, but can be treated as simple connections)

+                A connection inclusion capability allows for adoption of a discovered Connections.

+                A ConnectivityService is requested with a connection inclusion constraint that identifies a connection (or chain of connections) that is bounded by CEPs that each belong to a NEP that references a SIP that is referenced by a CSEP of the ConnectivityService such that all CSEPs are satisfied by CEPs of the existing Connection. will allow discovered Connections with no stated intent to be associated with an intent via the ConnectivityService.";

+        }

+        description "none";

+    }

+    grouping connectivity-service {

+        list end-point {

+            key 'local-id';

+            min-elements 2;

+            uses connectivity-service-end-point;

+            description "none";

+        }

+        list connection {

+            uses connection-ref;

+            key 'connection-uuid';

+            config false;

+            description "none";

+        }

+        uses tapi-common:service-spec;

+        uses connectivity-constraint;

+        uses tapi-path-computation:routing-constraint;

+        uses tapi-path-computation:topology-constraint;

+        uses resilience-constraint;

+        uses tapi-common:admin-state-pac;

+        description "The ForwardingConstruct (FC) object class models enabled potential for forwarding between two or more LTPs and like the LTP supports any transport protocol including all circuit and packet forms.

+            At the lowest level of recursion, a FC represents a cross-connection within an NE.";

+    }

+    grouping connectivity-service-end-point {

+        leaf layer-protocol-name {

+            type tapi-common:layer-protocol-name;

+            description "none";

+        }

+        leaf layer-protocol-qualifier {

+            type tapi-common:layer-protocol-qualifier;

+            description "none";

+        }

+        container service-interface-point {

+            uses tapi-common:service-interface-point-ref;

+            description "none";

+        }

+        list connection-end-point {

+            uses connection-end-point-ref;

+            key 'topology-uuid node-uuid node-edge-point-uuid connection-end-point-uuid';

+            config false;

+            description "none";

+        }

+        container capacity {

+            uses tapi-common:capacity;

+            description "none";

+        }

+        leaf direction {

+            type tapi-common:port-direction;

+            description "The orientation of defined flow at the EndPoint.";

+        }

+        leaf role {

+            type tapi-common:port-role;

+            description "Each EP of the FC has a role (e.g., working, protection, protected, symmetric, hub, spoke, leaf, root)  in the context of the FC with respect to the FC function. ";

+        }

+        leaf protection-role {

+            type protection-role;

+            description "To specify the protection role of this Port when create or update ConnectivityService.";

+        }

+        container peer-fwd-connectivity-service-end-point {

+            uses connectivity-service-end-point-ref;

+            description "none";

+        }

+        container protecting-connectivity-service-end-point {

+            uses connectivity-service-end-point-ref;

+            description "none";

+        }

+        container server-connectivity-service-end-point {

+            uses connectivity-service-end-point-ref;

+            description "none";

+        }

+        uses tapi-common:local-class;

+        uses tapi-common:admin-state-pac;

+        description "The association of the FC to LTPs is made via EndPoints.

+            The EndPoint (EP) object class models the access to the FC function. 

+            The traffic forwarding between the associated EPs of the FC depends upon the type of FC and may be associated with FcSwitch object instances.  

+            In cases where there is resilience the EndPoint may convey the resilience role of the access to the FC. 

+            It can represent a protected (resilient/reliable) point or a protecting (unreliable working or protection) point.

+            The EP replaces the Protection Unit of a traditional protection model. 

+            The ForwadingConstruct can be considered as a component and the EndPoint as a Port on that component";

+    }

+    grouping route {

+        list connection-end-point {

+            uses connection-end-point-ref;

+            key 'topology-uuid node-uuid node-edge-point-uuid connection-end-point-uuid';

+            config false;

+            min-elements 2;

+            description "none";

+        }

+        container resilience-route-pac {

+            uses resilience-route;

+            description "Provides optional resilience and state attributes to the Route.";

+        }

+        uses tapi-common:local-class;

+        description "The Route of a Connection is modeled as a collection of Connection End Points.

+            The logical order of the Connection End Points within the Route object can be inferred by the TAPI client by the knowledge of the Topology information.";

+    }

+    grouping connectivity-context {

+        list connectivity-service {

+            key 'uuid';

+            uses connectivity-service;

+            description "none";

+        }

+        list connection {

+            key 'uuid';

+            config false;

+            uses connection;

+            description "none";

+        }

+        description "none";

+    }

+    grouping switch {

+        list selected-connection-end-point {

+            uses connection-end-point-ref;

+            key 'topology-uuid node-uuid node-edge-point-uuid connection-end-point-uuid';

+            config false;

+            min-elements 1;

+            description "none";

+        }

+        list selected-route {

+            uses route-ref;

+            key 'connection-uuid route-local-id';

+			config false;

+            min-elements 1;

+            description "none";

+        }

+        leaf selection-control {

+            type selection-control;

+            description "Degree of administrative control applied to the switch selection.";

+        }

+        leaf selection-reason {

+            type selection-reason;

+            config false;

+            description "The reason for the current switch selection.";

+        }

+        leaf switch-direction {

+            type tapi-common:port-direction;

+            description "Indicates whether the switch selects from ingress to the FC or to egress of the FC, or both.";

+        }

+        uses tapi-common:local-class;

+        description "The class models the switched forwarding of traffic (traffic flow) between FcPorts (ConnectionEndPoints) and is present where there is protection functionality in the FC (Connection). 

+            If an FC exposes protection (having two or more FcPorts that provide alternative identical inputs/outputs), the FC will have one or more associated FcSwitch objects to represent the alternative flow choices visible at the edge of the FC.

+            The FC switch represents and defines a protection switch structure encapsulated in the FC. 

+            Essentially performs one of the functions of the Protection Group in a traditional model. It associates to 2 or more FcPorts each playing the role of a Protection Unit. 

+            One or more protection, i.e. standby/backup, FcPorts provide protection for one or more working (i.e. regular/main/preferred) FcPorts where either protection or working can feed one or more protected FcPort.

+            The switch may be used in revertive or non-revertive (symmetric) mode. When in revertive mode it may define a waitToRestore time.

+            It may be used in one of several modes including source switch, destination switched, source and destination switched etc (covering cases such as 1+1 and 1:1).

+            It may be locked out (prevented from switching), force switched or manual switched.

+            It will indicate switch state and change of state.

+            The switch can be switched away from all sources such that it becomes open and hence two coordinated switches can both feed the same LTP so long as at least one of the two is switched away from all sources (is 'open').

+            The ability for a Switch to be 'high impedance' allows bidirectional ForwardingConstructs to be overlaid on the same bidirectional LTP where the appropriate control is enabled to prevent signal conflict.

+            This ability allows multiple alternate routes to be present that otherwise would be in conflict.";

+    }

+    grouping switch-control {

+        list sub-switch-control {

+            uses switch-control-ref;

+            key 'connection-uuid switch-control-uuid';

+            config false;

+            description "none";

+        }

+        list switch {

+            key 'local-id';

+            uses switch;

+            description "none";

+        }

+        uses tapi-common:resource-spec;

+        uses resilience-constraint;

+        description "Represents the capability to control and coordinate switches, to add/delete/modify FCs and to add/delete/modify LTPs/LPs so as to realize a protection scheme.";

+    }

+    grouping resilience-constraint {

+        container resilience-type {

+            uses tapi-topology:resilience-type;

+            description "none";

+        }

+        leaf restoration-coordinate-type {

+            type coordinate-type;

+            description " The coordination mechanism between multi-layers.";

+        }

+        leaf restore-priority {

+            type uint64;

+            description "none";

+        }

+        leaf reversion-mode {

+            type reversion-mode;

+            description "Indcates whether the protection scheme is revertive or non-revertive.";

+        }

+        leaf wait-to-revert-time {

+            type uint64;

+            default "15";

+            description "If the protection system is revertive, this attribute specifies the time, in minutes, to wait after a fault clears on a higher priority (preferred) resource before reverting to the preferred resource.";

+        }

+        leaf hold-off-time {

+            type uint64;

+            description "This attribute indicates the time, in milliseconds, between declaration of signal degrade or signal fail, and the initialization of the protection switching algorithm.";

+        }

+        leaf is-lock-out {

+            type boolean;

+            description "The resource is configured to temporarily not be available for use in the protection scheme(s) it is part of.

+                This overrides all other protection control states including forced.

+                If the item is locked out then it cannot be used under any circumstances.

+                Note: Only relevant when part of a protection scheme.";

+        }

+        leaf is-frozen {

+            type boolean;

+            description "Temporarily prevents any switch action to be taken and, as such, freezes the current state. 

+                Until the freeze is cleared, additional near-end external commands are rejected and fault condition changes and received APS messages are ignored.

+                All administrative controls of any aspect of protection are rejected.";

+        }

+        leaf is-coordinated-switching-both-ends {

+            type boolean;

+            description "Is operating such that switching at both ends of each flow acorss the FC is coordinated at both ingress and egress ends.";

+        }

+        leaf max-switch-times {

+            type uint64;

+            description "Used to limit the maximum swtich times. When work fault disappears , and traffic return to the original work path, switch counter reset.";

+        }

+        leaf-list preferred-restoration-layer {

+            type tapi-common:layer-protocol-name;

+            description "Indicate which layer this resilience parameters package configured for.";

+        }

+        description "A list of control parameters to apply to a switch.";

+    }

+    grouping cep-list {

+        list connection-end-point {

+            key 'uuid';

+            uses connection-end-point;

+            description "none";

+        }

+        description "none";

+    }

+    grouping resilience-route {

+        leaf priority {

+            type uint64;

+            config false;

+            description "Value of 0 (zero) means 'unspecified priority'.

+                Highest priority is 1, sometimes referred as 'preferred' or 'main' or 'intended' route.

+                2 has lower priority than 1, 3 has lower priority than 2, etc.";

+        }

+        leaf route-state {

+            type route-state;

+            config false;

+            description "Current information on the route selection.";

+        }

+        uses tapi-common:local-class;

+        description "This object adds resilience and state attributes to the Route.

+            When this object is not present, then the Route is intendend as 'current' Route of the Connection.";

+    }

+

+    /**************************

+    * package type-definitions

+    **************************/ 

+    identity ROUTE_STATE {

+        description "none";

+    }

+    identity ROUTE_STATE_CURRENT {

+        base ROUTE_STATE;

+        description "The route identified is the current route, i.e., is the one that is active and selected to support service.

+            ";

+    }

+    identity ROUTE_STATE_NOT_CURRENT {

+        base ROUTE_STATE;

+        description "The route is not the one supporting the service.";

+    }

+    identity ROUTE_STATE_UNKNOWN {

+        base ROUTE_STATE;

+        description "The route state is unknown.";

+    }

+    typedef service-type {

+        type enumeration {

+            enum POINT_TO_POINT_CONNECTIVITY {

+                description "none";

+            }

+            enum POINT_TO_MULTIPOINT_CONNECTIVITY {

+                description "none";

+            }

+            enum MULTIPOINT_CONNECTIVITY {

+                description "none";

+            }

+            enum ROOTED_MULTIPOINT_CONNECTIVITY {

+                description "none";

+            }

+        }

+        description "none";

+    }

+    typedef reversion-mode {

+        type enumeration {

+            enum REVERTIVE {

+                description "An FC switched to a lower priority (non-preferred) resource will revert to a higher priority (preferred) resource when that recovers (potentially after some hold-off time).";

+            }

+            enum NON-REVERTIVE {

+                description "An FC switched to a lower priority (non-preferred) resource will not revert to a higher priority (preferred) resource when that recovers.";

+            }

+        }

+        description "The reversion mode associated with protection.";

+    }

+    typedef selection-control {

+        type enumeration {

+            enum LOCK_OUT {

+                description "The resource is configured to temporarily not be available for use in the protection scheme(s) it is part of.

+                    This overrides all other protection control states including forced.

+                    If the item is locked out then it cannot be used under any circumstances.

+                    Note: Only relevant when part of a protection scheme.";

+            }

+            enum NORMAL {

+                description "none";

+            }

+            enum MANUAL {

+                description "none";

+            }

+            enum FORCED {

+                description "none";

+            }

+        }

+        description "Possible degrees of administrative control applied to the Route selection.";

+    }

+    typedef selection-reason {

+        type enumeration {

+            enum LOCKOUT {

+                description "none";

+            }

+            enum NORMAL {

+                description "none";

+            }

+            enum MANUAL {

+                description "none";

+            }

+            enum FORCED {

+                description "none";

+            }

+            enum WAIT_TO_REVERT {

+                description "none";

+            }

+            enum SIGNAL_DEGRADE {

+                description "none";

+            }

+            enum SIGNAL_FAIL {

+                description "none";

+            }

+        }

+        description "The cause of the current route selection.";

+    }

+    typedef coordinate-type {

+        type enumeration {

+            enum NO_COORDINATE {

+                description "none";

+            }

+            enum HOLD_OFF_TIME {

+                description "none";

+            }

+            enum WAIT_FOR_NOTIFICATION {

+                description "none";

+            }

+        }

+        description "none";

+    }

+    typedef protection-role {

+        type enumeration {

+            enum WORK {

+                description "none";

+            }

+            enum PROTECT {

+                description "none";

+            }

+            enum PROTECTED {

+                description "none";

+            }

+            enum NA {

+                description "none";

+            }

+            enum WORK_RESTORE {

+                description "none";

+            }

+            enum PROTECT_RESTORE {

+                description "none";

+            }

+        }

+        description "none";

+    }

+    grouping cep-role {

+        leaf role-name {

+            type string;

+            description "The name of the cep role in the context of the referenced spec.";

+        }

+        container connection-spec-reference {

+            config false;

+            uses connection-spec-reference;

+            description "The reference to the spec that defines the cep role.";

+        }

+        description "The role of the cep in the context of the connection spec.";

+    }

+    grouping connection-spec-reference {

+        leaf connection-spec-id {

+            type tapi-common:uuid;

+            config false;

+            description "The reference to a formal spec. 

+                This reference need not be provided (e.g., where there is no formal machine interpretable spec for the type of connection).";

+        }

+        leaf connection-spec-name {

+            type string;

+            config false;

+            description "The name of the connection spec.

+                This can be used alone (with no spec reference) where there is only a paper spec.";

+        }

+        description "The reference to a spec for a type of connection.";

+    }

+    typedef route-state {

+        type identityref {

+            base ROUTE_STATE;

+        }

+        description "Potential route states.";

+    }

+

+    /**************************

+    * package interfaces

+    **************************/ 

+    rpc get-connection-details {

+        description "none";

+        input {

+            leaf connection-id-or-name {

+                type string;

+                description "none";

+            }

+        }

+        output {

+            container connection {

+                uses connection;

+                description "none";

+            }

+        }

+    }

+    rpc get-connectivity-service-list {

+        description "none";

+        output {

+            list service {

+                key 'uuid';

+                uses connectivity-service;

+                description "none";

+            }

+        }

+    }

+    rpc get-connectivity-service-details {

+        description "none";

+        input {

+            leaf service-id-or-name {

+                type string;

+                description "none";

+            }

+        }

+        output {

+            container service {

+                uses connectivity-service;

+                description "none";

+            }

+        }

+    }

+    rpc create-connectivity-service {

+        description "none";

+        input {

+            list end-point {

+                key 'local-id';

+                min-elements 2;

+                uses connectivity-service-end-point;

+                description "none";

+            }

+            container connectivity-constraint {

+                uses connectivity-constraint;

+                description "none";

+            }

+            container routing-constraint {

+                uses tapi-path-computation:routing-constraint;

+                description "none";

+            }

+            container topology-constraint {

+                uses tapi-path-computation:topology-constraint;

+                description "none";

+            }

+            container resilience-constraint {

+                uses resilience-constraint;

+                description "none";

+            }

+            leaf state {

+                type string;

+                description "none";

+            }

+        }

+        output {

+            container service {

+                uses connectivity-service;

+                description "none";

+            }

+        }

+    }

+    rpc update-connectivity-service {

+        description "none";

+        input {

+            leaf service-id-or-name {

+                type string;

+                description "none";

+            }

+            list end-point {

+                key 'local-id';

+                uses connectivity-service-end-point;

+                description "none";

+            }

+            container connectivity-constraint {

+                uses connectivity-constraint;

+                description "none";

+            }

+            container routing-constraint {

+                uses tapi-path-computation:routing-constraint;

+                description "none";

+            }

+            container topology-constraint {

+                uses tapi-path-computation:topology-constraint;

+                description "none";

+            }

+            container resilience-constraint {

+                uses resilience-constraint;

+                description "none";

+            }

+            leaf state {

+                type string;

+                description "none";

+            }

+        }

+        output {

+            container service {

+                uses connectivity-service;

+                description "none";

+            }

+        }

+    }

+    rpc delete-connectivity-service {

+        description "none";

+        input {

+            leaf service-id-or-name {

+                type string;

+                description "none";

+            }

+        }

+    }

+    rpc get-connection-end-point-details {

+        description "none";

+        input {

+            leaf topology-id-or-name {

+                type string;

+                description "none";

+            }

+            leaf node-id-or-name {

+                type string;

+                description "none";

+            }

+            leaf nep-id-or-name {

+                type string;

+                description "none";

+            }

+            leaf cep-id-or-name {

+                type string;

+                description "none";

+            }

+        }

+        output {

+            container connection-end-point {

+                uses connection-end-point;

+                description "none";

+            }

+        }

+    }

+

+}

diff --git a/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-dsr@2020-04-23.yang b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-dsr@2020-04-23.yang
new file mode 100644
index 0000000..4a71f0d
--- /dev/null
+++ b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-dsr@2020-04-23.yang
@@ -0,0 +1,241 @@
+module tapi-dsr {

+    namespace "urn:onf:otcc:yang:tapi-dsr";

+    prefix tapi-dsr;

+    import tapi-common {

+        prefix tapi-common;

+    }

+    organization "ONF OTCC (Open Transport Configuration & Control) Project";

+    contact "

+         Project Web: <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OTCC/TAPI__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G39KDEbL$ >

+         Project List: <mailto:transport-api@opennetworking.org>

+         Editor: Karthik Sethuraman <mailto:karthik.sethuraman@necam.com>

+         Andrea Mazzini <mailto:andrea.mazzini@nokia.com>

+         Arturo Mayoral <mailto:arturo.mayoral@telefonica.com>

+         Nigel Davis <mailto:ndavis@ciena.com>";

+    description "

+        This module contains TAPI DSR Model definitions.

+        Source: TapiDsr.uml

+        - The TAPI YANG models included in this TAPI release are a *normative* part of the TAPI SDK.

+        - The YANG specifications have been generated from the corresponding UML model using the [ONF EAGLE UML2YANG mapping tool]

+          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G4QHf0bG$ >

+          and further edited manually to comply with the [ONF IISOMI UML2YANG mapping guidelines]

+          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8IIivez$ >

+        - Status of YANG model artifacts can be determined by referring to the corresponding UML artifacts.

+          As described in the UML models, some artifacts are considered *experimental*, and thus the corresponding YANG artifacts.

+        - The ONF TAPI release process does not guarantee backward compatibility of YANG models across major versions of TAPI releases.

+          The YANG model backward compatibility criteria are outlined in section 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G3bKxRf2$ >.

+          YANG models included in this release may not be backward compatible with previous TAPI releases.

+        Copyright (c) 2018 Open Networking Foundation (ONF). All rights reserved.

+        License: This module is distributed under the Apache License 2.0";

+    revision 2020-04-23 {

+        description "ONF Transport API version 2.1.3.

+                   Changes included in this TAPI release (v2.1.3) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop_v2_1/CHANGE_LOG/change-log.2.1.3.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7tqhxFK$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7KeAhLL$ >";

+    }

+    revision 2019-07-16 {

+        description "ONF Transport API version 2.1.2.

+                   Changes included in this TAPI release (v2.1.2) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop_v2_1/CHANGE_LOG/change-log.2.1.2.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7eDS6-t$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7KeAhLL$ >";

+    }

+    revision 2018-12-10 {

+        description "ONF Transport API version 2.1.1.

+                   Changes included in this TAPI release (v2.1.1) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.1.1.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G1ftwU5J$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7KeAhLL$ >";

+    }

+    revision 2018-10-16 {

+        description "ONF Transport API version 2.1.0.

+                   Changes included in this TAPI release (v2.1.0) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.1.0.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G-5JStw4$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7KeAhLL$ >";

+    }

+    revision 2018-03-07 {

+        description "ONF Transport API version 2.0.2

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.2.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G1Yf4AAN$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.2/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G27-pJK_$ >";

+    }

+    revision 2018-02-16 {

+        description "ONF Transport API version 2.0.1

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.1.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8RnGvXg$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.1/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6Gy6YoeAv$ >";

+    }

+    revision 2018-01-02 {

+        description "ONF Transport API version 2.0.0

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.0.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6GyqYDgG_$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.0/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G1V9Thk9$ >";

+    }

+

+   /**************************

+    * package type-definitions

+    **************************/

+    identity DIGITAL_SIGNAL_TYPE {

+        base tapi-common:LAYER_PROTOCOL_QUALIFIER;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_GigE {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_10_GigE_LAN {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_10_GigE_WAN {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_40_GigE {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_100_GigE {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_FC_100 {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_FC_200 {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_FC_400 {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_FC_800 {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_FC_1200 {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_FC_1600 {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_FC_3200 {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_STM_1 {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_STM_4 {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_STM_16 {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_STM_64 {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_STM_256 {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_OC_3 {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_OC_12 {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_OC_48 {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_OC_192 {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_OC_768 {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_OTU_1 {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_OTU_2 {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_OTU_2E {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_OTU_3 {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_OTU_4 {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_GPON {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_XGPON {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_IB_SDR {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_IB_DDR {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_IB_QDR {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_SBCON_ESCON {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_DVB_ASI {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_SDI {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_SDI_1G5 {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    identity DIGITAL_SIGNAL_TYPE_SDI_3G {

+        base DIGITAL_SIGNAL_TYPE;

+        description "none";

+    }

+    typedef digital-signal-type {

+        type identityref {

+            base DIGITAL_SIGNAL_TYPE;

+        }

+        description "none";

+    }

+}

diff --git a/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-equipment@2020-04-23.yang b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-equipment@2020-04-23.yang
new file mode 100644
index 0000000..d99fdea
--- /dev/null
+++ b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-equipment@2020-04-23.yang
@@ -0,0 +1,731 @@
+module tapi-equipment {

+    namespace "urn:onf:otcc:yang:tapi-equipment";

+    prefix tapi-equipment;

+    import tapi-common {

+        prefix tapi-common;

+    }

+    import tapi-topology {

+        prefix tapi-topology;

+    }

+    organization "ONF OTCC (Open Transport Configuration & Control) Project";

+    contact "

+         Project Web: <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OTCC/TAPI__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6W87JJX8d$ >

+         Project List: <mailto:transport-api@opennetworking.org>

+         Editor: Karthik Sethuraman <mailto:karthik.sethuraman@necam.com>

+         Andrea Mazzini <mailto:andrea.mazzini@nokia.com>

+         Arturo Mayoral <mailto:arturo.mayoral@telefonica.com>

+         Nigel Davis <mailto:ndavis@ciena.com>";

+    description "

+        This module contains TAPI Equipment Model definitions.

+        Source: TapiEquipment.uml

+        - The TAPI YANG models included in this TAPI release are a *normative* part of the TAPI SDK.

+        - The YANG specifications have been generated from the corresponding UML model using the [ONF EAGLE UML2YANG mapping tool]

+        <https://github.com/OpenNetworkingFoundation/EagleUmlYang>

+        and further edited manually to comply with the [ONF IISOMI UML2YANG mapping guidelines]

+        <https://wiki.opennetworking.org/display/OIMT/UML+-+YANG+Guidelines>

+        - Status of YANG model artifacts can be determined by referring to the corresponding UML artifacts.

+        As described in the UML models, some artifacts are considered *experimental*, and thus the corresponding YANG artifacts.

+        - The ONF TAPI release process does not guarantee backward compatibility of YANG models across major versions of TAPI releases.

+        The YANG model backward compatibility criteria are outlined in section 11 of <https://tools.ietf.org/html/rfc7950>.

+        YANG models included in this release may not be backward compatible with previous TAPI releases.

+        Copyright (c) 2018 Open Networking Foundation (ONF). All rights reserved.

+        License: This module is distributed under the Apache License 2.0.";

+    revision 2020-04-23 {

+        description "ONF Transport API version 2.1.3.

+                   Changes included in this TAPI release (v2.1.3) are listed in

+                   <https://github.com/OpenNetworkingFoundation/TAPI/blob/develop_v2_1/CHANGE_LOG/change-log.2.1.3.md>";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML>";

+    }

+    revision 2019-07-16 {

+        description "ONF Transport API version 2.1.2.

+                   Changes included in this TAPI release (v2.1.2) are listed in

+                   <https://github.com/OpenNetworkingFoundation/TAPI/blob/develop_v2_1/CHANGE_LOG/change-log.2.1.2.md>";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML>";

+    }

+    revision 2018-12-10 {

+        description "ONF Transport API version 2.1.1.

+                   Changes included in this TAPI release (v2.1.1) are listed in

+                   <https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.1.1.md>";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML>";

+    }

+    revision 2018-10-16 {

+        description "ONF Transport API version 2.1.0.

+                   Changes included in this TAPI release (v2.1.0) are listed in

+                   <https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.1.0.md>";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML>";

+    }

+    revision 2018-03-07 {

+        description "ONF Transport API version 2.0.2

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.2.md>";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.2/UML>";

+    }

+    revision 2018-02-16 {

+        description "ONF Transport API version 2.0.1

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.1.md>";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.1/UML>";

+    }

+    revision 2018-01-02 {

+        description "ONF Transport API version 2.0.0

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.0.md>";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.0/UML>";

+    }

+    augment "/tapi-common:context" {

+        container physical-context {

+            uses physical-context;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node" {

+        container supporting-physical-span {

+            uses supporting-physical-span;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point" {

+        container supporting-access-port {

+            uses supporting-access-port;

+            description "none";

+        }

+        description "none";

+    }

+   /**************************

+    * definitions of references

+    **************************/

+    grouping device-ref {

+        leaf device-uuid {

+        	type leafref {

+                path '/tapi-common:context/tapi-equipment:physical-context/tapi-equipment:device/tapi-equipment:uuid';

+            }

+            description "none";

+        }

+        description "none";

+    }

+    grouping equipment-ref {

+    	uses device-ref;

+        leaf equipment-uuid {

+        	type leafref {

+                path '/tapi-common:context/tapi-equipment:physical-context/tapi-equipment:device/tapi-equipment:equipment/tapi-equipment:uuid';

+            }

+            description "none";

+        }

+        description "none";

+    }

+    grouping equipment-holder-ref {

+    	uses equipment-ref;

+        leaf equipment-holder-uuid {

+        	type leafref {

+                path '/tapi-common:context/tapi-equipment:physical-context/tapi-equipment:device/tapi-equipment:equipment/tapi-equipment:contained-holder/tapi-equipment:uuid';

+            }

+            description "none";

+        }

+        description "none";

+    }

+    grouping access-port-ref {

+    	uses device-ref;

+        leaf access-port-uuid {

+        	type leafref {

+                path '/tapi-common:context/tapi-equipment:physical-context/tapi-equipment:device/tapi-equipment:access-port/tapi-equipment:uuid';

+            }

+            description "none";

+        }

+        description "none";

+    }

+    grouping physical-span-ref {

+        leaf physical-span-uuid {

+        	type leafref {

+                path '/tapi-common:context/tapi-equipment:physical-context/tapi-equipment:physical-span/tapi-equipment:uuid';

+            }

+            description "none";

+        }

+        description "none";

+    }

+    grouping abstract-strand-ref {

+    	uses physical-span-ref;

+        leaf abstract-strand-local-id {

+        	type leafref {

+                path '/tapi-common:context/tapi-equipment:physical-context/tapi-equipment:physical-span/tapi-equipment:abstract-strand/tapi-equipment:local-id';

+            }

+            description "none";

+        }

+        description "none";

+    }

+    /**************************

+    * package type-definitions

+    **************************/ 

+    identity CONNECTOR_AND_PIN_ORIENTATION {

+        description "none";

+    }

+    identity CONNECTOR_AND_PIN_ORIENTATION_MALE {

+        base CONNECTOR_AND_PIN_ORIENTATION;

+        description "The connecting elements are dominantly protrusions.";

+    }

+    identity CONNECTOR_AND_PIN_ORIENTATION_FEMALE {

+        base CONNECTOR_AND_PIN_ORIENTATION;

+        description "The connecting elements are dominantly indentations.";

+    }

+    identity CONNECTOR_AND_PIN_ORIENTATION_SYMMETRIC_NEUTRAL {

+        base CONNECTOR_AND_PIN_ORIENTATION;

+        description "The pin (and housing) orientation combination is such that it is symmetric so a connector is compatible with itself.

+            The connecting element may be a surface rather than protrusions or indentations.";

+    }

+    identity EQUIPMENT_CATEGORY {

+        description "none";

+    }

+    identity EQUIPMENT_CATEGORY_SUBRACK {

+        base EQUIPMENT_CATEGORY;

+        description "An assembly with holders designed to accommodate CIRCUIT_PACKs. 

+            The assembly is designed to be mounted in a RACK.";

+    }

+    identity EQUIPMENT_CATEGORY_CIRCUIT_PACK {

+        base EQUIPMENT_CATEGORY;

+        description "An assembly with connectors compatible with those in a holder.

+            The assembly is designed to be mounted in a holder (SLOT) of a SUBRACK.

+            May also support holders (SLOTs) for SMALL_FORMFACTOR_PLUGGABLEs.";

+    }

+    identity EQUIPMENT_CATEGORY_SMALL_FORMFACTOR_PLUGGABLE {

+        base EQUIPMENT_CATEGORY;

+        description "A small assembly (compared to a CIRCUIT_PACK) with connectors compatible with those in a holder.

+            The assembly is designed to be mounted in a holder (SLOT) of a CIRCUIT_PACK or STAND_ALONE_UNIT.";

+    }

+    identity EQUIPMENT_CATEGORY_STAND_ALONE_UNIT {

+        base EQUIPMENT_CATEGORY;

+        description "An assembly with connectors for cabling and potentially with holders.

+            The assembly is designed to be mounted in a freeform environment (on a table or simple mechanical cabinet).

+            May support holders (SLOTs) for CIRCUIT_PACKs or for SMALL_FORMFACTOR_PLUGGABLEs.";

+    }

+    identity EQUIPMENT_CATEGORY_RACK {

+        base EQUIPMENT_CATEGORY;

+        description "A mechanical assembly with cabling and predefined mounting points for particular SUBRACK types.

+            The assembly is designed to be mounted on the floor in a row with other RACKs.";

+    }

+    identity HOLDER_CATEGORY {

+        description "none";

+    }

+    identity HOLDER_CATEGORY_SLOT {

+        base HOLDER_CATEGORY;

+        description "A guided holder with fixed connectors.

+            The guided holder is designed to take a particular form of CIRCUIT_PACK or SMALL_FORMFACTOR_PLUGGABLE";

+    }

+    identity EQUIPMENT_OBJECT_TYPE {

+        description "none";

+    }

+    identity EQUIPMENT_OBJECT_TYPE_DEVICE {

+        base EQUIPMENT_OBJECT_TYPE;

+        description "none";

+    }

+    identity EQUIPMENT_OBJECT_TYPE_ACCESS_PORT {

+        base EQUIPMENT_OBJECT_TYPE;

+        description "none";

+    }

+    identity EQUIPMENT_OBJECT_TYPE_EQUIPMENT {

+        base EQUIPMENT_OBJECT_TYPE;

+        description "none";

+    }

+    identity EQUIPMENT_OBJECT_TYPE_HOLDER {

+        base EQUIPMENT_OBJECT_TYPE;

+        description "none";

+    }

+    identity EQUIPMENT_OBJECT_TYPE_PHYSICAL_SPAN {

+        base EQUIPMENT_OBJECT_TYPE;

+        description "none";

+    }

+    identity EQUIPMENT_OBJECT_TYPE_ABSTRACT_STRAND {

+        base EQUIPMENT_OBJECT_TYPE;

+        description "none";

+    }

+    typedef connector-and-pin-orientation {

+        type identityref {

+            base CONNECTOR_AND_PIN_ORIENTATION;

+        }

+        description "Most connector schemes are asymmetric such that there are two orientations of the connector where a mating is only possible between two connectors of different orientations. 

+            A multi-pin connector may have a mix of pin orientations. In this case, it is expected that the dominant orientation of pin is chosen for the connector orientation.";

+    }

+    typedef equipment-category {

+        type identityref {

+            base EQUIPMENT_CATEGORY;

+        }

+        description "The form of equipment.";

+    }

+    typedef holder-category {

+        type identityref {

+            base HOLDER_CATEGORY;

+        }

+        description "The form of holder.";

+    }

+    grouping connector-pin-address {

+        leaf connector-identification {

+            type string;

+            description "Identification of the Connector in the context of the referenced Equipment.";

+        }

+        leaf pin-identification {

+            type string;

+            description "Where relevant, identification of the Pin in the context of the connector.

+                Where the whole connector is used, then individual Pins need not be identified.

+                Simple alternative to pinAndRole.";

+        }

+        leaf equipment-uuid {

+            type tapi-common:uuid;

+            description "Reference to the Equipment that is fitted with the Connector/Pin.";

+        }

+        list pin-and-role {

+            config false;

+            uses pin-and-role;

+            description "If there is more than one pin used in a connector and/or there is a need to identify the role of one or more pins then this property can be used.

+                For simple cases pinIdentification can be used instead.";

+        }

+        description "The identification of the location of the Connector and/or Pin.";

+    }

+    grouping actual-equipment {

+        list actual-non-field-replaceable-module {

+            config false;

+            uses actual-non-field-replaceable-module;

+            description "none";

+        }

+        container common-actual-properties {

+            config false;

+            uses common-actual-properties;

+            description "none";

+        }

+        container common-equipment-properties {

+            config false;

+            uses common-equipment-properties;

+            description "none";

+        }

+        description "The equipment that is actually present in the physical network.

+            It will expose all dynamic properties and some critical static properties.";

+    }

+    grouping actual-holder {

+        container common-holder-properties {

+            config false;

+            uses common-holder-properties;

+            description "none";

+        }

+        description "A holder in the ActualEquipment.";

+    }

+    grouping actual-non-field-replaceable-module {

+        container common-actual-properties {

+            config false;

+            uses common-actual-properties;

+            description "none";

+        }

+        container common-equipment-properties {

+            config false;

+            uses common-equipment-properties;

+            description "none";

+        }

+        description "A structure that represents an actual equipment that cannot be replaced in the field.

+            Is simply a subordinate part of an ActualEquipment (FRU). 

+            Does not have any exposed holders (any associated holders are assumed to belong to the containing FRU).

+            Does not have any connectors (any associated connectors are assumed to belong to the containing FRU).

+            ";

+    }

+    grouping common-actual-properties {

+        leaf asset-instance-identifier {

+            type string;

+            description "This attribute represents the asset identifier of this instance from the manufacturer's perspective.";

+        }

+        leaf is-powered {

+            type boolean;

+            description "The state of the power being supplied to the equipment.

+                Note that this attribute summarizes the power state. 

+                Full details on the actual power system would be provided from a number of PC instances representing the relevant parts of the Power function (e.g. different voltage supplies).";

+        }

+        leaf manufacture-date {

+            type tapi-common:date-and-time;

+            description "This attribute represents the date on which this instance is manufactured.";

+        }

+        leaf serial-number {

+            type string;

+            description "This attribute represents the serial number of this instance.";

+        }

+        leaf temperature {

+            type decimal64 {

+                fraction-digits 7;

+            }

+            description "The measured temperature of the Equipment.";

+        }

+        description "Properties common to actual Equipment.";

+    }

+    grouping common-equipment-properties {

+        leaf asset-type-identifier {

+            type string;

+            description "Represents the invariant properties of the equipment asset allocated by the operator that define and characterize the type.";

+        }

+        leaf equipment-type-description {

+            type string;

+            description "Text describing the type of Equipment.";

+        }

+        leaf equipment-type-identifier {

+            type string;

+            description "This attribute identifies the part type of the equipment.";

+        }

+        leaf equipment-type-name {

+            type string;

+            description "This attribute identifies the type of the equipment.";

+        }

+        leaf equipment-type-version {

+            type string;

+            description "This attribute identifies the version of the equipment.";

+        }

+        leaf manufacturer-identifier {

+            type string;

+            description "The formal unique identifier of the manufacturer.";

+        }

+        leaf manufacturer-name {

+            type string;

+            description "The formal name of the manufacturer of the Equipment.";

+        }

+        description "Properties common to all aspects of Equipment.";

+    }

+    grouping common-holder-properties {

+        leaf holder-category {

+            type holder-category;

+            description "The type of holder.";

+        }

+        leaf is-guided {

+            type boolean;

+            description "This attribute indicates whether the holder has guides that constrain the position of the equipment in the holder or not.";

+        }

+        leaf holder-location {

+            type string;

+            description "The relative position of the holder in the context of its containing equipment along with the position of that containing Equipment (and further recursion).";

+        }

+        description "Properties common to all aspects of Holder.";

+    }

+    grouping expected-equipment {

+        list expected-non-field-replaceable-module {

+            config false;

+            uses expected-non-field-replaceable-module;

+            description "none";

+        }

+        list expected-holder {

+            config false;

+            uses expected-holder;

+            description "none";

+        }

+        container common-equipment-properties {

+            config false;

+            uses common-equipment-properties;

+            description "none";

+        }

+        description "A definition of the restrictions on the equipment that is expected to be present in the physical network at a particular 'place'.

+            The expected equipment will state the type and may constrain any other invariant properties. 

+            It may also provide desired ranges for dynamic properties.";

+    }

+    grouping expected-holder {

+        container common-holder-properties {

+            config false;

+            uses common-holder-properties;

+            description "none";

+        }

+        description "A definition of a holder expected in the ActualEquipment (i.e. an ActualHolder) as part of the constraints provided by the ExpectedEquipment.";

+    }

+    grouping expected-non-field-replaceable-module {

+        container common-equipment-properties {

+            config false;

+            uses common-equipment-properties;

+            description "none";

+        }

+        description "A structure that represents an expected equipment that cannot be replaced in the field.

+            Is simply a subordinate part of an ExpectedEquipment (FRU). 

+            Does not have any exposed holders (any associated holders are assumed to belong to the containing FRU).

+            Does not have any connectors (any associated connectors are assumed to belong to the containing FRU).

+            ";

+    }

+    typedef equipment-object-type {

+        type identityref {

+            base EQUIPMENT_OBJECT_TYPE;

+        }

+        description "The list of TAPI Equipment Object types/classes.";

+    }

+    grouping pin-and-role {

+        leaf location-in-connector {

+            type string;

+            config false;

+            description "The named location of the pin in the context of the connector.

+                This is likely to be the normal numbering/naming for the type of connetor, e.g. '7', '6-GND', 'Common' etc.";

+        }

+        leaf-list pin-role {

+            type string;

+            config false;

+            description "It is not always necessary to specify a role (or list of roles) as the connector locationInConnector may be sufficient (as these are sometimes clearly role based.

+                Each entry represents a role in the context of the specific access port.

+                Each entry ties the pin to a functional element in the associated NEP(s) etc.

+                For example:

+                - a pin might carry several distinct signals where each signal is idenitified in the list

+                - a pin may carry a signal and power

+                - a signal carried by a pin may be the receive flow (INPUT) to a bidirectional NEP or the transmit flow (OUTPUT) or indeed both (BIDIRECTIONAL).";

+        }

+        leaf pin-name {

+            type string;

+            config false;

+            description "Where the pin has a distinct location identifier and a distinct name this field can be used for the name.

+                For example:

+                - locationInConnector = 6, pinName = GND";

+        }

+        description "Provides an opportunity, for a pin, to give the location of the pin and the role of the pin.";

+    }

+

+    /**************************

+    * package object-classes

+    **************************/ 

+    grouping equipment {

+        list contained-holder {

+            key 'uuid';

+            config false;

+            uses holder;

+            description "References the Holder in an Equipment that is available to take other Equipments.

+                For example:

+                - Slot in a sub-rack

+                - Slot in a Field Replaceable Unit that can take a small form-factor pluggable.";

+        }

+        leaf category {

+            type equipment-category;

+            config false;

+            description "This attribute provides the identifier for the form of equipments regarded as having particular shared characteristics.";

+        }

+        leaf equipment-location {

+            type string;

+            config false;

+            description "none";

+        }

+        leaf geographical-location {

+            type string;

+            config false;

+            description "none";

+        }

+        leaf is-expected-actual-mismatch {

+            type boolean;

+            config false;

+            description "none";

+        }

+        list expected-equipment {

+            uses expected-equipment;

+            description "none";

+        }

+        container actual-equipment {

+            uses actual-equipment;

+            description "none";

+        }

+        uses tapi-common:global-class;

+        description "Represents any relevant physical thing. 

+            Can be either field replaceable or not field replaceable.

+            Note: The model is currently constrained to inside plant.";

+    }

+    grouping holder {

+        container occupying-fru {

+            uses equipment-ref;

+            config false;

+            description "The FRU that is occupying the holder. 

+                A holder may be unoccupied. 

+                An FRU may occupy more hat one holder (using or blocking are intentionally not distinguished here).";

+        }

+        container expected-holder {

+            config false;

+            uses expected-holder;

+            description "none";

+        }

+        container actual-holder {

+            config false;

+            uses actual-holder;

+            description "none";

+        }

+        uses tapi-common:global-class;

+        description "Represents a space in an equipment in which another equipment can be fitted in the field.";

+    }

+    grouping access-port {

+        list connector-pin {

+            key 'connector-identification pin-identification equipment-uuid';

+            config false;

+            min-elements 1;

+            uses connector-pin-address;

+            description "The list of Pins that support the AccessPort.";

+        }

+        uses tapi-common:global-class;

+        description "A group of pins that together support a signal group where any one pin removed from the group will prevent all signals of the signal group from flowing successfully.

+            In some cases the AccessPort may simply reference a single connector (e.g., where the pin-connector association is simpe such that the AccessPort references all pinsof one connector).";

+    }

+    grouping physical-span {

+        list access-port {

+            uses access-port-ref;

+            key "device-uuid access-port-uuid";

+            config false;

+            min-elements 2;

+            max-elements 2;

+            description "none";

+        }

+        list abstract-strand {

+            key 'local-id';

+            config false;

+            uses abstract-strand;

+            description "Both the serial segments that form an end-end strand and the parallel end-end strands.";

+        }

+        uses tapi-common:global-class;

+        description "An adjacency between AccessPorts. 

+            The adjacency is supported by a group of strands between pins of the AccessPorts.

+            This is a physical abstraction.";

+    }

+    grouping abstract-strand {

+        list adjacent-strand {

+        	uses abstract-strand-ref;

+        	key "physical-span-uuid abstract-strand-local-id";

+            config false;

+            description "none";

+        }

+        list spliced-strand {

+        	uses abstract-strand-ref;

+        	key "physical-span-uuid abstract-strand-local-id";

+            config false;

+            max-elements 2;

+            description "none";

+        }

+        list connector-pin {

+            key 'connector-identification pin-identification equipment-uuid';

+            config false;

+            max-elements 2;

+            uses connector-pin-address;

+            description "A strand can end on two or more Pins (usually 2 pins, but a strand my be spliced to split a signal). This model supports only 2 ended strands.

+                A abstract strand may be spliced at both ends and hence have no direct relationship to pins or may be connected to pins at one or both ends.

+                In the essential model these Pins would be on connectors that plug in to connectors on Equipments.

+                The AbstractStrand is extended to the pins of the AccessPort which are the Pins on the Connectors of the Equipment.

+                In some cases it may not be relevant to represent the pin detail and hence the reference is to a connector alone.";

+        }

+        list strand-media-characteristics {

+            key 'value-name';

+            config false;

+            uses tapi-common:name-and-value;

+            description "Relevant physical properties of the abstract strand.";

+        }

+        uses tapi-common:local-class;

+        description "This object represents an abstraction of one or more strands in series that provides sufficient detail to enable appropriate engineering.

+            A strand represents a continuous long, thin piece of a medium such as glass fiber or copper wire.

+            In this model a Strand:

+            - a strand has two ends

+            - a splice can only be between 2 strands.

+            - the end of a strand may have a splice, a connector or be hidden

+            - only one end can be hidden in an equipment

+            - where a cable has more than two end each strand only goes between two of the ends

+            This model does NOT account for multiple copper strands being spliced.";

+    }

+    grouping device {

+        list equipment {

+            key 'uuid';

+            config false;

+            uses equipment;

+            description "none";

+        }

+        list access-port {

+            key 'uuid';

+            config false;

+            uses access-port;

+            description "none";

+        }

+        uses tapi-common:global-class;

+        description "A logical grouping of Equipments and AccessPorts that are closely located and form a support a coherent system of related functions.";

+    }

+    grouping physical-context {

+        list device {

+            key 'uuid';

+            config false;

+            uses device;

+            description "none";

+        }

+        list physical-span {

+            key 'uuid';

+            config false;

+            uses physical-span;

+            description "none";

+        }

+        uses tapi-common:global-class;

+        description "none";

+    }

+    grouping supporting-physical-span {

+        container physical-span {

+            uses physical-span-ref;

+            description "none";

+        }

+        description "none";

+    }

+    grouping supporting-access-port {

+        container access-port {

+            uses access-port-ref;

+            description "none";

+        }

+        description "none";

+    }

+

+    /**************************

+    * package interfaces

+    **************************/ 

+    rpc get-device-list {

+        description "none";

+        output {

+            list device {

+            	key 'uuid';

+                uses device;

+                description "none";

+            }

+        }

+    }

+    rpc get-physical-span-list {

+        description "none";

+        output {

+            list physical-span {

+            	key 'uuid';

+                uses physical-span;

+                description "none";

+            }

+        }

+    }

+    rpc get-device {

+        description "none";

+        input {

+            leaf uuid {

+                type tapi-common:uuid;

+                description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable.

+                    An UUID carries no semantics with respect to the purpose or state of the entity.

+                    UUID here uses string representation as defined in RFC 4122.  The canonical representation uses lowercase characters.

+                    Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} 

+                    Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6";

+            }

+        }

+        output {

+            container device {

+                uses device;

+                description "none";

+            }

+        }

+    }

+    rpc get-physical-span {

+        description "none";

+        input {

+            leaf uuid {

+                type tapi-common:uuid;

+                description "UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable.

+                    An UUID carries no semantics with respect to the purpose or state of the entity.

+                    UUID here uses string representation as defined in RFC 4122.  The canonical representation uses lowercase characters.

+                    Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} 

+                    Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6";

+            }

+        }

+        output {

+            container physical-span {

+                uses physical-span;

+                description "none";

+            }

+        }

+    }

+

+}

diff --git a/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-eth@2020-04-23.yang b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-eth@2020-04-23.yang
new file mode 100644
index 0000000..18dc7ad
--- /dev/null
+++ b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-eth@2020-04-23.yang
@@ -0,0 +1,1921 @@
+module tapi-eth {

+    namespace "urn:onf:otcc:yang:tapi-eth";

+    prefix tapi-eth;

+    import tapi-common {

+        prefix tapi-common;

+    }

+    import tapi-topology {

+        prefix tapi-topology;

+    }

+    import tapi-connectivity {

+        prefix tapi-connectivity;

+    }

+    import tapi-oam {

+        prefix tapi-oam;

+    }

+    organization "ONF OTCC (Open Transport Configuration & Control) Project";

+    contact "

+         Project Web: <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OTCC/TAPI__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6W87JJX8d$ >

+         Project List: <mailto:transport-api@opennetworking.org>

+         Editor: Karthik Sethuraman <mailto:karthik.sethuraman@necam.com>

+         Andrea Mazzini <mailto:andrea.mazzini@nokia.com>

+         Arturo Mayoral <mailto:arturo.mayoral@telefonica.com>

+         Nigel Davis <mailto:ndavis@ciena.com>";

+    description "

+        This module contains TAPI Ethernet Model definitions.

+        Source: TapiEth.uml

+        - The TAPI YANG models included in this TAPI release are a *normative* part of the TAPI SDK.

+        - The YANG specifications have been generated from the corresponding UML model using the [ONF EAGLE UML2YANG mapping tool]

+          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6W9QHQlY9$ >

+          and further edited manually to comply with the [ONF IISOMI UML2YANG mapping guidelines]

+          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6W0qYvUcv$ >

+        - Status of YANG model artifacts can be determined by referring to the corresponding UML artifacts.

+          As described in the UML models, some artifacts are considered *experimental*, and thus the corresponding YANG artifacts.

+        - The ONF TAPI release process does not guarantee backward compatibility of YANG models across major versions of TAPI releases.

+          The YANG model backward compatibility criteria are outlined in section 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6W--ZdU-9$ >.

+          YANG models included in this release may not be backward compatible with previous TAPI releases.

+        Copyright (c) 2018 Open Networking Foundation (ONF). All rights reserved.

+        License: This module is distributed under the Apache License 2.0";

+    revision 2020-04-23 {

+        description "ONF Transport API version 2.1.3.

+                   Changes included in this TAPI release (v2.1.3) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop_v2_1/CHANGE_LOG/change-log.2.1.3.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6Wy4g9HYF$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6W4x7StMd$ >";

+    }

+    revision 2019-07-16 {

+        description "ONF Transport API version 2.1.2.

+                   Changes included in this TAPI release (v2.1.2) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop_v2_1/CHANGE_LOG/change-log.2.1.2.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6W-egA4GT$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6W4x7StMd$ >";

+    }

+    revision 2018-12-10 {

+        description "ONF Transport API version 2.1.1.

+                   Changes included in this TAPI release (v2.1.1) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.1.1.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6W3pXLiCK$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6W4x7StMd$ >";

+    }

+    revision 2018-10-16 {

+        description "ONF Transport API version 2.1.0.

+                   Changes included in this TAPI release (v2.1.0) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.1.0.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6W_VCAFAh$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6W4x7StMd$ >";

+    }

+    revision 2018-03-07 {

+        description "ONF Transport API version 2.0.2

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.2.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6W_WUahPW$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.2/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6W35lRhTW$ >";

+    }

+    revision 2018-02-16 {

+        description "ONF Transport API version 2.0.1

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.1.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6W-v3LmU-$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.1/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6W8JgYRPN$ >";

+    }

+    revision 2018-01-02 {

+        description "ONF Transport API version 2.0.0

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.0.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6W5OrGOFi$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.0/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6WylpvjoG$ >";

+    }

+    augment "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-connectivity:cep-list/tapi-connectivity:connection-end-point" {

+        container eth-connection-end-point-spec {

+            uses eth-connection-end-point-spec;

+            description "Augments the base LayerProtocol information in ConnectionEndPoint with ETH-specific information";

+        }

+        description "Augments the base LayerProtocol information in ConnectionEndPoint with ETH-specific information";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-job" {

+        container eth-loopback-job {

+            uses eth-loopback-job;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:meg" {

+        container eth-meg-spec {

+            uses eth-meg-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:meg/tapi-oam:mep" {

+        container eth-mep-spec {

+            uses eth-mep-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:meg/tapi-oam:mip" {

+        container eth-mip-spec {

+            uses eth-mip-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-job" {

+        container eth-pro-active-2way-measurement-job {

+            uses eth-pro-active-2way-measurement-job;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-job" {

+        container eth-link-trace-job {

+            uses eth-link-trace-job;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-job" {

+        container eth-test-job {

+            uses eth-test-job;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-job" {

+        container eth-pro-active-1way-measurement-job {

+            uses eth-pro-active-1way-measurement-job;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-job/tapi-oam:pm-current-data" {

+        container eth-pro-active-dm-performance-data {

+            uses eth-pro-active-dm-performance-data;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-job/tapi-oam:pm-current-data/tapi-oam:pm-history-data" {

+        container eth-pro-active-dm-performance-data {

+            uses eth-pro-active-dm-performance-data;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-job/tapi-oam:pm-current-data" {

+        container eth-pro-active-lm-performance-data {

+            uses eth-pro-active-lm-performance-data;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-job/tapi-oam:pm-current-data/tapi-oam:pm-history-data" {

+        container eth-pro-active-lm-performance-data {

+            uses eth-pro-active-lm-performance-data;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-job/tapi-oam:pm-current-data" {

+        container eth-on-demand-dm-performance-data {

+            uses eth-on-demand-dm-performance-data;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-job/tapi-oam:pm-current-data" {

+        container eth-on-demand-1-lm-performance-data {

+            uses eth-on-demand-1-lm-performance-data;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-job/tapi-oam:pm-current-data" {

+        container eth-on-demand-1-dm-performance-data {

+            uses eth-on-demand-1-dm-performance-data;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-job/tapi-oam:pm-current-data" {

+        container eth-pro-active-1-dm-performance-data {

+            uses eth-pro-active-1-dm-performance-data;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-job/tapi-oam:pm-current-data/tapi-oam:pm-history-data" {

+        container eth-pro-active-1-dm-performance-data {

+            uses eth-pro-active-1-dm-performance-data;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-job/tapi-oam:pm-current-data" {

+        container eth-pro-active-1-lm-performance-data {

+            uses eth-pro-active-1-lm-performance-data;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-job/tapi-oam:pm-current-data/tapi-oam:pm-history-data" {

+        container eth-pro-active-1-lm-performance-data {

+            uses eth-pro-active-1-lm-performance-data;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-job" {

+        container eth-on-demand-1way-measurement-job {

+            uses eth-on-demand-1way-measurement-job;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-job" {

+        container eth-on-demand-2way-measurement-job {

+            uses eth-on-demand-2way-measurement-job;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-job/tapi-oam:pm-current-data/tapi-oam:pm-history-data" {

+        container eth-on-demand-1-dm-performance-data {

+            uses eth-on-demand-1-dm-performance-data;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-job/tapi-oam:pm-current-data/tapi-oam:pm-history-data" {

+        container eth-on-demand-1-lm-performance-data {

+            uses eth-on-demand-1-lm-performance-data;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-job/tapi-oam:pm-current-data/tapi-oam:pm-history-data" {

+        container eth-on-demand-dm-performance-data {

+            uses eth-on-demand-dm-performance-data;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-job/tapi-oam:pm-current-data" {

+        container eth-on-demand-lm-performance-data {

+            uses eth-on-demand-lm-performance-data;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-job/tapi-oam:pm-current-data/tapi-oam:pm-history-data" {

+        container eth-on-demand-lm-performance-data {

+            uses eth-on-demand-lm-performance-data;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-profile/tapi-oam:pm-threshold-data" {

+        container eth-1-dm-threshold-data {

+            uses eth-1-dm-threshold-data;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-profile/tapi-oam:pm-threshold-data" {

+        container eth-1-lm-threshold-data {

+            uses eth-1-lm-threshold-data;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-profile/tapi-oam:pm-threshold-data" {

+        container eth-dm-threshold-data {

+            uses eth-dm-threshold-data;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-profile/tapi-oam:pm-threshold-data" {

+        container eth-lm-threshold-data {

+            uses eth-lm-threshold-data;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-job/tapi-oam:pm-current-data" {

+        container eth-link-trace-result-data {

+            uses eth-link-trace-result-data;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-job/tapi-oam:pm-current-data" {

+        container eth-test-result-data {

+            uses eth-test-result-data;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-job/tapi-oam:pm-current-data" {

+        container eth-loopback-result-data {

+            uses eth-loopback-result-data;

+            description "none";

+        }

+        description "none";

+    }

+    /**************************

+    * package object-classes

+    **************************/ 

+    grouping eth-ctp-pac {

+        leaf-list auxiliary-function-position-sequence {

+            type uint64;

+            description "This attribute indicates the positions (i.e., the relative order) of all the MEP, MIP, and TCS objects which are associated with the CTP.";

+        }

+        leaf vlan-config {

+            type uint64;

+            description "This attribute models the ETHx/ETH-m_A_So_MI_Vlan_Config information defined in G.8021.

+                range of type : -1, 0, 1..4094";

+        }

+        leaf csf-rdi-fdi-enable {

+            type boolean;

+            description "This attribute models the MI_CSFrdifdiEnable information defined in G.8021.";

+        }

+        leaf csf-report {

+            type boolean;

+            description "This attribute models the MI_CSF_Reported information defined in G.8021.

+                range of type : true, false";

+        }

+        leaf-list filter-config-snk {

+            type mac-address;

+            description "This attribute models the FilteConfig MI defined in 8.3/G.8021. It indicates the configured filter action for each of the 33 group MAC addresses for control frames. The 33 MAC addresses are:

+                01-80-C2-00-00-10, 

+                01-80-C2-00-00-00 to 01-80-C2-00-00-0F, and 

+                01-80-C2-00-00-20 to 01-80-C2-00-00-2F.

+                The filter action is Pass or Block. 

+                If the destination address of the incoming ETH_CI_D matches one of the above addresses, the filter process shall perform the corresponding configured filter action. 

+                If none of the above addresses match, the ETH_CI_D is passed.";

+        }

+        leaf mac-length {

+            type uint64;

+            default "2000";

+            description "This attribute models the MAC_Lenght MI defined in 8.6/G.8021 for the MAC Length Check process. It indicates the allowed maximum frame length in bytes.

+                range of type : 1518, 1522, 2000";

+        }

+        container filter-config {

+            uses control-frame-filter;

+            description "This attribute models the FilterConfig MI defined in section 8.3/G.8021. It indicates the configured filter action for each of the 33 group MAC addresses for control frames. The 33 MAC addresses are:

+                - All bridges address: 01-80-C2-00-00-10,

+                - Reserved addresses: 01-80-C2-00-00-00 to 01-80-C2-00-00-0F,

+                - GARP Application addresses: 01-80-C2-00-00-20 to 01-80-C2-00-00-2F.

+                The filter action is Pass or Block. 

+                If the destination address of the incoming ETH_CI_D matches one of the above addresses, the filter process shall perform the corresponding configured filter action. 

+                If none of the above addresses match, the ETH_CI_D is passed.";

+        }

+        leaf is-ssf-reported {

+            type boolean;

+            description "This attribute provisions whether the SSF defect should be reported as fault cause or not.

+                It models the ETH-LAG_FT_Sk_MI_SSF_Reported defined in G.8021.";

+        }

+        leaf pll-thr {

+            type uint64;

+            description "This attribute provisions the threshold for the number of active ports. If the number of active ports is more than zero but less than the provisioned threshold, a cPLL (Partial Link Loss) is raised. See section 9.7.1.2 of G.8021.

+                range of type : 0..number of ports";

+        }

+        leaf actor-oper-key {

+            type uint64;

+            config false;

+            description "See 802.1AX:

+                The current operational value of the Key for the Aggregator. The administrative Key value may differ from the operational Key value for the reasons discussed in 5.6.2.

+                The meaning of particular Key values is of local significance.

+                range of type : 16 bit";

+        }

+        leaf actor-system-id {

+            type mac-address;

+            description "See 802.1AX:

+                A MAC address used as a unique identifier for the System that contains this Aggregator.";

+        }

+        leaf actor-system-priority {

+            type uint64;

+            description "See 802.1AX:

+                Indicating the priority associated with the Actors System ID.

+                range of type : 2-octet";

+        }

+        leaf collector-max-delay {

+            type uint64;

+            description "See 802.1AX:

+                The value of this attribute defines the maximum delay, in tens of microseconds, that may be imposed by the Frame Collector between receiving a frame from an Aggregator Parser, and either delivering the frame to its MAC Client or discarding the frame (see IEEE 802.1AX clause 5.2.3.1.1).

+                range of type : 16-bit";

+        }

+        leaf data-rate {

+            type uint64;

+            config false;

+            description "See 802.1AX:

+                The current data rate, in bits per second, of the aggregate link. The value is calculated as N times the data rate of a single link in the aggregation, where N is the number of active links.";

+        }

+        leaf partner-oper-key {

+            type uint64;

+            config false;

+            description "See 802.1AX:

+                The current operational value of the Key for the Aggregators current protocol Partner. If the aggregation is manually configured, this Key value will be a value assigned by the local System.

+                range of type : 16-bit";

+        }

+        leaf partner-system-id {

+            type mac-address;

+            config false;

+            description "See 802.1AX:

+                A MAC address consisting of the unique identifier for the current protocol Partner of this Aggregator. A value of zero indicates that there is no known Partner. If the aggregation is manually configured, this System ID value will be a value assigned by the local System.";

+        }

+        leaf partner-system-priority {

+            type uint64;

+            config false;

+            description "See 802.1AX:

+                Indicates the priority associated with the Partners System ID. If the aggregation is manually configured, this System Priority value will be a value assigned by the local System.

+                range of type : 2-octet";

+        }

+        leaf csf-config {

+            type csf-config;

+            description "This attribute models the combination of all CSF related MI signals (MI_CSF_Enable, MI_CSFrdifdi_Enable, MI_CSFdci_Enable) as defined in G.8021.

+                range of type : true, false";

+        }

+        container traffic-shaping {

+            uses traffic-shaping-pac;

+            description "none";

+        }

+        container traffic-conditioning {

+            uses traffic-conditioning-pac;

+            description "none";

+        }

+        description "none";

+    }

+    grouping eth-connection-end-point-spec {

+        container ety-term {

+            uses ety-termination-pac;

+            description "none";

+        }

+        container eth-term {

+            uses eth-termination-pac;

+            description "none";

+        }

+        container eth-ctp {

+            uses eth-ctp-pac;

+            description "none";

+        }

+        description "none";

+    }

+    grouping eth-termination-pac {

+        container priority-regenerate {

+            uses priority-mapping;

+            description "This attribute models the ETHx/ETH-m _A_Sk_MI_P_Regenerate information defined in G.8021.";

+        }

+        leaf ether-type {

+            type vlan-type;

+            description "This attribute models the ETHx/ETH-m _A_Sk_MI_Etype information defined in G.8021.";

+        }

+        leaf-list filter-config-1 {

+            type mac-address;

+            description "This attribute models the ETHx/ETH-m_A_Sk_MI_Filter_Config information defined in G.8021.

+                It indicates the configured filter action for each of the 33 group MAC addresses for control frames.

+                The 33 MAC addresses are:

+                01-80-C2-00-00-10, 

+                01-80-C2-00-00-00 to 01-80-C2-00-00-0F, and 

+                01-80-C2-00-00-20 to 01-80-C2-00-00-2F.

+                The filter action is Pass or Block. 

+                If the destination address of the incoming ETH_CI_D matches one of the above addresses, the filter process shall perform the corresponding configured filter action. 

+                If none of the above addresses match, the ETH_CI_D is passed.

+                range of type : MacAddress: 

+                01-80-C2-00-00-10, 

+                01-80-C2-00-00-00 to 

+                01-80-C2-00-00-0F, and 

+                01-80-C2-00-00-20 to 

+                01-80-C2-00-00-2F;

+                ActionEnum:

+                PASS, BLOCK";

+        }

+        leaf frametype-config {

+            type frame-type;

+            description "This attribute models the ETHx/ETH-m_A_Sk_MI_Frametype_Config information defined in G.8021.

+                range of type : see Enumeration";

+        }

+        leaf port-vid {

+            type vid;

+            default "1";

+            description "This attribute models the ETHx/ETH-m _A_Sk_MI_PVID information defined in G.8021.";

+        }

+        leaf priority-code-point-config {

+            type pcp-coding;

+            description "This attribute models the ETHx/ETH-m _A_Sk_MI_PCP_Config information defined in G.8021.

+                range of type : see Enumeration";

+        }

+        description "This object class models the Ethernet Flow Termination function located at a layer boundary.";

+    }

+    grouping ety-termination-pac {

+        leaf is-fts-enabled {

+            type boolean;

+            description "This attribute indicates whether Forced Transmitter Shutdown (FTS) is enabled or not. It models the ETYn_TT_So_MI_FTSEnable information.";

+        }

+        leaf is-tx-pause-enabled {

+            type boolean;

+            description "This attribute identifies whether the Transmit Pause process is enabled or not. It models the MI_TxPauseEnable defined in G.8021.";

+        }

+        leaf phy-type {

+            type ety-phy-type;

+            config false;

+            description "This attribute identifies the PHY type of the ETY trail termination. See IEEE 802.3 clause 30.3.2.1.2.";

+        }

+        leaf-list phy-type-list {

+            type ety-phy-type;

+            config false;

+            description "This attribute identifies the possible PHY types that could be supported at the ETY trail termination. See IEEE 802.3 clause 30.3.2.1.3.";

+        }

+        description "none";

+    }

+    grouping traffic-conditioning-pac {

+        list prio-config-list {

+            key 'queue-id';

+            config false;

+            uses priority-configuration;

+            description "This attribute indicates the Priority Splitter function for the mapping of the Ethernet frame priority (ETH_CI_P) values to the output queue.";

+        }

+        list cond-config-list {

+            key 'queue-id';

+            config false;

+            uses traffic-conditioning-configuration;

+            description "This attribute indicates for the conditioner process the conditioning parameters:

+                - Queue ID: Indicates the Queue ID

+                - Committed Information Rate (CIR): number of bits per second

+                - Committed Burst Size (CBS): number of bytes

+                - Excess Information Rate (EIR): number of bits per second

+                - Excess Burst Size (EBS): number of bytes

+                - Coupling flag (CF): 0 or 1

+                - Color mode (CM): color-blind and color-aware.";

+        }

+        leaf codirectional {

+            type boolean;

+            config false;

+            description "This attribute indicates the direction of the conditioner. The value of true means that the conditioner (modeled as a TCS Sink according to G.8021) is associated with the sink part of the containing CTP. The value of false means that the conditioner (modeled as a TCS Sink according to G.8021) is associated with the source part of the containing CTP.";

+        }

+        description "This object class models the ETH traffic conditioning function as defined in G.8021.

+            Basic attributes: codirectional, condConfigList, prioConfigList";

+    }

+    grouping traffic-shaping-pac {

+        list prio-config-list {

+            key 'queue-id';

+            config false;

+            uses priority-configuration;

+            description "This attribute configures the Priority Splitter function for the mapping of the Ethernet frame priority (ETH_CI_P) values to the output queue.";

+        }

+        list queue-config-list {

+            key 'queue-id';

+            config false;

+            uses queue-configuration;

+            description "This attribute configures the Queue depth and Dropping threshold parameters of the Queue process. The Queue depth sets the maximum size of the queue in bytes. An incoming ETH_CI traffic unit is dropped if there is insufficient space in the queue to hold the whole unit. The Dropping threshold sets the threshold of the queue. If the queue is filled beyond this threshold, incoming ETH_CI traffic units accompanied by the ETH_CI_DE signal set are dropped.";

+        }

+        leaf sched-config {

+            type scheduling-configuration;

+            config false;

+            description "This attribute configures the scheduler process. The value of this attribute is for further study because it is for further study in G.8021.

+                Scheduler is a pointer to a Scheduler object, which is to be defined in the future (because in G.8021, this is FFS).

+                Note that the only significance of the GTCS function defined in G.8021 is the use of a common scheduler for shaping. Given that, G.8052 models the common scheduler feature by having a common value for this attribute.";

+        }

+        leaf codirectional {

+            type boolean;

+            config false;

+            description "This attribute indicates the direction of the shaping function. The value of true means that the shaping (modeled as a TCS Source according to G.8021) is associated with the source part of the containing CTP. The value of false means that the shaping (modeled as a TCS Source according to G.8021) is associated with the sink part of the containing CTP.";

+        }

+        description "This object class models the ETH traffic shaping function as defined in G.8021.

+            Basic attribute: codirectional, prioConfigList, queueConfigList, schedConfig";

+    }

+    grouping eth-meg-spec {

+        leaf client-mel {

+            type uint64;

+            description "none";

+        }

+        description "none";

+    }

+    grouping eth-mep-spec {

+        container eth-mep-common {

+            uses eth-mep-common;

+            description "none";

+        }

+        container eth-mep-source-pac {

+            uses eth-mep-source;

+            description "none";

+        }

+        container eth-mep-sink {

+            uses eth-mep-sink;

+            description "none";

+        }

+        description "none";

+    }

+    grouping eth-mip-spec {

+        leaf mip-mac {

+            type mac-address;

+            config false;

+            description "This attribute contains the MAC address of the MIP instance.";

+        }

+        leaf is-full-mip {

+            type boolean;

+            config false;

+            description "This attribute indicates whether the MIP is a full MIP (true) or a down-half MIP (false).";

+        }

+        description "none";

+    }

+    grouping eth-loopback-job {

+        container eth-lb-msg {

+            uses eth-oam-msg-common-pac;

+            description "none";

+        }

+        leaf number {

+            type uint64;

+            description "G.8052: This parameter specifies how many LB messages to be sent for the LB_Series process.";

+        }

+        description "This class represents the Loopback (LB) process (send a series of LB messages carrying a test pattern to a particular MEP). The termination occurs at specified stop time (schedule attribute of OamJob).

+            This class models also the 'loopback discover' process, when destinationAddress is multicast.

+            When number is greater than 1, then the process is to perform a Loopback (LB) Series process (send a series of N LB messages to a particular MEP/MIP. ";

+    }

+    grouping eth-mep-common {

+        leaf mep-mac {

+            type mac-address;

+            config false;

+            description "This attribute contains the MAC Address of the MEP.";

+        }

+        leaf is-cc-enabled {

+            type boolean;

+            description "This attribute models the MI_CC_Enable signal defined in G.8021 and configured as specified in G8051.";

+        }

+        leaf cc-period {

+            type oam-period;

+            description "This attribute models the MI_CC_Period signal defined in G.8021 and configured as specified in G8051. 

+                It is the period at which the CCM message should be sent. 

+                Default values are: 3.33 ms for PS, 100 ms for PM, 1 s for FM.";

+        }

+        leaf cc-priority {

+            type uint64 {

+                range "0..7";

+            }

+            default "7";

+            description "This attribute models the MI_CC_Pri signal defined in G.8021 and configured as specified in G8051. It is the priority at which the CCM message should be sent.";

+        }

+        leaf lck-period {

+            type oam-period;

+            description "This attribute models the MI_LCK_Period signal defined in G.8021 and configured as specified in G8051. It is the frequency at which the LCK messages should be sent.

+                range of type : 1s, 1min";

+        }

+        leaf lck-priority {

+            type uint64 {

+                range "0..7";

+            }

+            default "7";

+            description "This attribute models the MI_LCK_Pri signal defined in G.8021 and configured as specified in G8051. It is the priority at which the LCK messages should be sent.";

+        }

+        description "Basic attributes: adminState, clientMel, megIdentifier, mepMac

+            Continuity Check Process related attributes: ccPeriod, ccPriority, isCcEnabled

+            Lock Process related attributes: lckPeriod, lckPriority

+            This object class models the MEP functions that are common to MEP Sink and MEP Source.";

+    }

+    grouping eth-mep-sink {

+        leaf-list dm-1-priority {

+            type uint64;

+            description "This attribute indicates the list of 1DM priorities for the MepSink.";

+        }

+        leaf ais-priority {

+            type uint64 {

+                range "0..7";

+            }

+            default "7";

+            description "This attribute models the MI_AIS_Pri signal defined in G.8021 and configured as specified in G8051. It is the priority at which the AIS messages should be sent.";

+        }

+        leaf ais-period {

+            type oam-period;

+            description "This attribute models the MI_AIS_Period signal defined in G.8021 and configured as specified in G8051. It is the frequency at which the AIS messages should be sent.

+                range of type : 1s, 1min";

+        }

+        leaf is-csf-reported {

+            type boolean;

+            default "true";

+            description "This attribute models the MI_CSF_Reported signal defined in G.8021 and configured as specified in G8051. It configures whether the secondary failure CSF should be reported or not.";

+        }

+        leaf is-csf-rdi-fdi-enabled {

+            type boolean;

+            default "true";

+            description "This attribute models the MI_CSFrdifdiEnable signal defined in G.8021 and configured as specified in G8051.";

+        }

+        container bandwidth-report {

+            config false;

+            uses bandwidth-report;

+            description "This attribute models the content of the bandwidth report received by the MEP Sink from the peer MEP Source.";

+        }

+        leaf lm-degm {

+            type uint64;

+            default "10";

+            description "This attribute defines the number of consecutive bad seconds necessary for the 'degraded' detection. See also section 'Degraded signal defect (dDEG)' in G.8021.";

+        }

+        leaf lm-deg-thr {

+            type uint64;

+            default "30";

+            description "This attribute defines the threshold for declaring a 'bad second'. See also section 'Degraded signal defect (dDEG)' in G.8021.";

+        }

+        leaf lm-m {

+            type uint64 {

+                range "2..10";

+            }

+            default "10";

+            description "This attribute defines the number of consecutive good seconds necessary for the clearing of 'degraded'. See also section 'Degraded signal defect (dDEG)' in G.8021.";

+        }

+        leaf lm-tf-min {

+            type uint64;

+            description "This attribute defines the necessary number of transmitted frames to enable the detection of 'bad seconds'. See also section 'Degraded signal defect (dDEG)' in G.8021.";

+        }

+        description "1DM related attribute: 1DmPriority

+            AIS Process related attributes: aisPeriod, aisPriority

+            Bandwidth notification Process related attribute: bandwidthReport

+            Basic attribute: peerMepRefList

+            CSF Process related attributes: isCsfRdiFdiEnabled, isCsfReported

+            Defect correlation Process related attribute: currentProblemList

+            This object class models the MEP sink function. Instance of this object class can be created and contained by ETH CTP or TTP objects.

+            It also provides the management of the dual-ended maintenance job, such as test.

+            This object contains the configuration parameters for detecting 'degraded signal' (DEG).";

+    }

+    grouping eth-mep-source {

+        leaf aps-priority {

+            type uint64 {

+                range "0..7";

+            }

+            default "7";

+            description "This attribute specifies the priority of the APS messages.

+                See section 8.1.5    APS insert process in G.8021.";

+        }

+        leaf csf-priority {

+            type uint64 {

+                range "0..7";

+            }

+            default "7";

+            description "This attribute models the MI_CSF_Pri signal defined in G.8021 and configured as specified in G8051. It is the priority at which the CSF messages should be sent";

+        }

+        leaf csf-period {

+            type oam-period;

+            description "This attribute models the MI_CSF_Period signal defined in G.8021 and configured as specified in G8051. It is the period at which the CSF messages should be sent.

+                range of type : 1s, 1min";

+        }

+        leaf csf-config {

+            type csf-config;

+            description "This attribute models the combination of all CSF related MI signals (MI_CSF_Enable, MI_CSFrdifdi_Enable, MI_CSFdci_Enable) as defined in G.8021.";

+        }

+        description "APS Process related attribute: apsPriority

+            Basic attribute: mepIdentifier

+            CSF Process related attributes: csfConfig, csfPeriod, csfPriority

+            Link trace related operation: linkTrace

+            Loopback related operations: loopbackDiscover, loopbackSeries, loopbackTest, loopbackTestTerminate

+            On demand measurement job control related operation: establishOnDemandDualEndedMeasurementJobSource

+            Proactive measurement job control related operation: establishProActiveDualEndedMeasurementJobSource

+            Test related operations: testInitiatorStart, testInitiatorTerminate

+            This object class models the MEP source function. Instance of this object class can be created and contained by ETH CTP or TTP objects.

+            It also provides the management of single-ended maintenance jobs, such as loopback test, loopback discover, loopback series, link trace, and dual-ended maintenance job, such as test.";

+    }

+    grouping eth-link-trace-job {

+        container eth-lt-msg {

+            uses eth-oam-operation-common-pac;

+            description "none";

+        }

+        leaf time-to-live {

+            type uint64;

+            description "G.8052: This parameter provides the Time To Live (TTL) parameter of the Link Track protocol.

+                The TTL parameter allows the receiver (MIP or MEP) of the LTM frame to determine if the frame can be terminated. TTL is decremented every time the LTM frame is relayed. LTM frame with TTL<=1 is terminated and not relayed.";

+        }

+        description "This class represents the Link Trace (LT) process for fault localization or for discovering the intermediate MIPs along the link from the MEP Source to a target MEP or MIP. An LTM frame will be sent from the MEP source to the target MEP/MIP.

+            The termination occurs at specified stop time (schedule attribute of OamJob).";

+    }

+    grouping eth-test-job {

+        container eth-test-msg {

+            uses eth-oam-msg-common-pac;

+            description "none";

+        }

+        description "This class represents the 1-way on-demand in-service or out-of-service diagnostic test. The diagnostic test includes verifying bandwidth throughput, frame loss, bit errors, etc. TST frames are transmitted.

+            The termination occurs at specified stop time (schedule attribute of OamJob).";

+    }

+    grouping eth-on-demand-measurement-job-control-sink {

+        leaf responder-mep-id {

+            type string;

+            description "none";

+        }

+        leaf source-address {

+            type mac-address;

+            description "This attribute contains the MAC address of the peer MEP. See G.8013 for details.";

+        }

+        leaf priority {

+            type uint64;

+            default "7";

+            description "This attribute contains the priority of the OAM PDU frames.

+                range of type : 0, 1, 2, 3, 4, 5, 6, 7";

+        }

+        leaf test-identifier {

+            type uint64;

+            description "This attribute is used to distinguish each measurement session if multiple measurement sessions are simultaneously activated towards a peer MEP including concurrent on-demand and proactive tests. It must be unique at least within the context of any measurement type for the MEG and initiating MEP.

+                range of type : 0..(2^32) - 1";

+        }

+        description "This object class represents an on-demand measurement job controller sink for 1-way measurements. It is created as a result of an establishOnDemandDualEndedMeasurementJobSink() operation. It is deleted either automatically after the measurement job has completed (stop time reached) and the performance data AVC notification has been sent, or by an explicit abortOnDemandMeasurementJob() operation when the measurement job is running.";

+    }

+    grouping eth-on-demand-measurement-job-control-source {

+        leaf controller-mep-id {

+            type string;

+            description "none";

+        }

+        leaf oam-pdu-generation-type {

+            type oam-pdu-generation-type;

+            description "This attribute contains the pattern that is used for the generation of OAM PDUs.";

+        }

+        leaf destination-address {

+            type mac-address;

+            description "This attribute contains the MAC address of the peer MEP. See G.8013 for details.";

+        }

+        leaf priority {

+            type uint64;

+            default "7";

+            description "This attribute contains the priority of the OAM PDU frames.

+                range of type : 0, 1, 2, 3, 4, 5, 6, 7";

+        }

+        leaf message-period {

+            type message-period;

+            description "This attribute contains the frequency of the OAM message (PDU) generation within a series. 

+                Note that the value 0 means that only one OAM message per measurement interval is generated.

+                range of type : See corresponding Enum.";

+        }

+        leaf repetition-period {

+            type repetition-period;

+            description "This attribute contains the time between the start of two measurement intervals. This IS applicable for the repetitive instance type and MAY be applicable for the repetitive series type. 

+                Note that a value of 0 means not applicable (NA), which is for the cases of single instance, single series, or repetitive series without extra gap in between the measurement intervals (i.e., also as known as continuous series).";

+        }

+        leaf measurement-interval {

+            type uint64;

+            description "This attribute contains the discrete non overlapping periods of time (in seconds) during which measurements are performed (i.e., OAM messages are generated) and reports are gathered at the end of the measurement intervals. Note that the value 0 means a degenerated measurement interval with a single OAM message and the report is sent as immediately as possible.

+                range of type : Non-negative";

+        }

+        leaf test-identifier {

+            type uint64;

+            description "This attribute is used to distinguish each measurement session if multiple measurement sessions are simultaneously activated towards a peer MEP including concurrent on-demand and proactive tests. It must be unique at least within the context of any measurement type for the MEG and initiating MEP.

+                Note: The attribute is not used in case of LMM/LMR measurement.

+                range of type : 0..(2^32) - 1";

+        }

+        leaf data-tlv-length {

+            type uint64;

+            description "This parameter provides the size of the optional data TLV.

+                Non-negative integer represents the number of bytes for the length of the padding TLV.

+                Notes:

+                When configuring this parameter one should be aware of the maximum allowed total frame size limitation.

+                The attribute is not used in case of 2-way loss measurement.

+                range of type : Depends on the allowed MTU size.";

+        }

+        description "Basic attributes: destinationAddress, priority

+            Measurement configuration related attributes: oamPduGenerationType, startTime, stopTime, messagePeriod, repetitionPeriod, measurementInterval

+            Optional attributes: dataTlvLength, testIdentifier

+            This object class represents an on-demand measurement job controller source for 1-way measurements. It is created as a result of an establishOnDemandDualEndedMeasurementJobSource() operation. It is deleted either automatically after the measurement job has completed (stop time reached), or by an explicit abortOnDemandMeasurementJob() operation while the measurement job is running.";

+    }

+    grouping eth-pro-active-measurement-job-control-sink {

+        leaf responder-mep-id {

+            type string;

+            description "none";

+        }

+        leaf is-enabled {

+            type boolean;

+            default "true";

+            description "This attribute identifies the state of the measurement job. If set to TRUE, the MEP performs proactive Performance Measurement.";

+        }

+        leaf source-address {

+            type mac-address;

+            description "This attribute contains the MAC address of the peer MEP. See G.8013 for details.";

+        }

+        leaf test-identifier {

+            type uint64;

+            description "This attribute is used to distinguish each measurement session if multiple measurement sessions are simultaneously activated towards a peer MEP including concurrent on-demand and proactive tests. It must be unique at least within the context of any measurement type for the MEG and initiating MEP.

+                range of type : 0..(2^32) - 1";

+        }

+        description "This object class allows the control of the proactive 1-way measurement. It is created as a part of an establishProActiveDualEndedMeasurementJobSink() operation. Lifecycle: A pre-condition of deleting the object is that the Enable attribute should have the value FALSE.";

+    }

+    grouping eth-pro-active-measurement-job-control-source {

+        leaf controller-mep-id {

+            type string;

+            description "none";

+        }

+        leaf is-enabled {

+            type boolean;

+            default "true";

+            description "This attribute identifies the state of the measurement job. If set to TRUE, the MEP performs proactive Performance Measurement.";

+        }

+        leaf destination-address {

+            type mac-address;

+            description "This attribute provides the Unicast MAC address of the intented destination.";

+        }

+        leaf priority {

+            type uint64 {

+                range "0..7";

+            }

+            default "7";

+            description "This attribute contains the priority value on which the MEP performs the measurement. When the measurement is enabled, the MEP should use this value to encode the priority of generated measurement frames. The EMF usese this value to assign the P parameter of the measurement operation.";

+        }

+        leaf period {

+            type oam-period;

+            description "This attribute indicates the period (frequency) of the measurement frame transmission.

+                range of type : 100ms, 1s, 10s";

+        }

+        leaf test-identifier {

+            type uint64;

+            description "This attribute is used to distinguish each measurement session if multiple measurement sessions are simultaneously activated towards a peer MEP including concurrent on-demand and proactive tests. It must be unique at least within the context of any measurement type for the MEG and initiating MEP.

+                Note: The attribute is not used in case of 2-way loss measurement. 

+                range of type : 0..(2^32) - 1";

+        }

+        leaf data-tlv-length {

+            type uint64;

+            description "This parameter provides the size of the optional data TLV.

+                Non-negative integer represents the number of bytes for the length of the padding TLV.

+                Notes:

+                When configuring this parameter one should be aware of the maximum allowed total frame size limitation.

+                The attribute is not used in case of 2-way loss measurement.

+                range of type : Depends on the allowed MTU size.";

+        }

+        description "This object class represents a proactive measurement job controller source for 1way measurements. It is created as a part of an establishProactiveDualEndedMeasurementJobSource() operation.";

+    }

+    grouping eth-pro-active-1-dm-performance-data {

+        container pro-active-near-end-1-dm-parameters {

+            uses statistical-dm-performance-parameters;

+            description "This attribute contains the statistical near end performnace parameters.";

+        }

+        description "This object class represents the PM current data collected in a pro-active delay measurement job (using 1DM).";

+    }

+    grouping eth-pro-active-1-lm-performance-data {

+        container pro-active-near-end-1-lm-parameters {

+            uses statistical-lm-performance-parameters;

+            description "This attribute contains the statistical near end performnace parameters.";

+        }

+        description "This object class represents the PM current data collected in a pro-active loss measurement job (using 1SL).";

+    }

+    grouping eth-pro-active-dm-performance-data {

+        container pro-active-bi-dir-dm-parameters {

+            uses statistical-dm-performance-parameters;

+            description "This attribute contains the statistical bidirectional performnace parameters.";

+        }

+        container pro-active-far-end-dm-parameters {

+            uses statistical-dm-performance-parameters;

+            description "This attribute contains the statistical far end performnace parameters.";

+        }

+        container pro-active-near-end-dm-parameters {

+            uses statistical-dm-performance-parameters;

+            description "This attribute contains the statistical near end performnace parameters.";

+        }

+        description "This object class represents the PM current data collected in a pro-active delay measurement job (using DMM/DMR).";

+    }

+    grouping eth-pro-active-lm-performance-data {

+        container pro-active-far-end-lm-parameters {

+            uses statistical-lm-performance-parameters;

+            description "This attribute contains the statistical far end performnace parameters.";

+        }

+        container pro-active-near-end-lm-parameters {

+            uses statistical-lm-performance-parameters;

+            description "This attribute contains the statistical near end performnace parameters.";

+        }

+        leaf bidirectional-uas {

+            type uint64;

+            description "This attribute contains the bidirectional UAS (unavailable seconds) detected in the monitoring interval.

+                range of type : 0..900 for 15min interval or 0..86400 for 24 hr interval.";

+        }

+        description "This object class represents the PM current data collected in a pro-active loss measurement job (using LMM/LMR or SLM/SLR).";

+    }

+    grouping eth-on-demand-1-dm-performance-data {

+        container on-demand-near-end-1-dm-parameters {

+            uses on-demand-dm-performance-parameters;

+            description "This attribute contains the results of an on-demand frame delay measurement job in the ingress direction.";

+        }

+        description "none";

+    }

+    grouping eth-on-demand-1-lm-performance-data {

+        container on-demand-near-end-1-lm-parameters {

+            uses on-demand-lm-performance-parameters;

+            description "This attribute contains the results of an on-demand synthetic loss measurement job in the ingress direction.";

+        }

+        description "none";

+    }

+    grouping eth-on-demand-dm-performance-data {

+        container on-demand-far-end-dm-parameters {

+            uses on-demand-dm-performance-parameters;

+            description "This attribute contains the results of an on-demand frame delay measurement job in the ingress direction.";

+        }

+        container on-demand-near-end-dm-parameters {

+            uses on-demand-dm-performance-parameters;

+            description "This attribute contains the results of an on-demand frame delay measurement job in the ingress direction.";

+        }

+        description "none";

+    }

+    grouping eth-on-demand-lm-performance-data {

+        container on-demand-far-end-lm-parameters {

+            uses on-demand-lm-performance-parameters;

+            description "This attribute contains the results of an on-demand synthetic loss measurement job in the egress direction.";

+        }

+        container on-demand-near-end-lm-parameters {

+            uses on-demand-lm-performance-parameters;

+            description "This attribute contains the results of an on-demand synthetic loss measurement job in the ingress direction.";

+        }

+        description "none";

+    }

+    grouping eth-pro-active-1way-measurement-job {

+        container pro-active-control-1way-source {

+            uses eth-pro-active-measurement-job-control-source;

+            description "none";

+        }

+        container pro-active-control-1way-sink {

+            uses eth-pro-active-measurement-job-control-sink;

+            description "none";

+        }

+        description "none";

+    }

+    grouping eth-pro-active-2way-measurement-job {

+        container pro-active-control-2way-source {

+            uses eth-pro-active-measurement-job-control-source;

+            description "none";

+        }

+        description "none";

+    }

+    grouping eth-on-demand-2way-measurement-job {

+        container on-demand-control-2way-source {

+            uses eth-on-demand-measurement-job-control-source;

+            description "none";

+        }

+        description "none";

+    }

+    grouping eth-on-demand-1way-measurement-job {

+        container on-demand-control-1way-source {

+            uses eth-on-demand-measurement-job-control-source;

+            description "none";

+        }

+        container on-demand-control-1way-sink {

+            uses eth-on-demand-measurement-job-control-sink;

+            description "none";

+        }

+        description "none";

+    }

+    grouping eth-1-dm-threshold-data {

+        container near-end-1-dm-cross-threshold {

+            uses statistical-dm-performance-parameters;

+            description "This attribute contains the near end cross threshold values of the delay measurements.";

+        }

+        container near-end-1-dm-clear-threshold {

+            uses statistical-dm-performance-parameters;

+            description "This attribute contains the near end clear threshold values of the delay measurements.";

+        }

+        description "This data type contains the threshold values for frame delay related 1-way measurements.";

+    }

+    grouping eth-1-lm-threshold-data {

+        container near-end-1-lm-cross-threshold {

+            uses statistical-lm-performance-parameters;

+            description "This attribute contains the near end cross threshold values of the loss measurements.";

+        }

+        container near-end-1-lm-clear-threshold {

+            uses statistical-lm-performance-parameters;

+            description "This attribute is only valid for frame loss ratio parameters and counter type parameters working in the 'standing condition method' (see G.7710, section 10.1.7.2: Threshold reporting) and contains the near end clear threshold values of the loss measurements.";

+        }

+        description "This data type contains the threshold values for frame loss related 1-way measurements.";

+    }

+    grouping eth-dm-threshold-data {

+        container near-end-dm-cross-threshold {

+            uses statistical-dm-performance-parameters;

+            description "This attribute contains the near end cross threshold values of the delay measurements.";

+        }

+        container near-end-dm-clear-threshold {

+            uses statistical-dm-performance-parameters;

+            description "This attribute contains the near end clear threshold values of the delay measurements.";

+        }

+        container far-end-dm-cross-threshold {

+            uses statistical-dm-performance-parameters;

+            description "This attribute contains the far end cross threshold values of the delay measurements.";

+        }

+        container far-end-dm-clear-threshold {

+            uses statistical-dm-performance-parameters;

+            description "This attribute contains the far end clear threshold values of the delay measurements.";

+        }

+        container bi-dir-dm-cross-threshold {

+            uses statistical-dm-performance-parameters;

+            description "This attribute contains the bidirectional cross threshold values of the delay measurements.";

+        }

+        container bi-dir-dm-clear-threshold {

+            uses statistical-dm-performance-parameters;

+            description "This attribute contains the bidirectional clear threshold values of the delay measurements.";

+        }

+        description "This data type contains the threshold values for frame delay related 2-way measurements.";

+    }

+    grouping eth-lm-threshold-data {

+        container near-end-lm-cross-threshold {

+            uses statistical-lm-performance-parameters;

+            description "This attribute contains the near end cross threshold values of the loss measurements.";

+        }

+        container near-end-lm-clear-threshold {

+            uses statistical-lm-performance-parameters;

+            description "This attribute is only valid for frame loss ratio parameters and counter type parameters working in the 'standing condition method' (see G.7710, section 10.1.7.2: Threshold reporting) and contains the near end clear threshold values of the loss measurements.";

+        }

+        container far-end-lm-cross-threshold {

+            uses statistical-lm-performance-parameters;

+            description "This attribute contains the far end cross threshold values of the loss measurements.";

+        }

+        container far-end-lm-clear-threshold {

+            uses statistical-lm-performance-parameters;

+            description "This attribute is only valid for frame loss ratio parameters and counter type parameters working in the 'standing condition method' (see G.7710, section 10.1.7.2: Threshold reporting) and contains the far end clear threshold values of the loss measurements.";

+        }

+        leaf bi-dir-lm-uas-cross-threshold {

+            type uint64;

+            description "This attribute contains the bidirectional cross threshold value of the UAS loss measurement.";

+        }

+        leaf bi-dir-lm-uas-clear-threshold {

+            type uint64;

+            description "This attribute is only valid for the UAS parameter working in the 'standing condition method' (see G.7710, section 10.1.7.2: Threshold reporting) and contains the bidirectional clear threshold value of the UAS loss measurement.";

+        }

+        description "This data type contains the threshold values for frame loss related 2-way measurements.";

+    }

+    grouping eth-loopback-result-data {

+        leaf rec-lbr-frames {

+            type uint64;

+            config false;

+            description "G.8052: This parameter returns the total number of received LBR messages, including the out of order LBR frames.";

+        }

+        leaf out-of-order-lbr-frames {

+            type uint64;

+            config false;

+            description "G.8052: This parameter returns the number of LBR traffic unites (messages) that were received out of order (OO).";

+        }

+        leaf sent-lbm-frames {

+            type uint64;

+            config false;

+            description "G.8052: This parameter returns the total number of sent LBM frames.";

+        }

+        leaf crc-lbr-frames {

+            type uint64;

+            config false;

+            description "G.8052: This parameter returns the number of LBR frames where the CRC in the pattern failed.";

+        }

+        leaf ber-lbr-frames {

+            type uint64;

+            config false;

+            description "G.8052: This parameter returns the number of LBR frames where there was a bit error in the pattern.";

+        }

+        leaf-list detected-peer-mep {

+            type mac-address;

+            config false;

+            description "G.8052: This parameter returns the MAC addresses of the discovered peer MEPs of the subject MEP.";

+        }

+        description "none";

+    }

+    grouping eth-link-trace-result-data {

+        list result-list {

+            key 'source-address';

+            config false;

+            uses link-trace-result;

+            description "G.8052: This parameter returns the results of the LT process. It contains a list of the result received from the individual LTR frames.

+                The result from the individual LTR frame include the Source Mac Address, the TTL, and TLV.";

+        }

+        description "none";

+    }

+    grouping eth-test-result-data {

+        leaf sent-tst-frames {

+            type uint64;

+            config false;

+            description "G.8052: This parameter returns the total number of sent TST frames.";

+        }

+        description "none";

+    }

+    grouping eth-oam-operation-common-pac {

+        leaf destination-address {

+            type mac-address;

+            description "G.8052: This parameter provides the destination address, i.e., the MAC Address of the target MEP or MIP.";

+        }

+        leaf priority {

+            type uint64;

+            default "7";

+            description "G.8052: This parameter provides the priority to be used in the LBM frame.";

+        }

+        description "none";

+    }

+    grouping eth-oam-msg-common-pac {

+        leaf period {

+            type oam-period;

+            description "G.8052: This parameter provides the periodicity of the TST OAM messages.";

+        }

+        leaf drop-eligibility {

+            type boolean;

+            description "G.8052: This parameter provides the eligibility of frames with unicast ETH-TST information to be discarded when congestion conditions are encountered.";

+        }

+        leaf data-tlv-length {

+            type uint64;

+            description "G.8052: This parameter provides the length (in number of octet) of the optional Data TLV to be included in the TST frame.";

+        }

+        leaf test-pattern {

+            type uint64;

+            description "G.8052: This parameter provides the test pattern to be used in the optional Data TLV.

+                Examples of test patterns include pseudo-random bit sequence (PRBS) 2^31-1 as specified in clause 5.8 of [ITU-T O.150], all '0' pattern, etc.

+                The following values of pattern types are defined:

+                0: 'Null signal without CRC-32'

+                1: 'Null signal with CRC-32'

+                2: 'PRBS 2^31-1 without CRC-32'

+                3: 'PRBS 2^31-1 with CRC-32'.";

+        }

+        uses eth-oam-operation-common-pac;

+        description "none";

+    }

+

+    /**************************

+    * package type-definitions

+    **************************/ 

+    identity ETH_OAM_JOB_TYPE {

+        base tapi-oam:OAM_JOB_TYPE;

+        description "none";

+    }

+    identity ETH_OAM_JOB_TYPE_ETH_1DM {

+        base ETH_OAM_JOB_TYPE;

+        description "none";

+    }

+    identity ETH_OAM_JOB_TYPE_ETH_1SLM {

+        base ETH_OAM_JOB_TYPE;

+        description "none";

+    }

+    identity ETH_OAM_JOB_TYPE_ETH_LM_CCM {

+        base ETH_OAM_JOB_TYPE;

+        description "none";

+    }

+    identity ETH_OAM_JOB_TYPE_ETH_LM_LMM {

+        base ETH_OAM_JOB_TYPE;

+        description "none";

+    }

+    identity ETH_OAM_JOB_TYPE_ETH_SLM {

+        base ETH_OAM_JOB_TYPE;

+        description "none";

+    }

+    identity ETH_OAM_JOB_TYPE_ETH_DM {

+        base ETH_OAM_JOB_TYPE;

+        description "none";

+    }

+    identity ETH_OAM_JOB_TYPE_ETH_LTC {

+        base ETH_OAM_JOB_TYPE;

+        description "none";

+    }

+    identity ETH_OAM_JOB_TYPE_ETH_LBK {

+        base ETH_OAM_JOB_TYPE;

+        description "none";

+    }

+    identity ETH_OAM_JOB_TYPE_ETH_TEST {

+        base ETH_OAM_JOB_TYPE;

+        description "none";

+    }

+    grouping priority-configuration {

+        leaf queue-id {

+            type uint64 {

+                range "1..8";

+            }

+            description "none";

+        }

+        leaf priority {

+            type uint64 {

+                range "0..7";

+            }

+            description "none";

+        }

+        description "none";

+    }

+    grouping queue-configuration {

+        leaf queue-id {

+            type uint64;

+            description "This attribute indicates the queue id.";

+        }

+        leaf queue-depth {

+            type uint64;

+            description "This attribute defines the depth of the queue in bytes.";

+        }

+        leaf queue-threshold {

+            type uint64;

+            description "This attribute defines the threshold of the queue in bytes.";

+        }

+        description "none";

+    }

+    grouping traffic-conditioning-configuration {

+        leaf cir {

+            type uint64;

+            description "This attribute indicates the Committed Information Rate in bits/s.";

+        }

+        leaf cbs {

+            type uint64;

+            description "This attribute indicates the Committed Burst Size in bytes.";

+        }

+        leaf eir {

+            type uint64;

+            description "This attribute indicates the Excess Information Rate in bits/s.";

+        }

+        leaf ebs {

+            type uint64;

+            description "This attribute indicates the Excess Burst Size in bytes.";

+        }

+        leaf coupling-flag {

+            type boolean;

+            description "This attribute indicates the coupling flag.";

+        }

+        leaf colour-mode {

+            type colour-mode;

+            description "This attribute indicates the colour mode.";

+        }

+        leaf queue-id {

+            type uint64 {

+                range "1..8";

+            }

+            description "This attribute indicates the queue id.";

+        }

+        description "none";

+    }

+    typedef mac-address {

+        type string;

+        description "This primitive data type contains an Ethernet MAC address defined by IEEE 802a. The format of the address consists of 12 hexadecimal characters, grouped in pairs and separated by '-' (e.g., 03-27-AC-75-3E-1D).";

+    }

+    grouping priority-mapping {

+        leaf priority-0 {

+            type uint64 {

+                range "0..7";

+            }

+            description "This attribute defines the new priority value for the old priority value 0.";

+        }

+        leaf priority-1 {

+            type uint64 {

+                range "0..7";

+            }

+            default "1";

+            description "This attribute defines the new priority value for the old priority value 1.";

+        }

+        leaf priority-2 {

+            type uint64 {

+                range "0..7";

+            }

+            default "2";

+            description "This attribute defines the new priority value for the old priority value 2.";

+        }

+        leaf priority-3 {

+            type uint64 {

+                range "0..7";

+            }

+            default "3";

+            description "This attribute defines the new priority value for the old priority value 3.";

+        }

+        leaf priority-4 {

+            type uint64 {

+                range "0..7";

+            }

+            default "4";

+            description "This attribute defines the new priority value for the old priority value 4.";

+        }

+        leaf priority-5 {

+            type uint64 {

+                range "0..7";

+            }

+            default "5";

+            description "This attribute defines the new priority value for the old priority value 5.";

+        }

+        leaf priority-6 {

+            type uint64 {

+                range "0..7";

+            }

+            default "6";

+            description "This attribute defines the new priority value for the old priority value 6.";

+        }

+        leaf priority-7 {

+            type uint64 {

+                range "0..7";

+            }

+            default "7";

+            description "This attribute defines the new priority value for the old priority value 7.";

+        }

+        description "This data type provides the priority mapping done in the 'P Regenerate' process defined in G.8021.";

+    }

+    typedef vid {

+        type string;

+        description "This primitive type models the 12 Bit VLAN identifier of a VLAN tag.";

+    }

+    typedef modify-cross-connection-data {

+        type string;

+        description "none";

+    }

+    grouping address-tuple {

+        leaf address {

+            type mac-address;

+            description "This attribute contains the MAC address of the address tuple.";

+        }

+        leaf-list port-list {

+            type mac-address;

+            description "This attribute contains the ports associated to the MAC address in the address tuple.";

+        }

+        description "This data type contains an address tuple consisting of a MAC address and a corresponding port list.";

+    }

+    typedef scheduling-configuration {

+        type string;

+        description "The syntax of this dataType is pending on the specification in G.8021, which is for further study.";

+    }

+    grouping control-frame-filter {

+        leaf c-2-00-00-10 {

+            type boolean;

+            description "This attribute identifies the 'All LANs Bridge Management Group Address'.";

+        }

+        leaf c-2-00-00-00 {

+            type boolean;

+            description "This attribute identifies the STP/RSTP/MSTP protocol address.";

+        }

+        leaf c-2-00-00-01 {

+            type boolean;

+            description "This attribute identifies the IEEE MAC-specific Control Protocols group address (PAUSE protocol).";

+        }

+        leaf c-2-00-00-02 {

+            type boolean;

+            description "This attribute identifies the IEEE 802.3 Slow_Protocols_Multicast address (LACP/LAMP or Link OAM protocols).";

+        }

+        leaf c-2-00-00-03 {

+            type boolean;

+            description "This attribute identifies the Nearest non-TPMR Bridge group address (Port Authentication protocol).";

+        }

+        leaf c-2-00-00-04 {

+            type boolean;

+            description "This attribute identifies the IEEE MAC-specific Control Protocols group address.";

+        }

+        leaf c-2-00-00-05 {

+            type boolean;

+            description "Reserved for future standardization.";

+        }

+        leaf c-2-00-00-06 {

+            type boolean;

+            description "Reserved for future standardization.";

+        }

+        leaf c-2-00-00-07 {

+            type boolean;

+            description "This attribute identifies the Metro Ethernet Forum E-LMI protocol group address.";

+        }

+        leaf c-2-00-00-08 {

+            type boolean;

+            description "This attribute identifies the Provider Bridge Group address.";

+        }

+        leaf c-2-00-00-09 {

+            type boolean;

+            description "Reserved for future standardization.";

+        }

+        leaf c-2-00-00-0-a {

+            type boolean;

+            description "Reserved for future standardization.";

+        }

+        leaf c-2-00-00-0-b {

+            type boolean;

+            description "Reserved for future standardization.";

+        }

+        leaf c-2-00-00-0-c {

+            type boolean;

+            description "Reserved for future standardization.";

+        }

+        leaf c-2-00-00-0-d {

+            type boolean;

+            description "This attribute identifies the Provider Bridge MVRP address.";

+        }

+        leaf c-2-00-00-0-e {

+            type boolean;

+            description "This attribute identifies the Individual LAN Scope group address, Nearest Bridge group address (LLDP protocol).";

+        }

+        leaf c-2-00-00-0-f {

+            type boolean;

+            description "Reserved for future standardization.";

+        }

+        leaf c-2-00-00-20 {

+            type boolean;

+            description "This attribute identifies the Customer and Provider Bridge MMRP address.";

+        }

+        leaf c-2-00-00-21 {

+            type boolean;

+            description "This attribute identifies the Customer Bridge MVRP address.";

+        }

+        leaf c-2-00-00-22 {

+            type boolean;

+            description "Reserved for future standardization.";

+        }

+        leaf c-2-00-00-23 {

+            type boolean;

+            description "Reserved for future standardization.";

+        }

+        leaf c-2-00-00-24 {

+            type boolean;

+            description "Reserved for future standardization.";

+        }

+        leaf c-2-00-00-25 {

+            type boolean;

+            description "Reserved for future standardization.";

+        }

+        leaf c-2-00-00-26 {

+            type boolean;

+            description "Reserved for future standardization.";

+        }

+        leaf c-2-00-00-27 {

+            type boolean;

+            description "Reserved for future standardization.";

+        }

+        leaf c-2-00-00-28 {

+            type boolean;

+            description "Reserved for future standardization.";

+        }

+        leaf c-2-00-00-29 {

+            type boolean;

+            description "Reserved for future standardization.";

+        }

+        leaf c-2-00-00-2-a {

+            type boolean;

+            description "Reserved for future standardization.";

+        }

+        leaf c-2-00-00-2-b {

+            type boolean;

+            description "Reserved for future standardization.";

+        }

+        leaf c-2-00-00-2-c {

+            type boolean;

+            description "Reserved for future standardization.";

+        }

+        leaf c-2-00-00-2-d {

+            type boolean;

+            description "Reserved for future standardization.";

+        }

+        leaf c-2-00-00-2-e {

+            type boolean;

+            description "Reserved for future standardization.";

+        }

+        leaf c-2-00-00-2-f {

+            type boolean;

+            description "Reserved for future standardization.";

+        }

+        description "This data type identifies the filter action for each of the 33 group MAC addresses (control frames).

+            Value 'false' means block: The frame is discarded by the filter process.

+            Value 'true' means pass: The frame is passed unchanged through the filter process.";

+    }

+    grouping bandwidth-report {

+        leaf source-mac-address {

+            type mac-address;

+            description "The sourceMacAddress is the address from the far end.";

+        }

+        leaf port-id {

+            type uint64;

+            description "This attribute returns the far end port identifier.";

+        }

+        leaf nominal-bandwidth {

+            type uint64;

+            description "This attribute returns the configured bandwidth";

+        }

+        leaf current-bandwidth {

+            type uint64;

+            description "This attribute returns the current bandwidth.";

+        }

+        description "Data type for the bandwidth report.";

+    }

+    typedef admin-state {

+        type enumeration {

+            enum LOCK {

+                description "none";

+            }

+            enum NORMAL {

+                description "none";

+            }

+        }

+        description "none";

+    }

+    typedef colour-mode {

+        type enumeration {

+            enum COLOUR_BLIND {

+                description "none";

+            }

+            enum COLOUR_AWARE {

+                description "none";

+            }

+        }

+        description "none";

+    }

+    typedef csf-config {

+        type enumeration {

+            enum DISABLED {

+                description "This literal covers the following states of the CSF related MI informations:

+                    - MI_CSF_Enable is false

+                    - MI_CSFrdifdi_Enable is false

+                    - MI_CSFdci_Enable is false.";

+            }

+            enum ENABLED {

+                description "This literal covers the following states of the CSF related MI informations:

+                    - MI_CSF_Enable is true

+                    - MI_CSFrdifdi_Enable is false

+                    - MI_CSFdci_Enable is false.";

+            }

+            enum ENABLED_WITH_RDI_FDI {

+                description "This literal covers the following states of the CSF related MI informations:

+                    - MI_CSF_Enable is true

+                    - MI_CSFrdifdi_Enable is true

+                    - MI_CSFdci_Enable is false.";

+            }

+            enum ENABLED_WITH_RDI_FDI_DCI {

+                description "This literal covers the following states of the CSF related MI informations:

+                    - MI_CSF_Enable is true

+                    - MI_CSFrdifdi_Enable is true

+                    - MI_CSFdci_Enable is true.";

+            }

+            enum ENABLED_WITH_DCI {

+                description "This literal covers the following states of the CSF related MI informations:

+                    - MI_CSF_Enable is true

+                    - MI_CSFrdifdi_Enable is false

+                    - MI_CSFdci_Enable is true.";

+            }

+        }

+        description "none";

+    }

+    typedef ety-phy-type {

+        type enumeration {

+            enum OTHER {

+                description "none";

+            }

+            enum UNKNOWN {

+                description "none";

+            }

+            enum NONE {

+                description "none";

+            }

+            enum 2BASE_TL {

+                description "none";

+            }

+            enum 10MBIT_S {

+                description "none";

+            }

+            enum 10PASS_TS {

+                description "none";

+            }

+            enum 100BASE_T4 {

+                description "none";

+            }

+            enum 100BASE_X {

+                description "none";

+            }

+            enum 100BASE_T2 {

+                description "none";

+            }

+            enum 1000BASE_X {

+                description "none";

+            }

+            enum 1000BASE_T {

+                description "none";

+            }

+            enum 10GBASE-X {

+                description "none";

+            }

+            enum 10GBASE_R {

+                description "none";

+            }

+            enum 10GBASE_W {

+                description "none";

+            }

+        }

+        description "none";

+    }

+    typedef frame-type {

+        type enumeration {

+            enum ADMIT_ONLY_VLAN_TAGGED_FRAMES {

+                description "none";

+            }

+            enum ADMIT_ONLY_UNTAGGED_AND_PRIORITY_TAGGED_FRAMES {

+                description "none";

+            }

+            enum ADMIT_ALL_FRAMES {

+                description "none";

+            }

+        }

+        description "none";

+    }

+    typedef oam-period {

+        type enumeration {

+            enum 3_33MS {

+                description "Default for protection.";

+            }

+            enum 10MS {

+                description "none";

+            }

+            enum 100MS {

+                description "none";

+            }

+            enum 1S {

+                description "none";

+            }

+            enum 10S {

+                description "none";

+            }

+            enum 1MIN {

+                description "none";

+            }

+            enum 10MIN {

+                description "none";

+            }

+        }

+        description "Provides the frequency for the OAM PDU insertion.";

+    }

+    typedef pcp-coding {

+        type enumeration {

+            enum 8P0D {

+                description "none";

+            }

+            enum 7P1D {

+                description "none";

+            }

+            enum 6P2D {

+                description "none";

+            }

+            enum 5P3D {

+                description "none";

+            }

+            enum DEI {

+                description "This enumeration value means that all priorities should be drop eligible.

+                    DEI = Drop Eligibility Indicator";

+            }

+        }

+        description "This enum models the coding of the Priority Code Point as defined in section 'Priority Code Point encoding' of IEEE 802.1Q.";

+    }

+    typedef vlan-type {

+        type enumeration {

+            enum C_Tag {

+                description "0x8100";

+            }

+            enum S_Tag {

+                description "0x88a8";

+            }

+            enum I_Tag {

+                description "88-e7";

+            }

+        }

+        description "This enumeration contains the Ethertypes defined in IEEE 802.1Q.";

+    }

+    typedef repetition-period {

+        type enumeration {

+            enum 1MIN {

+                description "none";

+            }

+            enum 1S {

+                description "none";

+            }

+            enum 10S {

+                description "none";

+            }

+            enum 0 {

+                description "none";

+            }

+        }

+        description "This enumeration defines the allowed values for the repetition period in on-demand measurements.

+            Note: The value 0 means that the value is not relevant.";

+    }

+    typedef message-period {

+        type enumeration {

+            enum 10MS {

+                description "none";

+            }

+            enum 100MS {

+                description "none";

+            }

+            enum 1S {

+                description "none";

+            }

+            enum 10S {

+                description "none";

+            }

+            enum 0 {

+                description "none";

+            }

+        }

+        description "This enumeration defines the allowed values for the message period in on-demand measurements.

+            Notes:

+            The value 10ms is only used in synthetic loss measurements.

+            The value 0 means that the value is not relevant.";

+    }

+    typedef oam-pdu-generation-type {

+        type enumeration {

+            enum SINGLE_INSTANCE {

+                description "none";

+            }

+            enum REPETITIVE_INSTANCE {

+                description "none";

+            }

+            enum SINGLE_SERIES {

+                description "none";

+            }

+            enum REPETITIVE_SERIES {

+                description "none";

+            }

+        }

+        description "This enumeration defines the generation pattern of the on-demand OAM PDUs (messages). ";

+    }

+    grouping on-demand-dm-performance-parameters {

+        leaf number-of-samples {

+            type uint64;

+            description "This attribute contains the number of received DM frames (successful samples) used for this frame delay measurement.

+                range of type : non-negative";

+        }

+        leaf-list frame-delay-list {

+            type uint64;

+            description "This attribute contains the frame delays measured in ns (nano second, 1x10e-9 seconds). The multiplicity is defined by the numberOfSamples attribute.";

+        }

+        leaf-list frame-delay-variation-list {

+            type uint64;

+            description "This attribute contains the frame delay variations measured in ns (nano second).  The multiplicity is defined by (numberOfSamples - 1, for numberOfSamples > 0).";

+        }

+        description "This data type contains the results of an on-demand delay measurement job.";

+    }

+    grouping on-demand-lm-performance-parameters {

+        leaf total-transmitted-frames {

+            type uint64;

+            description "This attribute contains the total number of frames transmitted.";

+        }

+        leaf total-lost-frames {

+            type uint64;

+            description "This attribute contains the total number of frames lost.";

+        }

+        leaf total-frame-loss-ratio {

+            type decimal64 {

+                fraction-digits 7;

+            }

+            description "This attribute contains the frame loss ratio (number of lost frames divided by the number of total frames (N_LF / N_TF)).

+                The accuracy of the value is for further study.";

+        }

+        description "This data type contains the results of an on-demand loss measurement job.";

+    }

+    grouping statistical-dm-performance-parameters {

+        leaf minimum-frame-delay {

+            type uint64;

+            description "This attribute contains the minimum frame delay observed over the monitored period. It is measured in units of ns (nano second, 1x10e-9 seconds).";

+        }

+        leaf average-frame-delay {

+            type uint64;

+            description "This attribute contains the average frame delay observed over the monitored period. It is measured in units of ns (nano second, 1x10e-9 seconds).";

+        }

+        leaf maximum-frame-delay {

+            type uint64;

+            description "This attribute contains the maximum frame delay observed over the monitored period. It is measured in units of ns (nano second, 1x10e-9 seconds).";

+        }

+        leaf minimum-frame-delay-variation {

+            type uint64;

+            description "This attribute contains the minimum frame delay variation measured in units of ns (nano second, 1x10e-9 seconds).";

+        }

+        leaf average-frame-delay-variation {

+            type uint64;

+            description "This attribute contains the average frame delay variation measured in units of ns (nano second, 1x10e-9 seconds).";

+        }

+        leaf maximum-frame-delay-variation {

+            type uint64;

+            description "This attribute contains the maximum frame delay variation measured in units of ns (nano second, 1x10e-9 seconds).";

+        }

+        description "This data type contains the statistical delay measurement performance parameters.";

+    }

+    grouping statistical-lm-performance-parameters {

+        leaf minimum-frame-loss-ratio {

+            type decimal64 {

+                fraction-digits 7;

+            }

+            description "This attribute contains the minimum frame loss ratio calculated over a period of time.

+                The accuracy of the value is for further study.";

+        }

+        leaf average-frame-loss-ratio {

+            type decimal64 {

+                fraction-digits 7;

+            }

+            description "This attribute contains the average frame loss ratio calculated over a period of time.

+                The accuracy of the value is for further study.";

+        }

+        leaf maximum-frame-loss-ratio {

+            type decimal64 {

+                fraction-digits 7;

+            }

+            description "This attribute contains the maximum frame loss ratio calculated over a period of time.

+                The accuracy of the value is for further study.";

+        }

+        leaf ses {

+            type uint64;

+            description "This attribute contains the SES detected in the monitoring interval.

+                range of type : 0..900 for 15min interval or 0..86400 for 24 hr interval.";

+        }

+        leaf uas {

+            type uint64;

+            description "This attribute contains UAS (unavailable seconds) detected in the monitoring interval.

+                range of type : 0..900 for 15min interval or 0..86400 for 24 hr interval.";

+        }

+        description "This data type contains the statistical loss measurement performance parameters.";

+    }

+    typedef eth-oam-job-type {

+        type identityref {

+            base ETH_OAM_JOB_TYPE;

+        }

+        description "none";

+    }

+    grouping link-trace-result {

+        leaf source-address {

+            type mac-address;

+            description "G.8052: This attribute contains the source MAC Address of an individual LTR frame result.";

+        }

+        leaf time-to-live {

+            type uint64;

+            description "G.8052: This attribute contains the Time To Live (TTL) value of an individual LTR frame result.";

+        }

+        leaf data-tlv-length {

+            type uint64;

+            description "G.8052: This attribute contains the length (in number of octets) of the Data TLV of an individual LTR frame result.";

+        }

+        description "G.8052: This data type contains the result from an individual LTR frame.";

+    }

+

+}

diff --git a/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-notification@2020-06-16.yang b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-notification@2020-06-16.yang
new file mode 100644
index 0000000..058692f
--- /dev/null
+++ b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-notification@2020-06-16.yang
@@ -0,0 +1,634 @@
+module tapi-notification {

+    namespace "urn:onf:otcc:yang:tapi-notification";

+    prefix tapi-notification;

+    import tapi-common {

+        prefix tapi-common;

+    }

+    organization "ONF OTCC (Open Transport Configuration & Control) Project";

+    contact "

+         Project Web: <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OTCC/TAPI__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G39KDEbL$ >

+         Project List: <mailto:transport-api@opennetworking.org>

+         Editor: Karthik Sethuraman <mailto:karthik.sethuraman@necam.com>

+         Andrea Mazzini <mailto:andrea.mazzini@nokia.com>

+         Arturo Mayoral <mailto:arturo.mayoral@telefonica.com>

+         Nigel Davis <mailto:ndavis@ciena.com>";

+    description "

+        This module contains TAPI Notification Model definitions.

+        Source: TapiNotification.uml

+        - The TAPI YANG models included in this TAPI release are a *normative* part of the TAPI SDK.

+        - The YANG specifications have been generated from the corresponding UML model using the [ONF EAGLE UML2YANG mapping tool]

+          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G4QHf0bG$ >

+          and further edited manually to comply with the [ONF IISOMI UML2YANG mapping guidelines]

+          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8IIivez$ >

+        - Status of YANG model artifacts can be determined by referring to the corresponding UML artifacts.

+          As described in the UML models, some artifacts are considered *experimental*, and thus the corresponding YANG artifacts.

+        - The ONF TAPI release process does not guarantee backward compatibility of YANG models across major versions of TAPI releases.

+          The YANG model backward compatibility criteria are outlined in section 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G3bKxRf2$ >.

+          YANG models included in this release may not be backward compatible with previous TAPI releases.

+        Copyright (c) 2018 Open Networking Foundation (ONF). All rights reserved.

+        License: This module is distributed under the Apache License 2.0";

+    revision 2020-06-16 {

+        description "ONF Transport API version 2.1.3.

+                   - Added DEVICE to ObjectType.

+                   Changes included in this TAPI release (v2.1.3) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop_v2_1/CHANGE_LOG/change-log.2.1.3.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7tqhxFK$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7KeAhLL$ >";

+    }

+    revision 2019-07-16 {

+        description "ONF Transport API version 2.1.2.

+                   Changes included in this TAPI release (v2.1.2) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop_v2_1/CHANGE_LOG/change-log.2.1.2.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7eDS6-t$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7KeAhLL$ >";

+    }

+    revision 2018-12-10 {

+        description "ONF Transport API version 2.1.1.

+                   Changes included in this TAPI release (v2.1.1) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.1.1.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G1ftwU5J$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7KeAhLL$ >";

+    }

+    revision 2018-10-16 {

+        description "ONF Transport API version 2.1.0.

+                   Changes included in this TAPI release (v2.1.0) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.1.0.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G-5JStw4$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7KeAhLL$ >";

+    }

+    revision 2018-03-07 {

+        description "ONF Transport API version 2.0.2

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.2.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G1Yf4AAN$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.2/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G27-pJK_$ >";

+    }

+    revision 2018-02-16 {

+        description "ONF Transport API version 2.0.1

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.1.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8RnGvXg$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.1/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6Gy6YoeAv$ >";

+    }

+    revision 2018-01-02 {

+        description "ONF Transport API version 2.0.0

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.0.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6GyqYDgG_$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.0/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G1V9Thk9$ >";

+    }

+    augment "/tapi-common:context" {

+        container notification-context {

+            uses notification-context;

+            description "Augments the base TAPI Context with NotificationService information";

+        }

+        description "Augments the base TAPI Context with NotificationService information";

+    }

+    /**************************

+    * package object-classes

+    **************************/ 

+    grouping notification-subscription-service {

+        list notification {

+            key 'uuid';

+            config false;

+            uses notification;

+            description "none";

+        }

+        container notification-channel {

+            config false;

+            uses notification-channel;

+            description "none";

+        }

+        container subscription-filter {

+            uses subscription-filter;

+            description "none";

+        }

+        leaf subscription-state {

+            type subscription-state;

+            description "none";

+        }

+        leaf-list supported-notification-types {

+            type notification-type;

+            config false;

+            min-elements 1;

+            description "none";

+        }

+        leaf-list supported-object-types {

+            type object-type;

+            config false;

+            min-elements 1;

+            description "none";

+        }

+        uses tapi-common:service-spec;

+        description "none";

+    }

+    grouping subscription-filter {

+        leaf-list requested-notification-types {

+            type notification-type;

+            description "none";

+        }

+        leaf-list requested-object-types {

+            type object-type;

+            description "none";

+        }

+        leaf-list requested-layer-protocols {

+            type tapi-common:layer-protocol-name;

+            description "none";

+        }

+        leaf-list requested-object-identifier {

+            type tapi-common:uuid;

+            description "none";

+        }

+        leaf include-content {

+            type boolean;

+            description "Indicates whether the published Notification includes content or just the Notification Id (which enables retrieval of the notification at the later stage)";

+        }

+        uses tapi-common:local-class;

+        description "none";

+    }

+    notification notification {

+        uses notification;

+        description "none";

+    }

+    grouping notification {

+        leaf notification-type {

+            type notification-type;

+            description "none";

+        }

+        leaf target-object-type {

+            type object-type;

+            description "none";

+        }

+        leaf target-object-identifier {

+            type tapi-common:uuid;

+            description "none";

+        }

+        list target-object-name {

+            key 'value-name';

+            min-elements 1;

+            uses tapi-common:name-and-value;

+            description "none";

+        }

+        leaf event-time-stamp {

+            type tapi-common:date-and-time;

+            description "none";

+        }

+        leaf sequence-number {

+            type uint64;

+            config false;

+            description "A monotonous increasing sequence number associated with the notification.

+                The exact semantics of how this sequence number is assigned (per channel or subscription or source or system) is left undefined.";

+        }

+        leaf source-indicator {

+            type source-indicator;

+            description "none";

+        }

+        leaf layer-protocol-name {

+            type tapi-common:layer-protocol-name;

+            description "none";

+        }

+        list changed-attributes {

+            key 'value-name';

+            uses name-and-value-change;

+            description "none";

+        }

+        list additional-info {

+            key 'value-name';

+            uses tapi-common:name-and-value;

+            description "none";

+        }

+        leaf additional-text {

+            type string;

+            description "none";

+        }

+        container tca-info {

+            uses tca-info;

+            description "none";

+        }

+        container alarm-info {

+            uses alarm-info;

+            description "none";

+        }

+        uses tapi-common:resource-spec;

+        description "none";

+    }

+    grouping notification-channel {

+        leaf stream-address {

+            type string;

+            config false;

+            description "The address/location/URI of the channel/stream to which the subscribed notifications are published.

+                This specifics of this is typically dependent on the implementation protocol & mechanism and hence is typed as a string.";

+        }

+        leaf next-sequence-no {

+            type uint64;

+            config false;

+            description "The sequence number of the next notification that will be published on the channel";

+        }

+        uses tapi-common:local-class;

+        description "none";

+    }

+    grouping notification-context {

+        list notif-subscription {

+            key 'uuid';

+            uses notification-subscription-service;

+            description "none";

+        }

+        list notification {

+            key 'uuid';

+            config false;

+            uses notification;

+            description "none";

+        }

+        description "none";

+    }

+    grouping alarm-info {

+        leaf is-transient {

+            type boolean;

+            config false;

+            description "none";

+        }

+        leaf perceived-severity {

+            type perceived-severity-type;

+            config false;

+            description "none";

+        }

+        leaf probable-cause {

+            type string;

+            config false;

+            description "none";

+        }

+        leaf service-affecting {

+            type service-affecting;

+            description "none";

+        }

+        description "none";

+    }

+    grouping tca-info {

+        leaf is-transient {

+            type boolean;

+            config false;

+            description "none";

+        }

+        leaf threshold-crossing {

+            type threshold-crossing-type;

+            description "none";

+        }

+        leaf threshold-parameter {

+            type string;

+            config false;

+            description "none";

+        }

+        leaf threshold-value {

+            type uint64;

+            config false;

+            description "none";

+        }

+        leaf perceived-severity {

+            type perceived-tca-severity;

+            description "none";

+        }

+        leaf measurement-interval {

+            type tapi-common:date-and-time;

+            description "none";

+        }

+        leaf suspect-interval-flag {

+            type boolean;

+            description "none";

+        }

+        description "none";

+    }

+

+    /**************************

+    * package type-definitions

+    **************************/ 

+    grouping name-and-value-change {

+        leaf value-name {

+            type string;

+            description "The name of the value. The value need not have a name.";

+        }

+        leaf old-value {

+            type string;

+            description "The value";

+        }

+        leaf new-value {

+            type string;

+            description "The value";

+        }

+        description "A scoped name-value triple, including old value and new value";

+    }

+    typedef notification-type {

+        type enumeration {

+            enum OBJECT_CREATION {

+                description "Not a normal state. The system is unable to determine the correct value.";

+            }

+            enum OBJECT_DELETION {

+                description "none";

+            }

+            enum ATTRIBUTE_VALUE_CHANGE {

+                description "none";

+            }

+            enum ALARM_EVENT {

+                description "none";

+            }

+            enum THRESHOLD_CROSSING_ALERT {

+                description "none";

+            }

+        }

+        description "List of supported Notifications types.";

+    }

+    typedef object-type {

+        type enumeration {

+            enum TOPOLOGY {

+                description "none";

+            }

+            enum NODE {

+                description "none";

+            }

+            enum LINK {

+                description "none";

+            }

+            enum CONNECTION {

+                description "none";

+            }

+            enum PATH {

+                description "none";

+            }

+            enum CONNECTIVITY_SERVICE {

+                description "none";

+            }

+            enum VIRTUAL_NETWORK_SERVICE {

+                description "none";

+            }

+            enum PATH_COMPUTATION_SERVICE {

+                description "none";

+            }

+            enum NODE_EDGE_POINT {

+                description "none";

+            }

+            enum SERVICE_INTERFACE_POINT {

+                description "none";

+            }

+            enum CONNECTION_END_POINT {

+                description "none";

+            }

+            enum MAINTENANCE_ENTITY_GROUP {

+                description "none";

+            }

+            enum MAINTENANCE_ENTITY {

+                description "none";

+            }

+            enum MEG_END_POINT {

+                description "none";

+            }

+            enum MEG_INTERMEDIATE_POINT {

+                description "none";

+            }

+            enum SWITCH_CONTROL {

+                description "none";

+            }

+            enum SWITCH {

+                description "none";

+            }

+            enum ROUTE {

+                description "none";

+            }

+            enum NODE_RULE_GROUP {

+                description "none";

+            }

+            enum INTER_RULE_GROUP {

+                description "none";

+            }

+            enum RULE {

+                description "none";

+            }

+            enum OAM_JOB {

+                description "none";

+            }

+            enum ACCESS_PORT {

+                description "none";

+            }

+            enum EQUIPMENT {

+                description "none";

+            }

+            enum HOLDER {

+                description "none";

+            }

+            enum PHYSICAL_SPAN {

+                description "none";

+            }

+            enum ABSTRACT_STRAND {

+                description "none";

+            }

+            enum DEVICE {

+                description "none";

+            }

+        }

+        description "The list of TAPI Global Object Class types on which Notifications can be raised.";

+    }

+    typedef source-indicator {

+        type enumeration {

+            enum RESOURCE_OPERATION {

+                description "none";

+            }

+            enum MANAGEMENT_OPERATION {

+                description "none";

+            }

+            enum UNKNOWN {

+                description "none";

+            }

+        }

+        description "none";

+    }

+    typedef subscription-state {

+        type enumeration {

+            enum SUSPENDED {

+                description "none";

+            }

+            enum ACTIVE {

+                description "none";

+            }

+        }

+        description "none";

+    }

+    typedef perceived-severity-type {

+        type enumeration {

+            enum CRITICAL {

+                description "none";

+            }

+            enum MAJOR {

+                description "none";

+            }

+            enum MINOR {

+                description "none";

+            }

+            enum WARNING {

+                description "none";

+            }

+            enum CLEARED {

+                description "none";

+            }

+        }

+        description "none";

+    }

+    typedef threshold-crossing-type {

+        type enumeration {

+            enum THRESHOLD_ABOVE {

+                description "none";

+            }

+            enum THRESHOLD_BELOW {

+                description "none";

+            }

+            enum CLEARED {

+                description "none";

+            }

+        }

+        description "none";

+    }

+    typedef service-affecting {

+        type enumeration {

+            enum SERVICE_AFFECTING {

+                description "none";

+            }

+            enum NOT_SERVICE_AFFECTING {

+                description "none";

+            }

+            enum UNKNOWN {

+                description "none";

+            }

+        }

+        description "none";

+    }

+    typedef perceived-tca-severity {

+        type enumeration {

+            enum WARNING {

+                description "none";

+            }

+            enum CLEAR {

+                description "none";

+            }

+        }

+        description "none";

+    }

+

+    /**************************

+    * package interfaces

+    **************************/ 

+    rpc get-supported-notification-types {

+        description "none";

+        output {

+            leaf-list supported-notification-types {

+                type notification-type;

+                min-elements 1;

+                description "none";

+            }

+            leaf-list supported-object-types {

+                type object-type;

+                min-elements 1;

+                description "none";

+            }

+        }

+    }

+    rpc create-notification-subscription-service {

+        description "none";

+        input {

+            container subscription-filter {

+                uses subscription-filter;

+                description "none";

+            }

+            leaf subscription-state {

+                type subscription-state;

+                description "none";

+            }

+        }

+        output {

+            container subscription-service {

+                uses notification-subscription-service;

+                description "none";

+            }

+        }

+    }

+    rpc update-notification-subscription-service {

+        description "none";

+        input {

+            leaf subscription-id-or-name {

+                type string;

+                description "none";

+            }

+            container subscription-filter {

+                uses subscription-filter;

+                description "none";

+            }

+            leaf subscription-state {

+                type subscription-state;

+                description "none";

+            }

+        }

+        output {

+            container subscription-service {

+                uses notification-subscription-service;

+                description "none";

+            }

+        }

+    }

+    rpc delete-notification-subscription-service {

+        description "none";

+        input {

+            leaf subscription-id-or-name {

+                type string;

+                description "none";

+            }

+        }

+        output {

+            container subscription-service {

+                uses notification-subscription-service;

+                description "none";

+            }

+        }

+    }

+    rpc get-notification-subscription-service-details {

+        description "none";

+        input {

+            leaf subscription-id-or-name {

+                type string;

+                description "none";

+            }

+        }

+        output {

+            container subscription-service {

+                uses notification-subscription-service;

+                description "none";

+            }

+        }

+    }

+    rpc get-notification-subscription-service-list {

+        description "none";

+        output {

+            list subscription-service {

+                key 'uuid';

+                uses notification-subscription-service;

+                description "none";

+            }

+        }

+    }

+    rpc get-notification-list {

+        description "none";

+        input {

+            leaf subscription-id-or-name {

+                type string;

+                description "none";

+            }

+            leaf time-period {

+                type string;

+                description "none";

+            }

+        }

+        output {

+            list notification {

+                key 'uuid';

+                uses notification;

+                description "none";

+            }

+        }

+    }

+

+}

diff --git a/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-oam@2020-04-23.yang b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-oam@2020-04-23.yang
new file mode 100644
index 0000000..bb445d3
--- /dev/null
+++ b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-oam@2020-04-23.yang
@@ -0,0 +1,842 @@
+module tapi-oam {

+    namespace "urn:onf:otcc:yang:tapi-oam";

+    prefix tapi-oam;

+    import tapi-common {

+        prefix tapi-common;

+    }

+    import tapi-connectivity {

+        prefix tapi-connectivity;

+    }

+    import tapi-topology {

+        prefix tapi-topology;

+    }

+    organization "ONF OTCC (Open Transport Configuration & Control) Project";

+    contact "

+         Project Web: <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OTCC/TAPI__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G39KDEbL$ >

+         Project List: <mailto:transport-api@opennetworking.org>

+         Editor: Karthik Sethuraman <mailto:karthik.sethuraman@necam.com>

+         Andrea Mazzini <mailto:andrea.mazzini@nokia.com>

+         Arturo Mayoral <mailto:arturo.mayoral@telefonica.com>

+         Nigel Davis <mailto:ndavis@ciena.com>";

+    description "

+        This module contains TAPI OAM Model definitions.

+        Source: TapiOam.uml

+        - The TAPI YANG models included in this TAPI release are a *normative* part of the TAPI SDK.

+        - The YANG specifications have been generated from the corresponding UML model using the [ONF EAGLE UML2YANG mapping tool]

+          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G4QHf0bG$ >

+          and further edited manually to comply with the [ONF IISOMI UML2YANG mapping guidelines]

+          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8IIivez$ >

+        - Status of YANG model artifacts can be determined by referring to the corresponding UML artifacts.

+          As described in the UML models, some artifacts are considered *experimental*, and thus the corresponding YANG artifacts.

+        - The ONF TAPI release process does not guarantee backward compatibility of YANG models across major versions of TAPI releases.

+          The YANG model backward compatibility criteria are outlined in section 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G3bKxRf2$ >.

+          YANG models included in this release may not be backward compatible with previous TAPI releases.

+        Copyright (c) 2018 Open Networking Foundation (ONF). All rights reserved.

+        License: This module is distributed under the Apache License 2.0";

+    revision 2020-04-23 {

+        description "ONF Transport API version 2.1.3.

+                   Changes included in this TAPI release (v2.1.3) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop_v2_1/CHANGE_LOG/change-log.2.1.3.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7tqhxFK$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7KeAhLL$ >";

+    }

+    revision 2019-07-16 {

+        description "ONF Transport API version 2.1.2.

+                   Changes included in this TAPI release (v2.1.2) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop_v2_1/CHANGE_LOG/change-log.2.1.2.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7eDS6-t$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7KeAhLL$ >";

+    }

+    revision 2018-12-10 {

+        description "ONF Transport API version 2.1.1.

+                   Changes included in this TAPI release (v2.1.1) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.1.1.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G1ftwU5J$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7KeAhLL$ >";

+    }

+    revision 2018-10-16 {

+        description "ONF Transport API version 2.1.0.

+                   Changes included in this TAPI release (v2.1.0) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.1.0.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G-5JStw4$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7KeAhLL$ >";

+    }

+    revision 2018-03-07 {

+        description "ONF Transport API version 2.0.2

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.2.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G1Yf4AAN$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.2/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G27-pJK_$ >";

+    }

+    revision 2018-02-16 {

+        description "ONF Transport API version 2.0.1

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.1.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8RnGvXg$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.1/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6Gy6YoeAv$ >";

+    }

+    revision 2018-01-02 {

+        description "ONF Transport API version 2.0.0

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.0.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6GyqYDgG_$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.0/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G1V9Thk9$ >";

+    }

+    augment "/tapi-common:context" {

+        container oam-context {

+            uses oam-context;

+            description "Augments the base TAPI Context with OamService information";

+        }

+        description "Augments the base TAPI Context with OamService information";

+    }

+    augment "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-connectivity:cep-list/tapi-connectivity:connection-end-point" {

+        container mep-mip-list {

+            uses mep-mip-list;

+            description "none";

+        }

+        description "none";

+    }

+

+   /**************************

+    * definitions of references

+    **************************/

+    grouping oam-service-ref {

+        leaf oam-service-uuid {

+            type leafref {

+                path '/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-service/tapi-oam:uuid';

+            }

+            description "none";

+        }

+        description "none";

+    }

+    grouping oam-service-end-point-ref {

+        uses oam-service-ref;

+        leaf oam-service-end-point-local-id {

+            type leafref {

+                path '/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-service/tapi-oam:end-point/tapi-oam:local-id';

+            }

+            description "none";

+        }

+        description "none";

+    }

+    grouping meg-ref {

+        leaf meg-uuid {

+            type leafref {

+                path '/tapi-common:context/tapi-oam:oam-context/tapi-oam:meg/tapi-oam:uuid';

+            }

+            description "none";

+        }

+        description "none";

+    }

+    grouping maintenance-entity-ref {

+        uses meg-ref;

+        leaf maintenance-entity-local-id {

+            type leafref {

+                path '/tapi-common:context/tapi-oam:oam-context/tapi-oam:meg/tapi-oam:me/tapi-oam:local-id';

+            }

+            description "none";

+        }

+        description "none";

+    }

+    grouping mep-ref {

+        uses meg-ref;

+        leaf mep-local-id {

+            type leafref {

+                path '/tapi-common:context/tapi-oam:oam-context/tapi-oam:meg/tapi-oam:mep/tapi-oam:local-id';

+            }

+            description "none";

+        }

+        description "none";

+    }

+    grouping mip-ref {

+        uses meg-ref;

+        leaf mip-local-id {

+            type leafref {

+                path '/tapi-common:context/tapi-oam:oam-context/tapi-oam:meg/tapi-oam:mip/tapi-oam:local-id';

+            }

+            description "none";

+        }

+        description "none";

+    }

+    grouping oam-job-ref {

+        leaf oam-job-uuid {

+            type leafref {

+                path '/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-job/tapi-oam:uuid';

+            }

+            description "none";

+        }

+        description "none";

+    }

+    grouping pm-current-data-ref {

+        uses oam-job-ref;

+        leaf pm-current-data-local-id {

+            type leafref {

+                path '/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-job/tapi-oam:pm-current-data/tapi-oam:local-id';

+            }

+            description "none";

+        }

+        description "none";

+    }

+    grouping pm-history-data-ref {

+        uses pm-current-data-ref;

+        leaf pm-history-data-local-id {

+            type leafref {

+                path '/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-job/tapi-oam:pm-current-data/tapi-oam:pm-history-data/tapi-oam:local-id';

+            }

+            description "none";

+        }

+        description "none";

+    }

+    grouping oam-profile-ref {

+        leaf oam-profile-uuid {

+            type leafref {

+                path '/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-profile/tapi-oam:uuid';

+            }

+            description "none";

+        }

+        description "none";

+    }

+    grouping pm-threshold-data-ref {

+        uses oam-profile-ref;

+        leaf pm-threshold-data-local-id {

+            type leafref {

+                path '/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-profile/tapi-oam:pm-threshold-data/tapi-oam:local-id';

+            }

+            description "none";

+        }

+        description "none";

+    }

+    grouping pm-bin-data-ref {

+        uses oam-profile-ref;

+        leaf pm-bin-data-local-id {

+            type leafref {

+                path '/tapi-common:context/tapi-oam:oam-context/tapi-oam:oam-profile/tapi-oam:pm-bin-data/tapi-oam:local-id';

+            }

+            description "none";

+        }

+        description "none";

+    }

+

+   /**************************

+    * package object-classes

+    **************************/

+    grouping mep {

+        leaf layer-protocol-name {

+            type tapi-common:layer-protocol-name;

+            config false;

+            description "none";

+        }

+        leaf direction {

+            type tapi-common:termination-direction;

+            config false;

+            description "none";

+        }

+        leaf mep-identifier {

+            type string;

+            config false;

+            description "none";

+        }

+        leaf-list peer-mep-identifier {

+            type string;

+            config false;

+            min-elements 1;

+            description "none";

+        }

+        uses tapi-common:local-class;

+        uses tapi-common:operational-state-pac;

+        description "none";

+    }

+    grouping oam-job {

+        list oam-service-end-point {

+            uses oam-service-end-point-ref;

+            key 'oam-service-uuid oam-service-end-point-local-id';

+            min-elements 1;

+            description "none";

+        }

+        container oam-profile {

+            uses oam-profile-ref;

+            description "none";

+        }

+        list pm-current-data {

+            key 'local-id';

+            config false;

+            uses pm-current-data;

+            description "Granularity period of the CurrentData identifies the specific CurrentData instance in the scope of this OamJob.

+                For example, typically at least

+                one 15min and

+                one 24hr;

+                optionally one additional configurable (< 15min)";

+        }

+        leaf oam-job-type {

+            type oam-job-type;

+            description "none";

+        }

+        container schedule {

+            uses tapi-common:time-range;

+            description "none";

+        }

+        leaf creation-time {

+            type tapi-common:date-and-time;

+            config false;

+            description "none";

+        }

+        uses tapi-common:global-class;

+        uses tapi-common:admin-state-pac;

+        description "none";

+    }

+    grouping meg {

+        list mep {

+            key 'local-id';

+            config false;

+            uses mep;

+            description "1. ME may have 0 MEPs (case of transit domains where at least 1 MIP is present)

+                2. ME may have 1 MEP (case of edge domaind, where the peer MEP is ouside the managed domain)

+                3. ME may have 2 MEPs";

+        }

+        list mip {

+            key 'local-id';

+            config false;

+            uses mip;

+            description "ME may 0, 1, or more MIPs";

+        }

+        leaf layer-protocol-name {

+            type tapi-common:layer-protocol-name;

+            config false;

+            description "none";

+        }

+        leaf direction {

+            type tapi-common:forwarding-direction;

+            config false;

+            description "none";

+        }

+        leaf meg-level {

+            type uint64;

+            config false;

+            description "none";

+        }

+        leaf meg-identifier {

+            type string;

+            config false;

+            description "none";

+        }

+        uses tapi-common:resource-spec;

+        uses tapi-common:operational-state-pac;

+        description "none";

+    }

+    grouping mip {

+        leaf layer-protocol-name {

+            type tapi-common:layer-protocol-name;

+            config false;

+            description "none";

+        }

+        uses tapi-common:local-class;

+        description "none";

+    }

+    grouping oam-service {

+        list end-point {

+            key 'local-id';

+            min-elements 2;

+            uses oam-service-end-point;

+            description "none";

+        }

+        container meg {

+            uses meg-ref;

+            config false;

+            description "none";

+        }

+        container oam-profile {

+            uses oam-profile-ref;

+            description "none";

+        }

+        uses tapi-common:service-spec;

+        uses tapi-common:admin-state-pac;

+        uses oam-constraint;

+        description "none";

+    }

+    grouping oam-context {

+        list oam-service {

+            key 'uuid';

+            uses oam-service;

+            description "none";

+        }

+        list meg {

+            key 'uuid';

+            config false;

+            uses meg;

+            description "none";

+        }

+        list oam-job {

+            key 'uuid';

+            uses oam-job;

+            description "none";

+        }

+        list oam-profile {

+            key 'uuid';

+            uses oam-profile;

+            description "none";

+        }

+        description "none";

+    }

+    grouping oam-service-end-point {

+        container service-interface-point {

+            uses tapi-common:service-interface-point-ref;

+            description "none";

+        }

+        container connectivity-service-end-point {

+            uses tapi-connectivity:connectivity-service-end-point-ref;

+            description "none";

+        }

+        container mep {

+            uses mep-ref;

+            config false;

+            description "none";

+        }

+        container mip {

+            uses mip-ref;

+            config false;

+            description "none";

+        }

+        leaf layer-protocol-name {

+            type tapi-common:layer-protocol-name;

+            description "none";

+        }

+        leaf direction {

+            type tapi-common:port-direction;

+            description "none";

+        }

+        leaf mep-identifier {

+            type string;

+            description "This attribute contains the identifier of the MEP.

+                This attribute is empty in case the OSEP relates to the provisioing of an MIP.

+                ";

+        }

+        leaf-list peer-mep-identifier {

+            type string;

+            description "This attribute models the MI_PeerMEP_ID[i] defined in G.8021 and configured as specified in G.8051. It provides the identifiers of the MEPs which are peer to the subject MEP.

+                This attribute is not specified in case the OSEP relates to the provisioing of an MIP.

+                In case of P2P, there is only one peer";

+        }

+        uses tapi-common:local-class;

+        uses tapi-common:admin-state-pac;

+        description "none";

+    }

+    grouping mep-mip-list {

+        list mip {

+            uses mip-ref;

+            key 'meg-uuid mip-local-id';

+            description "none";

+        }

+        list mep {

+            uses mep-ref;

+            key 'meg-uuid mep-local-id';

+            description "none";

+        }

+        description "none";

+    }

+    grouping oam-constraint {

+        leaf layer-protocol-name {

+            type tapi-common:layer-protocol-name;

+            description "none";

+        }

+        leaf direction {

+            type tapi-common:forwarding-direction;

+            description "none";

+        }

+        leaf meg-level {

+            type uint64;

+            description "none";

+        }

+        description "none";

+    }

+    grouping pm-current-data {

+        list pm-history-data {

+            key 'local-id';

+            config false;

+            uses pm-history-data;

+            description "in case of 24hr Current Data, at least 1 History Data.

+                In case of 15min Current Data, at least 16 History Data.

+                In case of <15min, the number of History Data shall be able to cover a span of 4 hours.";

+        }

+        container granularity-period {

+            uses tapi-common:time-period;

+            description "none";

+        }

+        leaf timestamp {

+            type tapi-common:date-and-time;

+            config false;

+            description "This attribute indicates the start of the current monitoring interval.

+                The value is bound to the quarter of an hour in case of a 15 minute interval and bound to the hour in case of a 24 hour interval.";

+        }

+        container elapsed-time {

+            uses tapi-common:time-interval;

+            description "none";

+        }

+        leaf suspect-interval-flag {

+            type boolean;

+            description "This attribute is used to indicate that the performance data for the current period may not be reliable. Some reasons for this to occur are:

+                - Suspect data were detected by the actual resource doing data collection.

+                - Transition of the administrativeState attribute to/from the 'lock' state.

+                - Transition of the operationalState to/from the 'disabled' state.

+                - Scheduler setting that inhibits the collection function.

+                - The performance counters were reset during the interval.

+                - The currentData (or subclass) object instance was created during the monitoring period.";

+        }

+        uses tapi-common:local-class;

+        description "none";

+    }

+    grouping pm-history-data {

+        container granularity-period {

+            uses tapi-common:time-period;

+            description "none";

+        }

+        leaf period-end-time {

+            type tapi-common:date-and-time;

+            description "none";

+        }

+        leaf suspect-interval-flag {

+            type boolean;

+            config false;

+            description "This attribute indicates that the performance data may not be reliable.";

+        }

+        uses tapi-common:local-class;

+        description "none";

+    }

+    grouping oam-profile {

+        list pm-threshold-data {

+            key 'local-id';

+            min-elements 1;

+            uses pm-threshold-data;

+            description "none";

+        }

+        list pm-bin-data {

+            key 'local-id';

+            min-elements 1;

+            uses pm-bin-data;

+            description "none";

+        }

+        uses tapi-common:global-class;

+        description "none";

+    }

+    grouping pm-threshold-data {

+        container granularity-period {

+            uses tapi-common:time-period;

+            description "none";

+        }

+        leaf is-transient {

+            type boolean;

+            description "none";

+        }

+        uses tapi-common:local-class;

+        description "none";

+    }

+    grouping pm-bin-data {

+        container granularity-period {

+            uses tapi-common:time-period;

+            description "none";

+        }

+        uses tapi-common:local-class;

+        description "none";

+    }

+

+   /**************************

+    * package type-definitions

+    **************************/

+    identity OAM_JOB_TYPE {

+        description "none";

+    }

+    typedef oam-job-type {

+        type identityref {

+            base OAM_JOB_TYPE;

+        }

+        description "none";

+    }

+

+   /**************************

+    * package interfaces

+    **************************/

+    rpc create-oam-service {

+        description "none";

+        input {

+            list end-point {

+                key 'local-id';

+                min-elements 2;

+                uses oam-service-end-point;

+                description "none";

+            }

+            container oam-constraint {

+                uses oam-constraint;

+                description "none";

+            }

+            leaf state {

+                type string;

+                description "none";

+            }

+        }

+        output {

+            container service {

+                uses oam-service;

+                description "none";

+            }

+        }

+    }

+    rpc delete-oam-service {

+        description "none";

+        input {

+            leaf service-id {

+                type string;

+                description "none";

+            }

+        }

+    }

+    rpc get-oam-service {

+        description "none";

+        input {

+            leaf service-id {

+                type string;

+                description "none";

+            }

+        }

+        output {

+            container service {

+                uses oam-service;

+                description "none";

+            }

+        }

+    }

+    rpc create-oam-job {

+        description "none";

+        input {

+            leaf oam-job-type {

+                type oam-job-type;

+                description "none";

+            }

+            list oam-service-end-point {

+                key 'local-id';

+                min-elements 2;

+                uses oam-service-end-point;

+                description "none";

+            }

+            container oam-profile {

+                uses oam-profile;

+                description "none";

+            }

+            leaf state {

+                type string;

+                description "none";

+            }

+            leaf schedule {

+                type string;

+                description "none";

+            }

+        }

+        output {

+            container oam-job {

+                uses oam-job;

+                description "none";

+            }

+        }

+    }

+    rpc get-oam-job {

+        description "none";

+        input {

+            leaf job-id {

+                type string;

+                description "none";

+            }

+        }

+        output {

+            container oam-job {

+                uses oam-job;

+                description "none";

+            }

+        }

+    }

+    rpc get-oam-service-list {

+        description "none";

+        output {

+            list service {

+                key 'uuid';

+                uses oam-service;

+                description "none";

+            }

+        }

+    }

+    rpc get-meg {

+        description "none";

+        input {

+            leaf service-id {

+                type string;

+                description "none";

+            }

+        }

+        output {

+            container meg {

+                uses meg;

+                description "none";

+            }

+        }

+    }

+    rpc update-oam-service {

+        description "none";

+        input {

+            leaf service-id {

+                type string;

+                description "none";

+            }

+            list end-point {

+                key 'local-id';

+                uses oam-service-end-point;

+                description "none";

+            }

+            container oam-constraint {

+                uses oam-constraint;

+                description "none";

+            }

+            leaf state {

+                type string;

+                description "none";

+            }

+        }

+        output {

+            container service {

+                uses oam-service;

+                description "none";

+            }

+        }

+    }

+    rpc delete-oam-job {

+        description "none";

+        input {

+            leaf job-id {

+                type string;

+                description "none";

+            }

+        }

+    }

+    rpc update-oam-job {

+        description "none";

+        input {

+            leaf job-id {

+                type string;

+                description "none";

+            }

+            container oam-profile {

+                uses oam-profile;

+                description "none";

+            }

+            leaf state {

+                type string;

+                description "none";

+            }

+            leaf schedule {

+                type string;

+                description "none";

+            }

+        }

+        output {

+            container oam-job {

+                uses oam-job;

+                description "none";

+            }

+        }

+    }

+    rpc create-oam-service-end-point {

+        description "none";

+        input {

+            leaf service-id {

+                type string;

+                description "none";

+            }

+            leaf sip-id {

+                type string;

+                description "none";

+            }

+            leaf c-sep-id {

+                type string;

+                description "none";

+            }

+            leaf layer {

+                type string;

+                description "none";

+            }

+            leaf direction {

+                type string;

+                description "none";

+            }

+            leaf state {

+                type string;

+                description "none";

+            }

+            leaf mep-identifier {

+                type string;

+                description "none";

+            }

+            leaf-list peer-mep-identifier {

+                type string;

+                description "none";

+            }

+        }

+        output {

+            container end-point {

+                uses oam-service-end-point;

+                description "none";

+            }

+        }

+    }

+    rpc delete-oam-service-end-point {

+        description "none";

+        input {

+            leaf service-id {

+                type string;

+                description "none";

+            }

+            leaf o-sep-id {

+                type string;

+                description "none";

+            }

+        }

+    }

+    rpc update-oam-service-end-point {

+        description "none";

+        input {

+            leaf service-id {

+                type string;

+                description "none";

+            }

+            leaf o-sep-id {

+                type string;

+                description "none";

+            }

+            leaf state {

+                type string;

+                description "none";

+            }

+        }

+        output {

+            container end-point {

+                uses oam-service-end-point;

+                description "none";

+            }

+        }

+    }

+    rpc get-oam-service-end-point {

+        description "none";

+        input {

+            leaf service-id {

+                type string;

+                description "none";

+            }

+            leaf o-sep-id {

+                type string;

+                description "none";

+            }

+        }

+        output {

+            container end-point {

+                uses oam-service-end-point;

+                description "none";

+            }

+        }

+    }

+

+}

diff --git a/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-odu@2020-04-23.yang b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-odu@2020-04-23.yang
new file mode 100644
index 0000000..9674de4
--- /dev/null
+++ b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-odu@2020-04-23.yang
@@ -0,0 +1,878 @@
+module tapi-odu {

+    namespace "urn:onf:otcc:yang:tapi-odu";

+    prefix tapi-odu;

+    import tapi-common {

+        prefix tapi-common;

+    }

+    import tapi-connectivity {

+        prefix tapi-connectivity;

+    }

+    import tapi-topology {

+        prefix tapi-topology;

+    }

+    import tapi-oam {

+        prefix tapi-oam;

+    }

+    import tapi-dsr {

+        prefix tapi-dsr;

+    }

+    organization "ONF OTCC (Open Transport Configuration & Control) Project";

+    contact "

+         Project Web: <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OTCC/TAPI__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G39KDEbL$ >

+         Project List: <mailto:transport-api@opennetworking.org>

+         Editor: Karthik Sethuraman <mailto:karthik.sethuraman@necam.com>

+         Andrea Mazzini <mailto:andrea.mazzini@nokia.com>

+         Arturo Mayoral <mailto:arturo.mayoral@telefonica.com>

+         Nigel Davis <mailto:ndavis@ciena.com>";

+    description "

+        This module contains TAPI ODU Model definitions.

+        Source: TapiOdu.uml

+        - The TAPI YANG models included in this TAPI release are a *normative* part of the TAPI SDK.

+        - The YANG specifications have been generated from the corresponding UML model using the [ONF EAGLE UML2YANG mapping tool]

+          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G4QHf0bG$ >

+          and further edited manually to comply with the [ONF IISOMI UML2YANG mapping guidelines]

+          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8IIivez$ >

+        - Status of YANG model artifacts can be determined by referring to the corresponding UML artifacts.

+          As described in the UML models, some artifacts are considered *experimental*, and thus the corresponding YANG artifacts.

+        - The ONF TAPI release process does not guarantee backward compatibility of YANG models across major versions of TAPI releases.

+          The YANG model backward compatibility criteria are outlined in section 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G3bKxRf2$ >.

+          YANG models included in this release may not be backward compatible with previous TAPI releases.

+        Copyright (c) 2018 Open Networking Foundation (ONF). All rights reserved.

+        License: This module is distributed under the Apache License 2.0";

+    revision 2020-04-23 {

+        description "ONF Transport API version 2.1.3.

+                   Changes included in this TAPI release (v2.1.3) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop_v2_1/CHANGE_LOG/change-log.2.1.3.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7tqhxFK$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7KeAhLL$ >";

+    }

+    revision 2019-07-16 {

+        description "ONF Transport API version 2.1.2.

+                   Changes included in this TAPI release (v2.1.2) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop_v2_1/CHANGE_LOG/change-log.2.1.2.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7eDS6-t$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7KeAhLL$ >";

+    }

+    revision 2018-12-10 {

+        description "ONF Transport API version 2.1.1.

+                   Changes included in this TAPI release (v2.1.1) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.1.1.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G1ftwU5J$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7KeAhLL$ >";

+    }

+    revision 2018-10-16 {

+        description "ONF Transport API version 2.1.0.

+                   Changes included in this TAPI release (v2.1.0) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.1.0.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G-5JStw4$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7KeAhLL$ >";

+    }

+    revision 2018-03-07 {

+        description "ONF Transport API version 2.0.2

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.2.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G1Yf4AAN$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.2/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G27-pJK_$ >";

+    }

+    revision 2018-02-16 {

+        description "ONF Transport API version 2.0.1

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.1.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8RnGvXg$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.1/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6Gy6YoeAv$ >";

+    }

+    revision 2018-01-02 {

+        description "ONF Transport API version 2.0.0

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.0.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6GyqYDgG_$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.0/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G1V9Thk9$ >";

+    }

+    augment "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point" {

+        container odu-node-edge-point-spec {

+            uses odu-node-edge-point-spec;

+            description "Augments the base LayerProtocol information in NodeEdgePoint with ODU-specific information";

+        }

+        description "Augments the base LayerProtocol information in NodeEdgePoint with ODU-specific information";

+    }

+    augment "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-connectivity:cep-list/tapi-connectivity:connection-end-point" {

+        container odu-connection-end-point-spec {

+            uses odu-connection-end-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:meg/tapi-oam:mep" {

+        container odu-connection-end-point-spec {

+            uses odu-connection-end-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-oam:oam-context/tapi-oam:meg/tapi-oam:mip" {

+        container odu-mip-spec {

+            uses odu-mip-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:end-point" {

+        container odu-connectivity-service-end-point-spec {

+            uses odu-connectivity-service-end-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    /**************************

+    * package object-classes

+    **************************/ 

+    grouping odu-termination-and-client-adaptation-pac {

+        leaf opu-tributary-slot-size {

+            type odu-slot-size;

+            config false;

+            description "This attribute is applicable for ODU2 and ODU3 CTP only. It indicates the slot size of the ODU CTP.";

+        }

+        leaf auto-payload-type {

+            type boolean;

+            config false;

+            description "This attribute is applicable when the ODU CTP object instance represents a lower order ODU CTP Source at the client layer of the ODUP/ODUj-21 adaptation function. The value of true of this attribute configures that the adaptation source function shall fall back to the payload type PT=20 if the conditions specified in 14.3.10.1/G.798 are satisfied. ";

+        }

+        leaf configured-client-type {

+            type tapi-dsr:digital-signal-type;

+            config false;

+            description "This attribute configures the type of the client CTP of the server ODU TTP.";

+        }

+        leaf configured-mapping-type {

+            type mapping-type;

+            config false;

+            description "This attributes indicates the configured mapping type.";

+        }

+        container accepted-payload-type {

+            config false;

+            uses odu-payload-type;

+            description "This attribute is applicable when the ODU CTP object instance represents a lower order ODU CTP Sink at the client layer of the ODUP/ODU[i]j or ODUP/ODUj-21 adaptation function. 

+                This attribute is a 2-digit Hex code that indicates the new accepted payload type.

+                Valid values are defined in Table 15-8 of ITU-T Recommendation G.709 with one additional value UN_INTERPRETABLE.";

+        }

+        container fec-parameters {

+            config false;

+            uses fec-properties;

+            description "none";

+        }

+        leaf-list odu-cn-effective-time-slot-list {

+            type uint64;

+            description "This attribute contains a set of distinct (i.e. unique) integers (e.g. 2, 3, 5, 9, 15, 34 representing the tributary slots TS#1.2, TS#1.3, TS#1.5, TS#1.9, TS#1.15, and TS#2.14)

+                which represents the list of effective time slots which are available for carrying ODUk clients.

+                Each entry in the list is an integer value (P) representing the time slot name TS#A.B (see ITU-T Recommendation G.709 (v5) Clause 20.1).

+                The mapping between P and A & B is: A = [P/20] + 1; B = P - (P/20]*20; where the sqaure bracket represents the whole integer.";

+        }

+        description "This Pac contains the attributes associated with the client adaptation function of the server layer TTP

+            It is present only if the CEP contains a TTP";

+    }

+    grouping odu-connection-end-point-spec {

+        container odu-common {

+            uses odu-common-pac;

+            description "none";

+        }

+        container odu-term-and-adapter {

+            config false;

+            uses odu-termination-and-client-adaptation-pac;

+            description "none";

+        }

+        container odu-ctp {

+            config false;

+            uses odu-ctp-pac;

+            description "none";

+        }

+        container odu-protection {

+            config false;

+            uses odu-protection-pac;

+            description "none";

+        }

+        description "none";

+    }

+    grouping odu-pool-pac {

+        leaf client-capacity {

+            type uint64;

+            description "none";

+        }

+        leaf max-client-instances {

+            type uint64;

+            config false;

+            description "none";

+        }

+        leaf max-client-size {

+            type uint64;

+            config false;

+            description "none";

+        }

+        description "none";

+    }

+    grouping odu-node-edge-point-spec {

+        container odu-pool {

+            config false;

+            uses odu-pool-pac;

+            description "none";

+        }

+        description "none";

+    }

+    grouping odu-ctp-pac {

+        leaf-list tributary-slot-list {

+            type uint64;

+            config false;

+            description "ITU-T G.875 (v5)

+                This attribute contains a set of distinct (i.e. unique) integers (e.g. 2, 3, 5, 9, 15 representing the tributary slots TS#2, TS#3, TS#5, TS#9 and TS#15) which represents the resources occupied by the ODUk CTP (e.g. an ODUflex with a bit rate of 6.25G setup over an HO-ODUk).

+                This attribute applies when the ODUk CTP is carried by a sever layer ODU TTP object. It will not apply if this ODUk CTP object is directly carried by an OTUk TTP object (i.e. OTUk has no tributary slots).

+                The upper bound of the integer allowed in this set and its relationship with the tributary slots are a function of the ODU server layer to which the ODUk CTP is carried over.

+                In case the ODU server layer is an HO-ODUk, each entry in the list is an integer value (i) representing the tributary slot name TS#i and the upper bound is the maximum number of tributary slots within the HO-ODUk (see ITU-T Recommendation G.709 (v5) clause 19).

+                Thus, for example, M=8/32/80 for ODU2/ODU3/ODU4 server layers (respectively) using 1.25G slot size.

+                In case the ODU server layer is an ODUCn, each entry in the list is an integer value (P) representing the time slot name TS#A.B (e.g. 2, 3, 5, 9, 15, 34 representing the tributary slots TS#1.2, TS#1.3, TS#1.5, TS#1.9, TS#1.15, and TS#2.14) and the upper und is 20*n (see ITU-T Recommendation G.709 (v5) Clause 20.1).

+                The mapping between P and A & B is: A = [P/20] + 1; B = P - (P/20]*20; where the square bracket represents the whole integer. Note that the value of this attribute can be changed only in the case of ODUflex and has to be through specific operations (i.e. not be changing the attribute tributarySlotList directly).";

+        }

+        leaf tributary-port-number {

+            type uint64;

+            config false;

+            description "This attribute identifies the tributary port number that is associated with the ODUk CTP. This attribute applies when the ODUk CTP is multiplexed into a server layer ODU TTP object.

+                It will not apply if this ODUk CTP object is directly mapped into an OTUk TTP object (i.e. OTUk has no tributary slots).

+                The upper bound of the integer allowed in this set is a function of the ODU server layer into which the ODUk CTP is multiplexed.

+                In case the ODU server layer is an HO-ODUk, the upper bound is the maximum number of tributary slots within the HO-ODUk (see ITU-T Recommendation G.709 (v5) clause 19.4.1).

+                Thus, for example, M=8/32/80 for ODU2/ODU3/ODU4 server layers (respectively) using 1.25G slot size.

+                In case the ODU server layer is an ODUCn, the upper bound is M=10*n (see ITU-T Recommendation G.709 (v5) Clause 20.4.1).

+                range of type : The value range depends on the size of the Tributary Port Number (TPN) field used which depends on th server-layer ODU or OTU.

+                In case of ODUk mapping into OTUk, there is no TPN field, so the tributaryPortNumber shall be zero.

+                In case of LO ODUj mapping over ODU1, ODU2 or ODU3, the TPN is encoded in a 6-bit field so the value range is 0-63. See clause 14.4.1/G.709-2016.

+                In case of LO ODUj mapping over ODU4, the TPN is encoded in a 7-bit field so the value range is 0-127. See clause 14.4.1.4/G.709-2016.

+                In case of ODUk mapping over ODUCn, the TPN is encoded in a 14-bit field so the value range is 0-16383. See clause 20.4.1.1/G.709-2016.

+                ";

+        }

+        leaf accepted-msi {

+            type string;

+            config false;

+            description "This attribute is applicable when the ODU CTP object instance represents a lower order ODU1 or ODU2 CTP Sink at the client layer of the ODU3P/ODU12 adaptation function or represents a lower order ODUj CTP Sink at the client layer of the ODUP/ODUj-21 adaptation function. This attribute is a 1-byte field that represents the accepted multiplex structure of the adaptation function. ";

+        }

+        description "This Pac contains the attributes associated with the CTP

+            It is present only if the CEP contains a CTP";

+    }

+    grouping odu-mep-spec {

+        container odu-mep {

+            uses odu-mep-pac;

+            description "none";

+        }

+        container odu-ncm {

+            config false;

+            uses odu-ncm-pac;

+            description "none";

+        }

+        container odu-tcm {

+            config false;

+            uses odu-tcm-mep-pac;

+            description "none";

+        }

+        container odu-defect {

+            uses odu-defect-pac;

+            description "none";

+        }

+        container odu-pm {

+            uses odu-pm-pac;

+            description "none";

+        }

+        description "none";

+    }

+    grouping odu-protection-pac {

+        leaf aps-enable {

+            type boolean;

+            default "true";

+            description "This attribute is for enabling/disabling the automatic protection switching (APS) capability at the transport adaptation function that is represented by the ODU_ConnectionTerminationPoint object class. It triggers the MI_APS_EN signal to the transport adaptation function.";

+        }

+        leaf aps-level {

+            type uint64;

+            description "This attribute is for configuring the automatic protection switching (APS) level that should operate at the transport adaptation function that is represented by the ODU_ConnectionTerminationPoint object class. It triggers the MI_APS_LVL signal to the transport adaptation function. The value 0 means path and the values 1 through 6 mean TCM level 1 through 6 respectively.";

+        }

+        description "none";

+    }

+    grouping odu-ncm-pac {

+        leaf-list tcm-fields-in-use {

+            type uint64;

+            config false;

+            description "This attribute indicates the used TCM fields of the ODU OH.";

+        }

+        description "none";

+    }

+    grouping odu-tcm-mep-pac {

+        leaf tcm-extension {

+            type tcm-extension;

+            description "none";

+        }

+        leaf tcm-mode {

+            type tcm-mode;

+            description "This attribute specifies the TCM mode at the entity. Valid values are: Operational, Monitor, and Transparent.";

+        }

+        leaf codirectional {

+            type boolean;

+            config false;

+            description "This attribute specifies the directionality of the ODUT MEP with respect to the associated ODU CEP. The value of TRUE means that the sink part of the ODUT MEP terminates the same signal direction as the sink part of the ODU CEP. The Source part behaves similarly. This attribute is meaningful only on objects instantiated under ODU CEP, and at least one among ODU CEP and the subordinate object is bidirectional.";

+        }

+        leaf ac-status-source {

+            type tcm-status;

+            config false;

+            description "This attribute indicates the status of the accepted TCM. ";

+        }

+        leaf ac-status-sink {

+            type tcm-status;

+            config false;

+            description "This attribute indicates the status of the accepted TCM. ";

+        }

+        leaf admin-state-source {

+            type tapi-common:administrative-state;

+            description "This attribute provides the capability to provision the LOCK signal at the source, which is one of the ODU maintenance signals.  When a Tandem Connection endpoint is set to admin state locked, it will insert the ODU-LCK signal in the source direction.";

+        }

+        leaf admin-state-sink {

+            type tapi-common:administrative-state;

+            description "This attribute provides the capability to provision the LOCK signal at the sink, which is one of the ODU maintenance signals. When a Tandem Connection endpoint is set to admin state locked, it will insert the ODU-LCK signal in the downstream direction.";

+        }

+        uses odu-tcm-mip-pac;

+        description "none";

+    }

+    grouping odu-mip-spec {

+        container odu-mip {

+            config false;

+            uses odu-mip-pac;

+            description "none";

+        }

+        container odu-ncm {

+            config false;

+            uses odu-ncm-pac;

+            description "none";

+        }

+        container odu-tcm {

+            config false;

+            uses odu-tcm-mip-pac;

+            description "none";

+        }

+        container odu-pm {

+            uses odu-pm-pac;

+            description "none";

+        }

+        container odu-defect {

+            uses odu-defect-pac;

+            description "none";

+        }

+        description "none";

+    }

+    grouping odu-mip-pac {

+        leaf acti {

+            type string;

+            config false;

+            description "The Trail Trace Identifier (TTI) information recovered (Accepted) from the TTI overhead position at the sink of a trail.";

+        }

+        leaf ex-dapi {

+            type string;

+            description "The Expected Destination Access Point Identifier (ExDAPI), provisioned by the managing system, to be compared with the TTI accepted at the overhead position of the sink for the purpose of checking the integrity of connectivity.";

+        }

+        leaf ex-sapi {

+            type string;

+            description "The Expected Source Access Point Identifier (ExSAPI), provisioned by the managing system, to be compared with the TTI accepted at the overhead position of the sink for the purpose of checking the integrity of connectivity.

+                ";

+        }

+        leaf tim-act-disabled {

+            type boolean;

+            default "true";

+            description "This attribute provides the control capability for the managing system to enable or disable the Consequent Action function when detecting Trace Identifier Mismatch (TIM) at the trail termination sink.";

+        }

+        leaf tim-det-mode {

+            type tim-det-mo;

+            description "This attribute indicates the mode of the Trace Identifier Mismatch (TIM) Detection function allowed values: OFF, SAPIonly, DAPIonly, SAPIandDAPI";

+        }

+        leaf deg-m {

+            type uint64;

+            description "This attribute indicates the threshold level for declaring a Degraded Signal defect (dDEG). A dDEG shall be declared if DegM consecutive bad PM Seconds are detected.";

+        }

+        container deg-thr {

+            uses deg-thr;

+            description "This attribute indicates the threshold level for declaring a performance monitoring (PM) Second to be bad. The value of the threshold can be provisioned in terms of number of errored blocks or in terms of percentage of errored blocks. For percentage-based specification, in order to support provision of less than 1%, the specification consists of two fields. The first field indicates the granularity of percentage. For examples, in 1%, in 0.1%, or in 0.01%, etc. The second field indicates the multiple of the granularity. For number of errored block based, the value is a positive integer.";

+        }

+        description "none";

+    }

+    grouping odu-tcm-mip-pac {

+        leaf tcm-field {

+            type uint64;

+            config false;

+            description "This attribute indicates the tandem connection monitoring field of the ODU OH.";

+        }

+        description "none";

+    }

+    grouping odu-mep-pac {

+        leaf dm-source {

+            type boolean;

+            description "This attribute is for configuring the delay measurement process at the trail termination function represented by the subject TTP object class. It models the MI_DM_Source MI signal. If MI_DM_Source is false, then the value of the DMp bit is determined by the RI_DM. If MI_DM_Source is true, then the value of the DMp bit is set to MI_DMValue.";

+        }

+        leaf dm-value {

+            type boolean;

+            description "This attribute is for setting the DMp and DMti bits of the delay measurement process. The value of 'true' sets the DMp and DMti bits to 0 and the value of 'false' to 1.";

+        }

+        leaf txti {

+            type string;

+            description "The Trail Trace Identifier (TTI) information, provisioned by the managing system at the termination source, to be placed in the TTI overhead position of the source of a trail for transmission.

+                ";

+        }

+        uses odu-mip-pac;

+        description "none";

+    }

+    grouping odu-common-pac {

+        leaf odu-type {

+            type odu-type;

+            config false;

+            description "This attribute specifies the type of the ODU termination point.";

+        }

+        leaf odu-rate {

+            type uint64;

+            config false;

+            description "This attribute indicates the rate of the ODU termination point in Kbits/s. 

+                This attribute is Set at create; i.e., once created it cannot be changed directly. 

+                In case of resizable ODU flex, its value can be changed via HAO (not directly on the attribute). 

+                This attribute indicates the rate of the ODU termination point.

+                Valid values shall be consistent with the oduType configuration as shown in Table 7-2/G.709 v5.

+                Setting this value for fixed-rate ODUk types (e.g., ODU0), is optional.

+                The default value is derived from the configured oduType, as defined in Table 7-2/G.709 v5.

+                Setting this value for ODUCn type is optional. The default value is derived from the configured n of the ODUCn as defined in Table 7-2/G.709 v5.";

+        }

+        leaf odu-rate-tolerance {

+            type uint64;

+            config false;

+            description "This attribute indicates the rate tolerance of the ODU termination point. 

+                Valid values are real value in the unit of ppm. 

+                Standardized values are defined in Table 7-2/G.709.";

+        }

+        leaf number-of-odu-c {

+            type uint64;

+            default "1";

+            description "This attribute specifies the number of ODUC instances of the ODUCn.";

+        }

+        description "none";

+    }

+    grouping odu-pm-pac {

+        leaf n-bbe {

+            type uint64;

+            description "Near-end Background Block Error";

+        }

+        leaf f-bbe {

+            type uint64;

+            config false;

+            description "Far-end Background Block Error";

+        }

+        leaf n-ses {

+            type uint64;

+            description "Near-end Severely Errored Second";

+        }

+        leaf f-ses {

+            type uint64;

+            description "Far-end Severely Errored Second";

+        }

+        container uas {

+            uses uas-choice;

+            description "UnAvailable Second";

+        }

+        description "Instance of this object class contains the ODUP layer-specific Current Data. This object class is a subclass of the OTN_CurrentData object class.

+            PM data attributes: fBbe, fSes, nBbe, nSes. uas";

+    }

+    grouping odu-defect-pac {

+        leaf bdi {

+            type boolean;

+            config false;

+            description "Backward Defect Indication";

+        }

+        leaf deg {

+            type boolean;

+            config false;

+            description "Signal Degraded";

+        }

+        leaf lck {

+            type boolean;

+            config false;

+            description "Locked";

+        }

+        leaf oci {

+            type boolean;

+            config false;

+            description "Open Connection Indicator";

+        }

+        leaf ssf {

+            type boolean;

+            config false;

+            description "Server Signal Failure";

+        }

+        leaf tim {

+            type boolean;

+            config false;

+            description "Trail Trace Identifier Mismatch";

+        }

+        description "The valid list of defects raised on the entity. If the value of any attribute is true, then the corresponding defect is raised.";

+    }

+    grouping odu-connectivity-service-end-point-spec {

+        container odu-csep-ctp-pac {

+            uses odu-csep-ctp-pac;

+            description "none";

+        }

+        container odu-csep-ttp-pac {

+            uses odu-csep-ttp-pac;

+            description "none";

+        }

+        container odu-csep-common-pac {

+            uses odu-csep-common-pac;

+            description "none";

+        }

+        description "none";

+    }

+    grouping odu-csep-ctp-pac {

+        leaf tributary-port-number {

+            type uint64;

+            description "This attribute identifies the tributary port number that is associated with the ODUk CTP. This attribute applies when the ODUk CTP is multiplexed into a server layer ODU TTP object.

+                It will not apply if this ODUk CTP object is directly mapped into an OTUk TTP object (i.e. OTUk has no tributary slots).

+                The upper bound of the integer allowed in this set is a function of the ODU server layer into which the ODUk CTP is multiplexed.

+                In case the ODU server layer is an HO-ODUk, the upper bound is the maximum number of tributary slots within the HO-ODUk (see ITU-T Recommendation G.709 (v5) clause 19.4.1).

+                Thus, for example, M=8/32/80 for ODU2/ODU3/ODU4 server layers (respectively) using 1.25G slot size.

+                In case the ODU server layer is an ODUCn, the upper bound is M=10*n (see ITU-T Recommendation G.709 (v5) Clause 20.4.1).

+                range of type : The value range depends on the size of the Tributary Port Number (TPN) field used which depends on th server-layer ODU or OTU.

+                In case of ODUk mapping into OTUk, there is no TPN field, so the tributaryPortNumber shall be zero.

+                In case of LO ODUj mapping over ODU1, ODU2 or ODU3, the TPN is encoded in a 6-bit field so the value range is 0-63. See clause 14.4.1/G.709-2016.

+                In case of LO ODUj mapping over ODU4, the TPN is encoded in a 7-bit field so the value range is 0-127. See clause 14.4.1.4/G.709-2016.

+                In case of ODUk mapping over ODUCn, the TPN is encoded in a 14-bit field so the value range is 0-16383. See clause 20.4.1.1/G.709-2016.

+                ";

+        }

+        leaf-list tributary-slot-list {

+            type uint64;

+            description "ITU-T G.875 (v5)

+                This attribute contains a set of distinct (i.e. unique) integers (e.g. 2, 3, 5, 9, 15 representing the tributary slots TS#2, TS#3, TS#5, TS#9 and TS#15) which represents the resources occupied by the ODUk CTP (e.g. an ODUflex with a bit rate of 6.25G setup over an HO-ODUk).

+                This attribute applies when the ODUk CTP is carried by a sever layer ODU TTP object. It will not apply if this ODUk CTP object is directly carried by an OTUk TTP object (i.e. OTUk has no tributary slots).

+                The upper bound of the integer allowed in this set and its relationship with the tributary slots are a function of the ODU server layer to which the ODUk CTP is carried over.

+                In case the ODU server layer is an HO-ODUk, each entry in the list is an integer value (i) representing the tributary slot name TS#i and the upper bound is the maximum number of tributary slots within the HO-ODUk (see ITU-T Recommendation G.709 (v5) clause 19).

+                Thus, for example, M=8/32/80 for ODU2/ODU3/ODU4 server layers (respectively) using 1.25G slot size.

+                In case the ODU server layer is an ODUCn, each entry in the list is an integer value (P) representing the time slot name TS#A.B (e.g. 2, 3, 5, 9, 15, 34 representing the tributary slots TS#1.2, TS#1.3, TS#1.5, TS#1.9, TS#1.15, and TS#2.14) and the upper und is 20*n (see ITU-T Recommendation G.709 (v5) Clause 20.1).

+                The mapping between P and A & B is: A = [P/20] + 1; B = P - (P/20]*20; where the square bracket represents the whole integer. Note that the value of this attribute can be changed only in the case of ODUflex and has to be through specific operations (i.e. not be changing the attribute tributarySlotList directly).";

+        }

+        description "none";

+    }

+    grouping odu-csep-ttp-pac {

+        leaf configured-mapping-type {

+            type mapping-type;

+            description "This attributes indicates the configured mapping type.";

+        }

+        leaf configured-client-type {

+            type tapi-dsr:digital-signal-type;

+            config false;

+            description "This attribute configures the type of the client CTP of the server ODU TTP.";

+        }

+        description "none";

+    }

+    grouping odu-csep-common-pac {

+        leaf odu-type {

+            type odu-type;

+            description "This attribute specifies the type of the ODU termination point.";

+        }

+        leaf odu-rate {

+            type uint64;

+            description "This attribute indicates the rate of the ODU termination point in Kbits/s. 

+                This attribute is Set at create; i.e., once created it cannot be changed directly. 

+                In case of resizable ODU flex, its value can be changed via HAO (not directly on the attribute). 

+                This attribute indicates the rate of the ODU termination point.

+                Valid values shall be consistent with the oduType configuration as shown in Table 7-2/G.709 v5.

+                Setting this value for fixed-rate ODUk types (e.g., ODU0), is optional.

+                The default value is derived from the configured oduType, as defined in Table 7-2/G.709 v5.

+                Setting this value for ODUCn type is optional. The default value is derived from the configured n of the ODUCn as defined in Table 7-2/G.709 v5.";

+        }

+        leaf opu-tributary-slot-size {

+            type odu-slot-size;

+            description "This attribute is applicable for ODU2 and ODU3 CTP only. It indicates the slot size of the ODU CTP.";

+        }

+        leaf number-of-odu-c {

+            type uint64;

+            default "1";

+            description "This attribute specifies the number of ODUC instances of the ODUCn.";

+        }

+        description "none";

+    }

+

+    /**************************

+    * package type-definitions

+    **************************/ 

+    identity ODU_TYPE {

+        base tapi-common:LAYER_PROTOCOL_QUALIFIER;

+        description "none";

+    }

+    identity ODU_TYPE_ODU0 {

+        base ODU_TYPE;

+        description "none";

+    }

+    identity ODU_TYPE_ODU1 {

+        base ODU_TYPE;

+        description "none";

+    }

+    identity ODU_TYPE_ODU2 {

+        base ODU_TYPE;

+        description "none";

+    }

+    identity ODU_TYPE_ODU2E {

+        base ODU_TYPE;

+        description "none";

+    }

+    identity ODU_TYPE_ODU3 {

+        base ODU_TYPE;

+        description "none";

+    }

+    identity ODU_TYPE_ODU4 {

+        base ODU_TYPE;

+        description "none";

+    }

+    identity ODU_TYPE_ODU_FLEX {

+        base ODU_TYPE;

+        description "none";

+    }

+    identity ODU_TYPE_ODU_CN {

+        base ODU_TYPE;

+        description "none";

+    }

+    typedef odu-type {

+        type identityref {

+            base ODU_TYPE;

+        }

+        description "none";

+    }

+    typedef mapping-type {

+        type enumeration {

+            enum AMP {

+                description "none";

+            }

+            enum BMP {

+                description "none";

+            }

+            enum GFP-F {

+                description "none";

+            }

+            enum GMP {

+                description "none";

+            }

+            enum TTP_GFP_BMP {

+                description "none";

+            }

+            enum NULL {

+                description "none";

+            }

+        }

+        description "none";

+    }

+    typedef tim-det-mo {

+        type enumeration {

+            enum DAPI {

+                description "none";

+            }

+            enum SAPI {

+                description "none";

+            }

+            enum BOTH {

+                description "none";

+            }

+            enum OFF {

+                description "none";

+            }

+        }

+        description "List of modes for trace identifier mismatch detection.";

+    }

+    typedef odu-slot-size {

+        type enumeration {

+            enum 1G25 {

+                description "none";

+            }

+            enum 2G5 {

+                description "none";

+            }

+        }

+        description "none";

+    }

+    grouping odu-payload-type {

+        leaf named-payload-type {

+            type odu-named-payload-type;

+            description "none";

+        }

+        leaf hex-payload-type {

+            type uint64;

+            description "none";

+        }

+        description "none";

+    }

+    typedef odu-named-payload-type {

+        type enumeration {

+            enum UNKNOWN {

+                description "none";

+            }

+            enum UNINTERPRETABLE {

+                description "none";

+            }

+        }

+        description "none";

+    }

+    grouping deg-thr {

+        leaf deg-thr-value {

+            type uint64;

+            description "Percentage of detected errored blocks";

+        }

+        leaf deg-thr-type {

+            type deg-thr-type;

+            description "Number of errored blocks";

+        }

+        leaf percentage-granularity {

+            type percentage-granularity;

+            description "none";

+        }

+        description "Degraded Threshold, specify either the percentage or the number of Errored Blocks in the defined interval. 

+            degThrValue when type is PERCENTAGE:

+            percentageGranularity is used to indicate the number of decimal points

+            So if percentageGranularity is ones, a value of 1 in degThrValue would indicate 1%, a value of 10 = 10%, a value of 100 = 100%

+            So if percentageGranularity is thousandths a value of 1 in degThrValue would indicate 0.001%, a value of 1000 = 1%, a value of 1000000 = 100%

+            degThrValue when type is NUMBER_ERROR_BLOCKS:

+            Number of Errored Blocks is captured in an integer value.";

+    }

+    typedef deg-thr-type {

+        type enumeration {

+            enum PERCENTAGE {

+                description "Choice of % or Number of errored blocks";

+            }

+            enum NUMBER_ERRORED_BLOCKS {

+                description "Number of % or blocks";

+            }

+        }

+        description "The value of the threshold can be provisioned in terms of number of errored blocks or in terms of percentage of errored blocks. For percentage-based specification, in order to support provision of less than 1%, the specification consists of two fields. The first field indicates the granularity of percentage. For examples, in 1%, in 0.1%, or in 0.01%, etc. The second field indicates the multiple of the granularity. For number of errored block based, the value is a positive integer.";

+    }

+    typedef tcm-status {

+        type enumeration {

+            enum NO_SOURCE_TC {

+                description "TCM byte 3 (bits 6 7 8) -- 0 0 0, No source Tandem Connection";

+            }

+            enum IN_USE_WITHOUT_IAE {

+                description "TCM byte 3 (bits 6 7 8) -- 0 0 1,  In use without IAE (Incoming Alignment Error)";

+            }

+            enum IN_USE_WITH_IAE {

+                description "TCM byte 3 (bits 6 7 8) -- 0 1 0, In use with IAE (Incoming Alignment Error)";

+            }

+            enum RESERVED_1 {

+                description "TCM byte 3 (bits 6 7 8) -- 0 1 1, Reserved for future international standardization";

+            }

+            enum RESERVED_2 {

+                description "TCM byte 3 (bits 6 7 8) -- 1 0 0, Reserved for future international standardization";

+            }

+            enum LCK {

+                description "TCM byte 3 (bits 6 7 8) -- 1 0 1, Maintenance signal: ODU-LCK";

+            }

+            enum OCI {

+                description "TCM byte 3 (bits 6 7 8) -- 1 1 0, Maintenance signal: ODU-OCI";

+            }

+            enum AIS {

+                description "TCM byte 3 (bits 6 7 8) -- 1 1 1, Maintenance signal: ODU-AIS";

+            }

+        }

+        description "See Table 15-5/G.709/Y.1331 ";

+    }

+    typedef tcm-mode {

+        type enumeration {

+            enum OPERATIONAL {

+                description "none";

+            }

+            enum TRANSPARENT {

+                description "none";

+            }

+            enum MONITOR {

+                description "none";

+            }

+        }

+        description "List of value modes for the sink side of the tandem connection monitoring function.";

+    }

+    typedef tcm-monitoring {

+        type enumeration {

+            enum INTRUSIVE {

+                description "none";

+            }

+            enum NON-INTRUSIVE {

+                description "none";

+            }

+        }

+        description "Monitoring types for the tandem connection monitoring function.";

+    }

+    typedef tcm-extension {

+        type enumeration {

+            enum NORMAL {

+                description "none";

+            }

+            enum PASS-THROUGH {

+                description "none";

+            }

+            enum ERASE {

+                description "none";

+            }

+        }

+        description "none";

+    }

+    typedef percentage-granularity {

+        type enumeration {

+            enum ONES {

+                description "none";

+            }

+            enum ONE_TENTHS {

+                description "value * (1/10)";

+            }

+            enum ONE_HUNDREDTHS {

+                description "value * (1/100)";

+            }

+            enum ONE_THOUSANDTHS {

+                description "value * (1/1000)";

+            }

+        }

+        description "none";

+    }

+    grouping uas-choice {

+        leaf bidirectional {

+            type boolean;

+            default "true";

+            description "none";

+        }

+        leaf uas {

+            type uint64;

+            description "none";

+        }

+        leaf nuas {

+            type uint64;

+            description "none";

+        }

+        leaf fuas {

+            type uint64;

+            description "none";

+        }

+        description "If bidirectional is TRUE then use the uas attribute, if bidirectional is FALSE use the nuas, and fuas attributes";

+    }

+    grouping fec-properties {

+        leaf pre-fec-ber {

+            type uint64;

+            description "counter: bit error rate before correction by FEC";

+        }

+        leaf post-fec-ber {

+            type uint64;

+            description "counter: bit error rate after correction by FEC";

+        }

+        leaf corrected-bytes {

+            type uint64;

+            description "Bytes corrected between those that were received corrupted";

+        }

+        leaf corrected-bits {

+            type uint64;

+            description "Bits corrected between those that were received corrupted";

+        }

+        leaf uncorrectable-bytes {

+            type uint64;

+            description "Bytes that could not be corrected by FEC";

+        }

+        leaf uncorrectable-bits {

+            type uint64;

+            description "Bits that could not be corrected by FEC";

+        }

+        description "none";

+    }

+

+}

diff --git a/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-path-computation@2020-04-23.yang b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-path-computation@2020-04-23.yang
new file mode 100644
index 0000000..62e48db
--- /dev/null
+++ b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-path-computation@2020-04-23.yang
@@ -0,0 +1,472 @@
+module tapi-path-computation {

+    namespace "urn:onf:otcc:yang:tapi-path-computation";

+    prefix tapi-path-computation;

+    import tapi-topology {

+        prefix tapi-topology;

+    }

+    import tapi-common {

+        prefix tapi-common;

+    }

+    organization "ONF OTCC (Open Transport Configuration & Control) Project";

+    contact "

+         Project Web: <https://wiki.opennetworking.org/display/OTCC/TAPI>

+         Project List: <mailto:transport-api@opennetworking.org>

+         Editor: Karthik Sethuraman <mailto:karthik.sethuraman@necam.com>

+         Andrea Mazzin <mailto:andrea.mazzini@nokia.com>

+         Arturo Mayoral <mailto:arturo.mayoral@telefonica.com>

+         Nigel Davis <mailto:ndavis@ciena.com>";

+    description "

+        This module contains TAPI Path Computation Model definitions.

+        Source: TapiPathComputation.uml

+        - The TAPI YANG models included in this TAPI release are a *normative* part of the TAPI SDK.

+        - The YANG specifications have been generated from the corresponding UML model using the [ONF EAGLE UML2YANG mapping tool]

+        <https://github.com/OpenNetworkingFoundation/EagleUmlYang>

+        and further edited manually to comply with the [ONF IISOMI UML2YANG mapping guidelines]

+        <https://wiki.opennetworking.org/display/OIMT/UML+-+YANG+Guidelines>

+        - Status of YANG model artifacts can be determined by referring to the corresponding UML artifacts.

+        As described in the UML models, some artifacts are considered *experimental*, and thus the corresponding YANG artifacts.

+        - The ONF TAPI release process does not guarantee backward compatibility of YANG models across major versions of TAPI releases.

+        The YANG model backward compatibility criteria are outlined in section 11 of <https://tools.ietf.org/html/rfc7950>.

+        YANG models included in this release may not be backward compatible with previous TAPI releases.

+        Copyright (c) 2018 Open Networking Foundation (ONF). All rights reserved.

+        License: This module is distributed under the Apache License 2.0.";

+    revision 2020-04-23 {

+        description "ONF Transport API version 2.1.3.

+                   Changes included in this TAPI release (v2.1.3) are listed in

+                   <https://github.com/OpenNetworkingFoundation/TAPI/blob/develop_v2_1/CHANGE_LOG/change-log.2.1.3.md>";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML>";

+    }

+    revision 2019-07-16 {

+        description "ONF Transport API version 2.1.2.

+                   Changes included in this TAPI release (v2.1.2) are listed in

+                   <https://github.com/OpenNetworkingFoundation/TAPI/blob/develop_v2_1/CHANGE_LOG/change-log.2.1.2.md>";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML>";

+    }

+    revision 2018-12-10 {

+        description "ONF Transport API version 2.1.1.

+                   Changes included in this TAPI release (v2.1.1) are listed in

+                   <https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.1.1.md>";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML>";

+    }

+    revision 2018-10-16 {

+        description "ONF Transport API version 2.1.0.

+                   Changes included in this TAPI release (v2.1.0) are listed in

+                   <https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.1.0.md>";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML>";

+    }

+    revision 2018-03-07 {

+        description "ONF Transport API version 2.0.2

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.2.md>";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.2/UML>";

+    }

+    revision 2018-02-16 {

+        description "ONF Transport API version 2.0.1

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.1.md>";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.1/UML>";

+    }

+    revision 2018-01-02 {

+        description "ONF Transport API version 2.0.0

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.0.md>";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.0/UML>";

+    }

+    augment "/tapi-common:context" {

+        container path-computation-context {

+            uses path-computation-context;

+            description "Augments the base TAPI Context with PathComputationService information";

+        }

+        description "Augments the base TAPI Context with PathComputationService information";

+    }

+   /**************************

+    * definitions of refrences

+    **************************/

+    grouping path-ref {

+        leaf path-uuid {

+            type leafref {

+                path '/tapi-common:context/tapi-path-computation:path-computation-context/tapi-path-computation:path/tapi-path-computation:uuid';

+            }

+            description "none";

+        }

+        description "none";

+    }

+

+   /**************************

+    * package object-classes

+    **************************/ 

+    grouping path {

+        list link {

+            uses tapi-topology:link-ref;

+            key 'topology-uuid link-uuid';

+            config false;

+            min-elements 1;

+            description "none";

+        }

+        container routing-constraint {

+            config false;

+            uses routing-constraint;

+            description "none";

+        }

+        leaf direction {

+            type tapi-common:forwarding-direction;

+            config false;

+            description "none";

+        }

+        leaf layer-protocol-name {

+            type tapi-common:layer-protocol-name;

+            config false;

+            description "none";

+        }

+        uses tapi-common:resource-spec;

+        description "Path is described by an ordered list of TE Links. A TE Link is defined by a pair of Node/NodeEdgePoint IDs. A Connection is realized by concatenating link resources (associated with a Link) and the lower-level connections (cross-connections) in the different nodes";

+    }

+    grouping path-service-end-point {

+        container service-interface-point {

+            uses tapi-common:service-interface-point-ref;

+            description "none";

+        }

+        leaf layer-protocol-name {

+            type tapi-common:layer-protocol-name;

+            description "none";

+        }

+        leaf layer-protocol-qualifier {

+            type tapi-common:layer-protocol-qualifier;

+            description "none";

+        }

+        container capacity {

+            uses tapi-common:capacity;

+            description "none";

+        }

+        leaf role {

+            type tapi-common:port-role;

+            description "Each EP of the FC has a role (e.g., working, protection, protected, symmetric, hub, spoke, leaf, root)  in the context of the FC with respect to the FC function. ";

+        }

+        leaf direction {

+            type tapi-common:port-direction;

+            description "The orientation of defined flow at the EndPoint.";

+        }

+        uses tapi-common:local-class;

+        description "The association of the FC to LTPs is made via EndPoints.

+            The EndPoint (EP) object class models the access to the FC function. 

+            The traffic forwarding between the associated EPs of the FC depends upon the type of FC and may be associated with FcSwitch object instances.  

+            In cases where there is resilience the EndPoint may convey the resilience role of the access to the FC. 

+            It can represent a protected (resilient/reliable) point or a protecting (unreliable working or protection) point.

+            The EP replaces the Protection Unit of a traditional protection model. 

+            The ForwadingConstruct can be considered as a component and the EndPoint as a Port on that component";

+    }

+    grouping path-computation-service {

+        list path {

+            uses path-ref;

+            key 'path-uuid';

+            config false;

+            min-elements 1;

+            description "none";

+        }

+        list end-point {

+            key 'local-id';

+            min-elements 2;

+            max-elements 2;

+            uses path-service-end-point;

+            description "none";

+        }

+        container routing-constraint {

+            uses routing-constraint;

+            description "none";

+        }

+        container topology-constraint {

+            uses topology-constraint;

+            description "none";

+        }

+        container objective-function {

+            uses path-objective-function;

+            description "none";

+        }

+        container optimization-constraint {

+            uses path-optimization-constraint;

+            description "none";

+        }

+        uses tapi-common:service-spec;

+        description "none";

+    }

+    grouping path-objective-function {

+        leaf bandwidth-optimization {

+            type tapi-common:directive-value;

+            description "none";

+        }

+        leaf concurrent-paths {

+            type tapi-common:directive-value;

+            description "none";

+        }

+        leaf cost-optimization {

+            type tapi-common:directive-value;

+            description "none";

+        }

+        leaf link-utilization {

+            type tapi-common:directive-value;

+            description "none";

+        }

+        leaf resource-sharing {

+            type tapi-common:directive-value;

+            description "none";

+        }

+        uses tapi-common:local-class;

+        description "none";

+    }

+    grouping path-optimization-constraint {

+        leaf traffic-interruption {

+            type tapi-common:directive-value;

+            description "none";

+        }

+        uses tapi-common:local-class;

+        description "none";

+    }

+    grouping routing-constraint {

+        list cost-characteristic {

+            key 'cost-name';

+            uses tapi-topology:cost-characteristic;

+            description "The list of costs where each cost relates to some aspect of the TopologicalEntity.";

+        }

+        list latency-characteristic {

+            key 'traffic-property-name';

+            uses tapi-topology:latency-characteristic;

+            description "The effect on the latency of a queuing process. This only has significant effect for packet based systems and has a complex characteristic.";

+        }

+        list risk-diversity-characteristic {

+            key 'risk-characteristic-name';

+            uses tapi-topology:risk-characteristic;

+            description "none";

+        }

+        leaf diversity-policy {

+            type diversity-policy;

+            description "none";

+        }

+        leaf route-objective-function {

+            type route-objective-function;

+            description "none";

+        }

+        leaf route-direction {

+            type tapi-common:forwarding-direction;

+            description "none";

+        }

+        leaf is-exclusive {

+            type boolean;

+            default "true";

+            description "To distinguish if the resources are to be exclusive to the service";

+        }

+        container max-allowed-cost {

+            uses value-or-priority;

+            description "none";

+        }

+        container max-allowed-hops {

+            uses value-or-priority;

+            description "none";

+        }

+        container max-allowed-delay {

+            uses value-or-priority;

+            description "Delay unit is microseconds.";

+        }

+        description "none";

+    }

+    grouping path-computation-context {

+        list path-comp-service {

+            key 'uuid';

+            uses path-computation-service;

+            description "none";

+        }

+        list path {

+            key 'uuid';

+            config false;

+            uses path;

+            description "none";

+        }

+        description "none";

+    }

+    grouping topology-constraint {

+        leaf-list include-topology {

+            type tapi-common:uuid;

+            description "none";

+        }

+        leaf-list avoid-topology {

+            type tapi-common:uuid;

+            description "none";

+        }

+        leaf-list include-path {

+            type tapi-common:uuid;

+            description "none";

+        }

+        leaf-list exclude-path {

+            type tapi-common:uuid;

+            description "none";

+        }

+        leaf-list include-link {

+            type tapi-common:uuid;

+            description "This is a loose constraint - that is it is unordered and could be a partial list ";

+        }

+        leaf-list exclude-link {

+            type tapi-common:uuid;

+            description "none";

+        }

+        leaf-list include-node {

+            type tapi-common:uuid;

+            description "This is a loose constraint - that is it is unordered and could be a partial list";

+        }

+        leaf-list exclude-node {

+            type tapi-common:uuid;

+            description "none";

+        }

+        leaf-list preferred-transport-layer {

+            type tapi-common:layer-protocol-name;

+            description "soft constraint requested by client to indicate the layer(s) of transport connection that it prefers to carry the service. This could be same as the service layer or one of the supported server layers";

+        }

+        description "The TopologyConstraint allows to specify topology entities in order to impose specific constraints (as denoted by the attribute name) on Connectivity/Path.

+            The  topology entities are specified by their instance uuid rather than using references/path (to allow for mapping to Yang 1.0).

+            This loose typing and reference necessitates that implementations validate not only the presence of the instance, but also that it is of the correct type as implied by the attribute name.

+            If this validation fails, then the implementation is expceted to return an error.";

+    }

+

+    /**************************

+    * package type-definitions

+    **************************/ 

+    typedef route-objective-function {

+        type enumeration {

+            enum MIN_WORK_ROUTE_HOP {

+                description "none";

+            }

+            enum MIN_WORK_ROUTE_COST {

+                description "none";

+            }

+            enum MIN_WORK_ROUTE_LATENCY {

+                description "none";

+            }

+            enum MIN_SUM_OF_WORK_AND_PROTECTION_ROUTE_HOP {

+                description "none";

+            }

+            enum MIN_SUM_OF_WORK_AND_PROTECTION_ROUTE_COST {

+                description "none";

+            }

+            enum MIN_SUM_OF_WORK_AND_PROTECTION_ROUTE_LATENCY {

+                description "none";

+            }

+            enum LOAD_BALANCE_MAX_UNUSED_CAPACITY {

+                description "none";

+            }

+        }

+        description "none";

+    }

+    typedef diversity-policy {

+        type enumeration {

+            enum SRLG {

+                description "none";

+            }

+            enum SRNG {

+                description "none";

+            }

+            enum SNG {

+                description "none";

+            }

+            enum NODE {

+                description "none";

+            }

+            enum LINK {

+                description "none";

+            }

+        }

+        description "none";

+    }

+    grouping value-or-priority {

+        leaf value {

+            type uint64;

+            description "none";

+        }

+        leaf priority {

+            type uint64;

+            description "none";

+        }

+        description "Quantitative target: when a value is specified it is intended as mandatory for fulfilment. If value is specified, priority is not considered.

+            Qualitative target: when priority is specified. Zero means 'unspecified', 1 is highest priority, then 2 has lower priory than 1, 3 has lower priory than 2, etc.";

+    }

+

+    /**************************

+    * package interfaces

+    **************************/ 

+    rpc compute-p-2-p-path {

+        description "none";

+        input {

+            list sep {

+                key 'local-id';

+                min-elements 2;

+                max-elements 2;

+                uses path-service-end-point;

+                description "none";

+            }

+            container routing-constraint {

+                uses routing-constraint;

+                description "none";

+            }

+            container topology-constraint {

+                uses topology-constraint;

+                description "none";

+            }

+            container objective-function {

+                uses path-objective-function;

+                description "none";

+            }

+        }

+        output {

+            container service {

+                uses path-computation-service;

+                description "none";

+            }

+        }

+    }

+    rpc optimize-p-2-ppath {

+        description "none";

+        input {

+            leaf path-id-or-name {

+                type string;

+                description "none";

+            }

+            container routing-constraint {

+                uses routing-constraint;

+                description "none";

+            }

+            container optimization-constraint {

+                uses path-optimization-constraint;

+                description "none";

+            }

+            container objective-function {

+                uses path-objective-function;

+                description "none";

+            }

+        }

+        output {

+            container service {

+                uses path-computation-service;

+                description "none";

+            }

+        }

+    }

+    rpc delete-p-2-p-path {

+        description "none";

+        input {

+            leaf path-id-or-name {

+                type string;

+                description "none";

+            }

+        }

+        output {

+            container service {

+                uses path-computation-service;

+                description "none";

+            }

+        }

+    }

+}

diff --git a/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-photonic-media@2020-06-16.yang b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-photonic-media@2020-06-16.yang
new file mode 100644
index 0000000..ca6ba8d
--- /dev/null
+++ b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-photonic-media@2020-06-16.yang
@@ -0,0 +1,1122 @@
+module tapi-photonic-media {

+    namespace "urn:onf:otcc:yang:tapi-photonic-media";

+    prefix tapi-photonic-media;

+    import tapi-common {

+        prefix tapi-common;

+    }

+    import tapi-connectivity {

+        prefix tapi-connectivity;

+    }

+    import tapi-topology {

+        prefix tapi-topology;

+    }

+    organization "ONF OTCC (Open Transport Configuration & Control) Project";

+    contact "

+         Project Web: <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OTCC/TAPI__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G39KDEbL$ >

+         Project List: <mailto:transport-api@opennetworking.org>

+         Editor: Karthik Sethuraman <mailto:karthik.sethuraman@necam.com>

+         Andrea Mazzini <mailto:andrea.mazzini@nokia.com>

+         Arturo Mayoral <mailto:arturo.mayoral@telefonica.com>

+         Nigel Davis <mailto:ndavis@ciena.com>";

+    description "

+        This module contains TAPI Photonic Media Model definitions.

+        Source: TapiPhotonicMedia.uml

+        - The TAPI YANG models included in this TAPI release are a *normative* part of the TAPI SDK.

+        - The YANG specifications have been generated from the corresponding UML model using the [ONF EAGLE UML2YANG mapping tool]

+          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G4QHf0bG$ >

+          and further edited manually to comply with the [ONF IISOMI UML2YANG mapping guidelines]

+          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8IIivez$ >

+        - Status of YANG model artifacts can be determined by referring to the corresponding UML artifacts.

+          As described in the UML models, some artifacts are considered *experimental*, and thus the corresponding YANG artifacts.

+        - The ONF TAPI release process does not guarantee backward compatibility of YANG models across major versions of TAPI releases.

+          The YANG model backward compatibility criteria are outlined in section 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G3bKxRf2$ >.

+          YANG models included in this release may not be backward compatible with previous TAPI releases.

+        Copyright (c) 2018 Open Networking Foundation (ONF). All rights reserved.

+        License: This module is distributed under the Apache License 2.0";

+    revision 2020-06-16 {

+        description "ONF Transport API version 2.1.3.

+                   - OtsiConnectivityServiceEndPointSpec class, deprecated

+                   - New OtsiAConnectivityServiceEndPointSpec, with numberOfOTSi property (integer).

+                   - OtsiCsepHasOtsiConfigPac association, move from 1-1 to 0-*, i.e. allowing more OtsiTerminationConfigPac instances per OTSi CSEP

+                     This allows to move from one OTSi CSEP instance per OTSi signal to one OTSi CSEP instance including the information related to

+                     + zero (full delegation),

+                     + 1 or more (constrained provisioning) OTSi signals.

+                   - OtsiTerminationConfigPac class, make all properties as optional (0..1)

+                     + This allows delegation or specification of selected properties

+                   - Similar modification for Media Channel: MediaChannelConnectivityServiceEndPointSpec deprecated

+                   - New MediaChannelAssemblyConnectivityServiceEndPointSpec, add capacity property.

+                   - SmcCsepHasMcConfigPac association, move from 1-1 to 1-*

+                   - MediaChannelConfigPac, set spectrum attribute as optional [0..1].

+                   Changes included in this TAPI release (v2.1.3) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop_v2_1/CHANGE_LOG/change-log.2.1.3.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7tqhxFK$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7KeAhLL$ >";

+    }

+    revision 2019-07-16 {

+        description "ONF Transport API version 2.1.2.

+                   Changes included in this TAPI release (v2.1.2) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop_v2_1/CHANGE_LOG/change-log.2.1.2.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7eDS6-t$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7KeAhLL$ >";

+    }

+    revision 2018-12-10 {

+        description "ONF Transport API version 2.1.1.

+                   Changes included in this TAPI release (v2.1.1) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.1.1.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G1ftwU5J$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7KeAhLL$ >";

+    }

+    revision 2018-10-16 {

+        description "ONF Transport API version 2.1.0.

+                   Changes included in this TAPI release (v2.1.0) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.1.0.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G-5JStw4$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G7KeAhLL$ >";

+    }

+    revision 2018-03-07 {

+        description "ONF Transport API version 2.0.2

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.2.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G1Yf4AAN$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.2/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G27-pJK_$ >";

+    }

+    revision 2018-02-16 {

+        description "ONF Transport API version 2.0.1

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.1.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G8RnGvXg$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.1/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6Gy6YoeAv$ >";

+    }

+    revision 2018-01-02 {

+        description "ONF Transport API version 2.0.0

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.0.md__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6GyqYDgG_$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.0/UML__;!!OSsGDw!d_dJlNtYLmD585It0DKukzB2TS5KZqBZQ-pdI1D-6c6c5hRDotd6G1V9Thk9$ >";

+    }

+    augment "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-connectivity:cep-list/tapi-connectivity:connection-end-point" {

+        container otsi-connection-end-point-spec {

+            uses otsi-connection-end-point-spec;

+            description "Augments the base LayerProtocol information in ConnectionEndPoint with OCH-specific information";

+        }

+        description "Augments the base LayerProtocol information in ConnectionEndPoint with OCH-specific information";

+    }

+    augment "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point" {

+        container media-channel-node-edge-point-spec {

+            uses media-channel-node-edge-point-spec;

+            description "Augments the base LayerProtocol information in NodeEdgePoint with OCH-specific information";

+        }

+        description "Augments the base LayerProtocol information in NodeEdgePoint with OCH-specific information";

+    }

+    augment "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-connectivity:cep-list/tapi-connectivity:connection-end-point" {

+        container otsi-assembly-connection-end-point-spec {

+            uses otsi-assembly-connection-end-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-common:service-interface-point" {

+        container otsi-service-interface-point-spec {

+            uses otsi-service-interface-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:end-point" {

+        container otsi-connectivity-service-end-point-spec {

+            uses otsi-connectivity-service-end-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-common:service-interface-point" {

+        container media-channel-service-interface-point-spec {

+            uses media-channel-service-interface-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:end-point" {

+        container media-channel-connectivity-service-end-point-spec {

+            uses media-channel-connectivity-service-end-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-connectivity:cep-list/tapi-connectivity:connection-end-point" {

+        container media-channel-connection-end-point-spec {

+            uses media-channel-connection-end-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-connectivity:cep-list/tapi-connectivity:connection-end-point" {

+        container ots-connection-end-point-spec {

+            uses ots-connection-end-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-connectivity:cep-list/tapi-connectivity:connection-end-point" {

+        container media-channel-assembly-spec {

+            uses media-channel-assembly-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-connectivity:create-connectivity-service/tapi-connectivity:input/tapi-connectivity:end-point" {

+        container media-channel-connectivity-service-end-point-spec {

+            uses media-channel-connectivity-service-end-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-connectivity:get-connectivity-service-details/tapi-connectivity:output/tapi-connectivity:service/tapi-connectivity:end-point" {

+        container media-channel-connectivity-service-end-point-spec {

+            uses media-channel-connectivity-service-end-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-connectivity:get-connectivity-service-list/tapi-connectivity:output/tapi-connectivity:service/tapi-connectivity:end-point" {

+        container media-channel-connectivity-service-end-point-spec {

+            uses media-channel-connectivity-service-end-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-connectivity:update-connectivity-service/tapi-connectivity:input/tapi-connectivity:end-point" {

+        container media-channel-connectivity-service-end-point-spec {

+            uses media-channel-connectivity-service-end-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-connectivity:update-connectivity-service/tapi-connectivity:output/tapi-connectivity:service/tapi-connectivity:end-point" {

+        container media-channel-connectivity-service-end-point-spec {

+            uses media-channel-connectivity-service-end-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-connectivity:create-connectivity-service/tapi-connectivity:output/tapi-connectivity:service/tapi-connectivity:end-point" {

+        container media-channel-connectivity-service-end-point-spec {

+            uses media-channel-connectivity-service-end-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-topology:get-node-edge-point-details/tapi-topology:output/tapi-topology:node-edge-point" {

+        container media-channel-node-edge-point-spec {

+            uses media-channel-node-edge-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:get-service-interface-point-details/tapi-common:output/tapi-common:sip" {

+        container media-channel-service-interface-point-spec {

+            uses media-channel-service-interface-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:get-service-interface-point-list/tapi-common:output/tapi-common:sip" {

+        container media-channel-service-interface-point-spec {

+            uses media-channel-service-interface-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-connectivity:create-connectivity-service/tapi-connectivity:input/tapi-connectivity:end-point" {

+        container otsi-connectivity-service-end-point-spec {

+            uses otsi-connectivity-service-end-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-connectivity:create-connectivity-service/tapi-connectivity:output/tapi-connectivity:service/tapi-connectivity:end-point" {

+        container otsi-connectivity-service-end-point-spec {

+            uses otsi-connectivity-service-end-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-connectivity:get-connectivity-service-details/tapi-connectivity:output/tapi-connectivity:service/tapi-connectivity:end-point" {

+        container otsi-connectivity-service-end-point-spec {

+            uses otsi-connectivity-service-end-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-connectivity:get-connectivity-service-list/tapi-connectivity:output/tapi-connectivity:service/tapi-connectivity:end-point" {

+        container otsi-connectivity-service-end-point-spec {

+            uses otsi-connectivity-service-end-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-connectivity:update-connectivity-service/tapi-connectivity:input/tapi-connectivity:end-point" {

+        container otsi-connectivity-service-end-point-spec {

+            uses otsi-connectivity-service-end-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-connectivity:update-connectivity-service/tapi-connectivity:output/tapi-connectivity:service/tapi-connectivity:end-point" {

+        container otsi-connectivity-service-end-point-spec {

+            uses otsi-connectivity-service-end-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:get-service-interface-point-details/tapi-common:output/tapi-common:sip" {

+        container otsi-service-interface-point-spec {

+            uses otsi-service-interface-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:get-service-interface-point-list/tapi-common:output/tapi-common:sip" {

+        container otsi-service-interface-point-spec {

+            uses otsi-service-interface-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-connectivity:get-connection-end-point-details/tapi-connectivity:output/tapi-connectivity:connection-end-point" {

+        container media-channel-connection-end-point-spec {

+            uses media-channel-connection-end-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-connectivity:get-connection-end-point-details/tapi-connectivity:output/tapi-connectivity:connection-end-point" {

+        container otsi-assembly-connection-end-point-spec {

+            uses otsi-assembly-connection-end-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-connectivity:get-connection-end-point-details/tapi-connectivity:output/tapi-connectivity:connection-end-point" {

+        container otsi-connection-end-point-spec {

+            uses otsi-connection-end-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:end-point" {

+        container otsia-connectivity-service-end-point-spec {

+            uses otsia-connectivity-service-end-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-connectivity:connectivity-context/tapi-connectivity:connectivity-service/tapi-connectivity:end-point" {

+        container mca-connectivity-service-end-point-spec {

+            uses mca-connectivity-service-end-point-spec;

+            description "none";

+        }

+        description "none";

+    }

+    /**************************

+    * package object-classes

+    **************************/ 

+    grouping otsi-gserver-adaptation-pac {

+        leaf number-of-otsi {

+            type uint64;

+            config false;

+            description "none";

+        }

+        description "none";

+    }

+    grouping otsi-connection-end-point-spec {

+        container otsi-termination {

+            config false;

+            uses otsi-termination-pac;

+            description "none";

+        }

+        description "none";

+    }

+    grouping otsi-termination-pac {

+        container selected-central-frequency {

+            config false;

+            uses central-frequency;

+            description "none";

+        }

+        container selected-application-identifier {

+            config false;

+            uses application-identifier;

+            description "This attribute indicates the selected Application Identifier that is used by the OCh trail termination function. The syntax of ApplicationIdentifier is a pair {ApplicationIdentifierType, PrintableString}. The value of ApplicationIdentifierType is either STANDARD or PROPRIETARY. The value of PrintableString represents the standard application code as defined in the ITU-T Recommendations or a vendor-specific proprietary code. If the ApplicationIdentifierType is STANDARD the value of PrintableString represents a standard application code as defined in the ITU-T Recommendations. If the ApplicationIdentifierType is PROPRIETARY, the first six characters of the PrintableString must contain the Hexadecimal representation of an OUI assigned to the vendor whose implementation generated the Application Identifier; the remaining octets of the PrintableString are unspecified. The value of this attribute of an object instance has to be one of the values identified in the attribute SupportableApplicationIdentifierList of the same object instance. The values and value ranges of the optical interface parameters of a standard application code must be consistent with those values specified in the ITU-T Recommendation for that application code.";

+        }

+        leaf selected-modulation {

+            type modulation-technique;

+            default "UNDEFINED";

+            config false;

+            description "This parameter defines the modulation used at the source";

+        }

+        container selected-spectrum {

+            config false;

+            uses spectrum-band;

+            description "none";

+        }

+        container transmited-power {

+            config false;

+            uses power-properties-pac;

+            description "Measured power at the Transmitter.";

+        }

+        container received-power {

+            uses power-properties-pac;

+            description "none";

+        }

+        container laser-properties {

+            config false;

+            uses laser-properties-pac;

+            description "Laser properties.";

+        }

+        description "Provides status information only.";

+    }

+    grouping media-channel-pool-capability-pac {

+        list supportable-spectrum {

+            key 'upper-frequency lower-frequency';

+            config false;

+            uses spectrum-band;

+            description "none";

+        }

+        list available-spectrum {

+            key 'upper-frequency lower-frequency';

+            config false;

+            uses spectrum-band;

+            description "none";

+        }

+        list occupied-spectrum {

+            key 'upper-frequency lower-frequency';

+            config false;

+            uses spectrum-band;

+            description "none";

+        }

+        description "none";

+    }

+    grouping media-channel-node-edge-point-spec {

+        container mc-pool {

+            config false;

+            uses media-channel-pool-capability-pac;

+            description "none";

+        }

+        description "none";

+    }

+    grouping otsi-routing-spec {

+        leaf optical-routing-strategy {

+            type optical-routing-strategy;

+            description "none";

+        }

+        description "none";

+    }

+    grouping media-channel-properties-pac {

+        container occupied-spectrum {

+            config false;

+            uses spectrum-band;

+            description "none";

+        }

+        container measured-power-ingress {

+            config false;

+            uses power-properties-pac;

+            description "none";

+        }

+        container measured-power-egress {

+            uses power-properties-pac;

+            description "none";

+        }

+        description "none";

+    }

+    grouping otsi-assembly-connection-end-point-spec {

+        container otsi-adapter {

+            config false;

+            uses otsi-gserver-adaptation-pac;

+            description "none";

+        }

+        container fec-parameters {

+            config false;

+            uses fec-properties-pac;

+            description "none";

+        }

+        description "none";

+    }

+    grouping otsi-capability-pac {

+        list supportable-central-frequency-spectrum-band {

+            key 'lower-central-frequency upper-central-frequency';

+            config false;

+            uses central-frequency-band;

+            description "Each spectrum band supported for otsi trasmitter to be tuned on,

+                is specified as per it's lower and upper central frequencies supported and its frequency constraints,

+                consisting in the frequency Grid and the AdjustmentGranularity,

+                used to uniquely identify all central frequencies supported within the band.";

+        }

+        list supportable-application-identifier {

+            key 'application-code';

+            config false;

+            uses application-identifier;

+            description "The list of supportable ApplicationIdentifiers.";

+        }

+        leaf-list supportable-modulation {

+            type modulation-technique;

+            config false;

+            description "This parameter defines the modulation used at the source";

+        }

+        container total-power-warn-threshold {

+            config false;

+            uses total-power-threshold-pac;

+            description "none";

+        }

+        description "Can read the status of the warning for the upper value that the power can reach.";

+    }

+    grouping otsi-service-interface-point-spec {

+        container otsi-capability {

+            config false;

+            uses otsi-capability-pac;

+            description "none";

+        }

+        container power-management-capability {

+            uses power-management-capability-pac;

+            description "none";

+        }

+        description "none";

+    }

+    grouping otsi-connectivity-service-end-point-spec {

+        container otsi-config {

+            uses otsi-termination-config-pac;

+            description "none";

+        }

+        description "none";

+    }

+    grouping otsi-termination-config-pac {

+        container central-frequency {

+            uses central-frequency;

+            description "The central frequency of the laser. It is the oscillation frequency of the corresponding electromagnetic wave";

+        }

+        container spectrum {

+            uses spectrum-band;

+            description "none";

+        }

+        container application-identifier {

+            uses application-identifier;

+            description "This attribute indicates the selected Application Identifier.";

+        }

+        leaf modulation {

+            type modulation-technique;

+            description "The modulation techniqu selected at the source.";

+        }

+        leaf laser-control {

+            type laser-control-type;

+            description "Laser control can be FORCED-ON, FORCED-OFF or LASER-SHUTDOWN";

+        }

+        container transmit-power {

+            uses power-properties-pac;

+            description "Transmit power as requested.";

+        }

+        leaf total-power-warn-threshold-upper {

+            type decimal64 {

+                fraction-digits 7;

+            }

+            description "Allows to configure the Upper power threshold which is expected to be different from Default, but within the Min and Max values specified as OTSi SIP capability.";

+        }

+        leaf total-power-warn-threshold-lower {

+            type decimal64 {

+                fraction-digits 7;

+            }

+            description "Allows to configure the Lowerpower threshold which is expected to be different from Default, but within the Min and Max values specified as OTSi SIP capability.";

+        }

+        uses tapi-common:local-class;

+        description "This class allows the provisioning of the parameters of a single OTSi.

+            In case it is not instantiated (see [0..*] with OtsiAConnectivityServiceEndPointSpec), it is intended that the choice of the parameter values is fully delegated to the server controller.";

+    }

+    grouping fec-properties-pac {

+        leaf pre-fec-ber {

+            type uint64;

+            config false;

+            description "counter: bit error rate before correction by FEC";

+        }

+        leaf post-fec-ber {

+            type uint64;

+            config false;

+            description "counter: bit error rate after correction by FEC";

+        }

+        leaf corrected-bytes {

+            type uint64;

+            config false;

+            description "Bytes corrected between those that were received corrupted";

+        }

+        leaf corrected-bits {

+            type uint64;

+            config false;

+            description "Bits corrected between those that were received corrupted";

+        }

+        leaf uncorrectable-bytes {

+            type uint64;

+            config false;

+            description "Bytes that could not be corrected by FEC";

+        }

+        leaf uncorrectable-bits {

+            type uint64;

+            config false;

+            description "Bits that could not be corrected by FEC";

+        }

+        description "none";

+    }

+    grouping media-channel-service-interface-point-spec {

+        container mc-pool {

+            config false;

+            uses media-channel-pool-capability-pac;

+            description "none";

+        }

+        container power-management-capability {

+            uses power-management-capability-pac;

+            description "none";

+        }

+        description "none";

+    }

+    grouping media-channel-connectivity-service-end-point-spec {

+        container mc-config {

+            uses media-channel-config-pac;

+            description "none";

+        }

+        description "none";

+    }

+    grouping media-channel-config-pac {

+        container spectrum {

+            uses spectrum-band;

+            description "none";

+        }

+        container power-management-config-pac {

+            uses power-management-config-pac;

+            description "none";

+        }

+        uses tapi-common:local-class;

+        description "This class allows the provisioning of the parameters of a single MC / OTSiMC.

+            The [1..*] with MediaChannelAConnectivityServiceEndPointSpec allows the configuration of power properties (PowerManagementConfigPac) even in case of no spectrum specified, i.e. 'empty' MediaChannelConfigPac.";

+    }

+    grouping media-channel-connection-end-point-spec {

+        container media-channel {

+            config false;

+            uses media-channel-properties-pac;

+            description "none";

+        }

+        description "none";

+    }

+    grouping ots-connection-end-point-spec {

+        container ots-media-channel {

+            config false;

+            uses media-channel-properties-pac;

+            description "none";

+        }

+        description "none";

+    }

+    grouping media-channel-assembly-spec {

+        description "none";

+    }

+    grouping laser-properties-pac {

+        leaf laser-status {

+            type laser-control-status-type;

+            config false;

+            description "none";

+        }

+        leaf laser-application-type {

+            type laser-type;

+            config false;

+            description "The type of laser, its operational wavelengths, and its applications. String size 255.";

+        }

+        leaf laser-bias-current {

+            type decimal64 {

+                fraction-digits 7;

+            }

+            config false;

+            description "The Bias current of the laser that is the medium polarization current of the laser.";

+        }

+        leaf laser-temperature {

+            type decimal64 {

+                fraction-digits 7;

+            }

+            config false;

+            description "The temperature of the laser";

+        }

+        description "none";

+    }

+    grouping power-properties-pac {

+        leaf total-power {

+            type decimal64 {

+                fraction-digits 7;

+            }

+            description "The total power at any point in a channel specified in dBm.";

+        }

+        leaf power-spectral-density {

+            type decimal64 {

+                fraction-digits 7;

+            }

+            config false;

+            description "This describes how power of a signal  is distributed over frequency specified in nW/MHz";

+        }

+        description "Indication with severity warning raised when a total power value measured is above the threshold.";

+    }

+    grouping total-power-threshold-pac {

+        leaf total-power-upper-warn-threshold-default {

+            type decimal64 {

+                fraction-digits 7;

+            }

+            description "Can read the value of the default  threshold that was set";

+        }

+        leaf total-power-upper-warn-threshold-min {

+            type decimal64 {

+                fraction-digits 7;

+            }

+            description "Can read the value of the lower threshold that was set";

+        }

+        leaf total-power-upper-warn-threshold-max {

+            type decimal64 {

+                fraction-digits 7;

+            }

+            description "Can  read the value of the upper threshold that was set";

+        }

+        leaf total-power-lower-warn-threshold-default {

+            type decimal64 {

+                fraction-digits 7;

+            }

+            description "Can read the value of the default  threshold that was set";

+        }

+        leaf total-power-lower-warn-threshold-max {

+            type decimal64 {

+                fraction-digits 7;

+            }

+            description "Can  read the value of the upper threshold that was set";

+        }

+        leaf total-power-lower-warn-threshold-min {

+            type decimal64 {

+                fraction-digits 7;

+            }

+            description "Can read the value of the lower threshold that was set";

+        }

+        description "none";

+    }

+    grouping power-management-config-pac {

+        container intended-maximum-output-power {

+            uses power-properties;

+            description "This parameter shall be used to specify the maximum output power

+                desired at the Logical-Termination-Point (LTP) associated to the CSEP.";

+        }

+        container intended-minimum-output-power {

+            uses power-properties;

+            description "This parameter shall be used to specify the minimum output power

+                desired at the Logical-Termination-Point (LTP) associated to the CSEP.";

+        }

+        container expected-maximum-input-power {

+            uses power-properties;

+            description "This parameter shall be used to specify the maximum input power

+                being received at the Logical-Termination-Point (LTP) associated to the CSEP.";

+        }

+        container expected-minimum-input-power {

+            uses power-properties;

+            description "This parameter shall be used to specify the minimum input power

+                being received at the Logical-Termination-Point (LTP) associated to the CSEP.";

+        }

+        description "none";

+    }

+    grouping power-management-capability-pac {

+        container supportable-maximum-output-power {

+            uses power-properties;

+            description "This parameter exposes the maximum output power supported

+                at the Logical-Termination-Point (LTP) associated to the SIP.";

+        }

+        container supportable-minimum-output-power {

+            uses power-properties;

+            description "This parameter exposes the minimum output power supported

+                at the Logical-Termination-Point (LTP) associated to the SIP.";

+        }

+        container tolerable-maximum-input-power {

+            uses power-properties;

+            description "This parameter exposes the maximum input power tolerated

+                at the Logical-Termination-Point (LTP) associated to the SIP.";

+        }

+        container tolerable-minimum-input-power {

+            uses power-properties;

+            description "This parameter exposes the minimum input power tolerated

+                at the Logical-Termination-Point (LTP) associated to the SIP.";

+        }

+        description "none";

+    }

+    grouping mca-connectivity-service-end-point-spec {

+        list mc-config {

+            key 'local-id';

+            uses media-channel-config-pac;

+            description "none";

+        }

+        leaf number-of-mc {

+            type uint64;

+            default "1";

+            description "none";

+        }

+        container capacity {

+            uses tapi-common:capacity-value;

+            description "Total capacity of an MCA/OTSiMCA.

+                Capacity may be omitted if spectrum is specified.

+                Capacity cannot be omitted if spectrum is not specified.";

+        }

+        description "This class allows the provisioning of MCA/OTSiMCA (*) ConnectivityService.

+            It is possible to provision either

+            1) MC/OTSiMC bandwidth/capacity or

+            2) MC/OTSiMC spectrum.

+            For the provisioning of 'OTSiMCA' ConnectivityService the MediaChannelAConnectivityServiceEndPointSpec is used,

+            leveraging the Layer Protocol Qualifier of CSEP (*) and the CSEPHasServerCSEP recursive association in case of combined provisioning, i.e.

+            when OTSiMCA' ConnectivityService provisioning drives also creation of 'supporting' MCs.

+            (*) Note that that assembly related Layer Protocol Qualifiers (OTSiA, MCA, OTSiMCA) are not used, as the assembly is modeled through associations between objects.";

+    }

+    grouping otsia-connectivity-service-end-point-spec {

+        list otsi-config {

+            key 'local-id';

+            uses otsi-termination-config-pac;

+            description "none";

+        }

+        leaf number-of-otsi {

+            type uint64;

+            default "1";

+            description "none";

+        }

+        description "This class allows the provisioning of OTSiA (*) ConnectivityService.

+            It is possible to either 

+            1) delegate the choice of all OTSi characteristics to the server controller (zero OtsiTerminationConfigPac instances), or

+            2) specify one, more or all OtsiTerminationConfigPac parameters.

+            (*) Note that that assembly related Layer Protocol Qualifiers (OTSiA, MCA, OTSiMCA) are not used, as the assembly is modeled through associations between objects.";

+    }

+

+    /**************************

+    * package type-definitions

+    **************************/ 

+    identity PHOTONIC_LAYER_QUALIFIER {

+        base tapi-common:LAYER_PROTOCOL_QUALIFIER;

+        description "none";

+    }

+    identity PHOTONIC_LAYER_QUALIFIER_OTSi {

+        base PHOTONIC_LAYER_QUALIFIER;

+        description "none";

+    }

+    identity PHOTONIC_LAYER_QUALIFIER_OTSiA {

+        base PHOTONIC_LAYER_QUALIFIER;

+        description "none";

+    }

+    identity PHOTONIC_LAYER_QUALIFIER_OTSiG {

+        base PHOTONIC_LAYER_QUALIFIER;

+        description "none";

+    }

+    identity PHOTONIC_LAYER_QUALIFIER_NMC {

+        base PHOTONIC_LAYER_QUALIFIER;

+        description "none";

+    }

+    identity PHOTONIC_LAYER_QUALIFIER_NMCA {

+        base PHOTONIC_LAYER_QUALIFIER;

+        description "none";

+    }

+    identity PHOTONIC_LAYER_QUALIFIER_SMC {

+        base PHOTONIC_LAYER_QUALIFIER;

+        description "none";

+    }

+    identity PHOTONIC_LAYER_QUALIFIER_SMCA {

+        base PHOTONIC_LAYER_QUALIFIER;

+        description "none";

+    }

+    identity PHOTONIC_LAYER_QUALIFIER_OCH {

+        base PHOTONIC_LAYER_QUALIFIER;

+        description "none";

+    }

+    identity PHOTONIC_LAYER_QUALIFIER_OMS {

+        base PHOTONIC_LAYER_QUALIFIER;

+        description "none";

+    }

+    identity PHOTONIC_LAYER_QUALIFIER_OTS {

+        base PHOTONIC_LAYER_QUALIFIER;

+        description "none";

+    }

+    identity PHOTONIC_LAYER_QUALIFIER_OTSiMC {

+        base PHOTONIC_LAYER_QUALIFIER;

+        description "OTSiMC represents the bw portion dedicated to an OTSi.";

+    }

+    identity PHOTONIC_LAYER_QUALIFIER_OTSiMCA {

+        base PHOTONIC_LAYER_QUALIFIER;

+        description "OTSiMCA is the set of OTSiMC supporting an OTSiA.";

+    }

+    identity PHOTONIC_LAYER_QUALIFIER_MC {

+        base PHOTONIC_LAYER_QUALIFIER;

+        description "The continuous optical spectrum between end points in the photonic layer obtained through optical filter configurations where it is expected one (or more - super channel case) OTSi(s).";

+    }

+    identity PHOTONIC_LAYER_QUALIFIER_MCA {

+        base PHOTONIC_LAYER_QUALIFIER;

+        description "Media Channel Assembly: the set of one or more MCs supporting one (or more) OTSiA(s).

+            ";

+    }

+    grouping application-identifier {

+        leaf application-identifier-type {

+            type application-identifier-type;

+            description "The ITU-T recommendation which defines the application code format.";

+        }

+        leaf application-code {

+            type string;

+            description "none";

+        }

+        description "The syntax of ApplicationIdentifier is a pair {ApplicationIdentifierType, PrintableString}. The value of ApplicationIdentifierType is either STANDARD or PROPRIETARY. The value of PrintableString represents the standard application code as defined in the ITU-T Recommendations or a vendor-specific proprietary code. If the ApplicationIdentifierType is STANDARD the value of PrintableString represents a standard application code as defined in the ITU-T Recommendations. If the ApplicationIdentifierType is PROPRIETARY, the first six characters of the PrintableString must contain the Hexadecimal representation of an OUI assigned to the vendor whose implementation generated the Application Identifier; the remaining octets of the PrintableString are unspecified. The value of this attribute of an object instance has to be one of the values identified in the attribute SupportableApplicationIdentifierList of the same object instance. The values and value ranges of the optical interface parameters of a standard application code must be consistent with those values specified in the ITU-T Recommendation for that application code.";

+    }

+    grouping central-frequency {

+        container frequency-constraint {

+            uses frequency-constraint;

+            description "none";

+        }

+        leaf central-frequency {

+            type uint64;

+            description "The central frequency of the laser specified in MHz. It is the oscillation frequency of the corresponding electromagnetic wave. ";

+        }

+        description "This data-type holds the central frequency information as well frequency constraints in terms of GridType ( FIXED grid (DWDM or CWDM) or FLEX grid) and AdjustmentGranularity.";

+    }

+    typedef optical-routing-strategy {

+        type enumeration {

+            enum OPTIMAL_OSNR {

+                description "none";

+            }

+            enum NO_RELAY {

+                description "none";

+            }

+            enum MIN_RELAY {

+                description "none";

+            }

+            enum PREFERRED_NO_CHANGE_WAVELENGTH_AS_RESTORE {

+                description "none";

+            }

+            enum PREFERRED_NO_SKIPPING_WAVELENGTH {

+                description "none";

+            }

+        }

+        description "none";

+    }

+    typedef application-identifier-type {

+        type enumeration {

+            enum PROPRIETARY {

+                description "none";

+            }

+            enum ITUT_G959_1 {

+                description "none";

+            }

+            enum ITUT_G698_1 {

+                description "none";

+            }

+            enum ITUT_G698_2 {

+                description "none";

+            }

+            enum ITUT_G696_1 {

+                description "none";

+            }

+            enum ITUT_G695 {

+                description "none";

+            }

+        }

+        description "none";

+    }

+    typedef grid-type {

+        type enumeration {

+            enum DWDM {

+                description "Fixed frequency grid in C & L bands as specified in ITU-T G.694.1

+                    ";

+            }

+            enum CWDM {

+                description "Fixed frequency grid as specified in ITU-T G.694.2";

+            }

+            enum FLEX {

+                description "Flexible frequency grid as specified in ITU-T G.694.1. In this case,

+                    - the allowed frequency slots have a nominal central frequency (in THz) defined by:

+                    193.1 + n x 0.00625 where n is a positive or negative integer including 0 and 0.00625 is the nominal central frequency granularity in THz

+                    - and a slot width defined by:

+                    12.5 x m where m is a positive integer and 12.5 is the slot width granularity in GHz.

+                    Any combination of frequency slots is allowed as long as no two frequency slots overlap.";

+            }

+            enum GRIDLESS {

+                description "none";

+            }

+            enum UNSPECIFIED {

+                description "Unspecified/proprietary frequency grid";

+            }

+        }

+        description "The frequency grid standard that specify reference set of frequencies used to denote allowed nominal central frequencies that may be used for defining applications.";

+    }

+    typedef adjustment-granularity {

+        type enumeration {

+            enum G_100GHZ {

+                description "100000 MHz";

+            }

+            enum G_50GHZ {

+                description "50000 MHz";

+            }

+            enum G_25GHZ {

+                description "25000 MHz";

+            }

+            enum G_12_5GHZ {

+                description "12500 MHz";

+            }

+            enum G_6_25GHZ {

+                description "6250 MHz";

+            }

+            enum G_3_125GHZ {

+                description "3125 MHz";

+            }

+            enum UNCONSTRAINED {

+                description "none";

+            }

+        }

+        description "Adjustment granularity in Gigahertz. As per ITU-T G.694.1, it is used to calculate nominal central frequency";

+    }

+    grouping spectrum-band {

+        leaf upper-frequency {

+            type uint64;

+            description "The upper frequency bound of the media channel spectrum specified in MHz";

+        }

+        leaf lower-frequency {

+            type uint64;

+            description "The lower frequency bound of the media channel spectrum specified in MHz";

+        }

+        container frequency-constraint {

+            uses frequency-constraint;

+            description "none";

+        }

+        description "This data-type holds the spectrum information in termsof upper/lower frequency directly or optionally the information to determin this in terms of the nominal central frequency and spectral width for a FIXED grid (DWDM or CWDM) and FLEX grid type systems.";

+    }

+    typedef modulation-technique {

+        type enumeration {

+            enum RZ {

+                description "none";

+            }

+            enum NRZ {

+                description "none";

+            }

+            enum BPSK {

+                description "none";

+            }

+            enum DPSK {

+                description "none";

+            }

+            enum QPSK {

+                description "none";

+            }

+            enum 8QAM {

+                description "none";

+            }

+            enum 16QAM {

+                description "none";

+            }

+            enum PAM4 {

+                description "none";

+            }

+            enum PAM8 {

+                description "none";

+            }

+            enum UNDEFINED {

+                description "none";

+            }

+        }

+        description "none";

+    }

+    typedef laser-type {

+        type enumeration {

+            enum PUMP {

+                description "none";

+            }

+            enum MODULATED {

+                description "none";

+            }

+            enum PULSE {

+                description "none";

+            }

+        }

+        description "none";

+    }

+    typedef photonic-layer-qualifier {

+        type identityref {

+            base PHOTONIC_LAYER_QUALIFIER;

+        }

+        description "Tag as deprecated OTSiG

+            Tag as deprecated NMC, replaced by OTSiMC

+            Tag as deprecated NMCA, replaced by OTSiMCA

+            Tag as deprecated SMC, replaced by MC

+            Tag as deprecated SMCA, replace by MCA";

+    }

+    typedef laser-control-type {

+        type enumeration {

+            enum FORCED-ON {

+                description "none";

+            }

+            enum FORCED-OFF {

+                description "none";

+            }

+            enum AUTOMATIC-LASER-SHUTDOWN {

+                description "none";

+            }

+            enum UNDEFINED {

+                description "none";

+            }

+        }

+        description "none";

+    }

+    typedef laser-control-status-type {

+        type enumeration {

+            enum ON {

+                description "none";

+            }

+            enum OFF {

+                description "none";

+            }

+            enum PULSING {

+                description "none";

+            }

+            enum UNDEFINED {

+                description "none";

+            }

+        }

+        description "none";

+    }

+    grouping frequency-constraint {

+        leaf adjustment-granularity {

+            type adjustment-granularity;

+            description "Adjustment granularity in Gigahertz. As per ITU-T G.694.1, it is used to calculate nominal central frequency (in THz)";

+        }

+        leaf grid-type {

+            type grid-type;

+            description "Specifies the frequency grid standard used to determine the nominal central frequency and frequency slot width";

+        }

+        description "This data-type holds the frequency constraint information in terms of GridType ( FIXED grid (DWDM or CWDM) or FLEX grid) and AdjustmentGranularity.";

+    }

+    grouping power-properties {

+        leaf total-power {

+            type decimal64 {

+                fraction-digits 7;

+            }

+            description "The total power at any point in a channel specified in dBm.";

+        }

+        leaf power-spectral-density {

+            type decimal64 {

+                fraction-digits 7;

+            }

+            description "This describes how power of a signal  is distributed over frequency specified in nW/MHz";

+        }

+        description "none";

+    }

+    grouping central-frequency-band {

+        leaf lower-central-frequency {

+            type uint64;

+            description "The lower central frequency that can be tuned in the laser specified in MHz.

+                It is the oscillation frequency of the corresponding electromagnetic wave. ";

+        }

+        leaf upper-central-frequency {

+            type uint64;

+            description "The upper central frequency that can be tuned in the laser specified in MHz.

+                It is the oscillation frequency of the corresponding electromagnetic wave. ";

+        }

+        container frequency-constraint {

+            uses frequency-constraint;

+            description "none";

+        }

+        description "This data-type represents a range of central frequency spectrum band specified as lower and upper bounds, inclusive of the bound values.

+            It also holds frequency constraints in terms of GridType ( FIXED grid (DWDM or CWDM) or FLEX grid) and AdjustmentGranularity.";

+    }

+

+}

diff --git a/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-streaming@2020-06-16.yang b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-streaming@2020-06-16.yang
new file mode 100644
index 0000000..32700b9
--- /dev/null
+++ b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-streaming@2020-06-16.yang
@@ -0,0 +1,1518 @@
+module tapi-streaming {

+    yang-version "1.1";

+    namespace "urn:onf:otcc:yang:tapi-streaming";

+    prefix tapi-streaming;

+    import tapi-common {

+        prefix tapi-common;

+    }

+    import tapi-connectivity {

+        prefix tapi-connectivity;

+    }

+    import tapi-equipment {

+        prefix tapi-equipment;

+    }

+    import tapi-oam {

+        prefix tapi-oam;

+    }

+    import tapi-path-computation {

+        prefix tapi-path-computation;

+    }

+    import tapi-topology {

+        prefix tapi-topology;

+    }

+    import tapi-virtual-network {

+        prefix tapi-virtual-network;

+    }

+    organization "ONF OTCC (Open Transport Configuration & Control) Project";

+    contact "

+         Project Web: <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OTCC/TAPI__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_yiFzE6g$ >

+         Project List: <mailto:transport-api@opennetworking.org>

+         Editor: Karthik Sethuraman <mailto:karthik.sethuraman@necam.com>

+         Andrea Mazzin <mailto:andrea.mazzini@nokia.com>

+         Arturo Mayoral <mailto:arturo.mayoral@telefonica.com>

+         Nigel Davis <mailto:ndavis@ciena.com>";

+    description "This module contains TAPI Streaming Model definitions.

+        Source: TapiStreaming.uml

+        - The TAPI YANG models included in this TAPI release are a *normative* part of the TAPI SDK.

+        - The YANG specifications have been generated from the corresponding UML model using the [ONF EAGLE UML2YANG mapping tool]

+        <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$ >

+        and further edited manually to comply with the [ONF IISOMI UML2YANG mapping guidelines]

+        <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$ >

+        - Status of YANG model artifacts can be determined by referring to the corresponding UML artifacts.

+        As described in the UML models, some artifacts are considered *experimental*, and thus the corresponding YANG artifacts.

+        - The ONF TAPI release process does not guarantee backward compatibility of YANG models across major versions of TAPI releases.

+        The YANG model backward compatibility criteria are outlined in section 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$ >.

+        YANG models included in this release may not be backward compatible with previous TAPI releases.

+        Copyright (c) 2018 Open Networking Foundation (ONF). All rights reserved.

+        License: This module is distributed under the Apache License 2.0.";

+    revision 2020-06-16 {

+        description "ONF Transport API version 2.1.3.

+                   - Comment typos corrected.

+                   - One attribute changed (sourcePrecesion/source-precesion --> sourcePrecision/source-precision).

+                   Changes included in this TAPI release (v2.1.3) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop_v2_1/CHANGE_LOG/change-log.2.1.3.md__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_xm1nx_D$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_8UH3XnH$ >";

+    }

+    revision 2019-07-16 {

+        description "ONF Transport API version 2.1.2.

+                   Changes included in this TAPI release (v2.1.2) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop_v2_1/CHANGE_LOG/change-log.2.1.2.md__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_0xFu4bN$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_8UH3XnH$ >";

+    }

+    revision 2018-12-10 {

+        description "ONF Transport API version 2.1.1.

+                   Changes included in this TAPI release (v2.1.1) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.1.1.md__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur__2p0od1$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_8UH3XnH$ >";

+    }

+    revision 2018-10-16 {

+        description "ONF Transport API version 2.1.0.

+                   Changes included in this TAPI release (v2.1.0) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.1.0.md__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_4DGi8ul$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_8UH3XnH$ >";

+    }

+    revision 2018-03-07 {

+        description "ONF Transport API version 2.0.2

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.2.md__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_8KlxwJZ$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.2/UML__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_-hMD5Xl$ >";

+    }

+    revision 2018-02-16 {

+        description "ONF Transport API version 2.0.1

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.1.md__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur__C1vuym$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.1/UML__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_5DYNwzZ$ >";

+    }

+    revision 2018-01-02 {

+        description "ONF Transport API version 2.0.0

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.0.md__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_1xZSBRA$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.0/UML__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_xt-GtqY$ >";

+    }

+    feature tapi-streaming {

+        description "Support for streaming of the information in the specific TAPI context, in terms of stream-records. Through augmentation of context with stream-context, allows the client to determine what specific stream connections are supported and which are currently available to connect to. Offers the ability to identify and use various log strategies and stream connection protocols.";

+    }

+    feature tapi-streaming-admin {

+        description "Support for monitoring of active connections to available streams. Through augmentation of context with stream-admin-context, allows the admin client to get details from monitors of active connections to provide a view of whether the client of the monitored stream is having difficult absorbing the stream. Will usually be used in a tapi context for a stream admin client. Will usually be used together with the tapi-streaming feature so that the stream monitors from one stream could be provided through another stream .";

+    }

+    augment "/tapi-common:context/tapi-streaming:stream-context/tapi-streaming:supported-stream-type" {

+        if-feature tapi-streaming;

+        container compacted-log-details {

+            uses compacted-log-details;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body/tapi-streaming:condition-detector" {

+        if-feature tapi-streaming;

+        container alarm-condition-detector-detail {

+            uses alarm-condition-detector-detail;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='SERVICE_INTERFACE_POINT'";

+        if-feature tapi-streaming;

+        container service-interface-point {

+            uses tapi-common:service-interface-point;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='CONDITION_DETECTOR'";

+        if-feature tapi-streaming;

+        container condition-detector {

+            uses condition-detector;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='ANY_CLASS'";

+        if-feature tapi-streaming;

+        container any-class {

+            uses any-class;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context" {

+        if-feature tapi-streaming-admin;

+        container stream-admin-context {

+            uses stream-admin-context;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context" {

+        if-feature tapi-streaming;

+        container stream-context {

+            uses stream-context;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-common:context/tapi-streaming:stream-context/tapi-streaming:supported-stream-type" {

+        if-feature tapi-streaming;

+        container connection-protocol-details {

+            uses connection-protocol-details;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='STREAM_MONITOR'";

+        if-feature tapi-streaming-admin;

+        container stream-monitor {

+            uses stream-monitor;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='SUPPORTED_STREAM_TYPE'";

+        if-feature tapi-streaming;

+        container supported-stream-type {

+            uses supported-stream-type;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='AVAILABLE_STREAM_TYPE'";

+        if-feature tapi-streaming;

+        container available-stream {

+            uses available-stream;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='CONNECTION'";

+        if-feature tapi-streaming;

+        container connection {

+            uses tapi-connectivity:connection;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='CONNECTION_END_POINT'";

+        if-feature tapi-streaming;

+        container connection-end-point {

+            uses tapi-connectivity:connection-end-point;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='CONNECTIVITY_SERVICE'";

+        if-feature tapi-streaming;

+        container connectivity-service {

+            uses tapi-connectivity:connectivity-service;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='CONNECTION_SERVICE_END_POINT'";

+        if-feature tapi-streaming;

+        container connectivity-service-end-point {

+            uses tapi-connectivity:connectivity-service-end-point;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='ROUTE'";

+        if-feature tapi-streaming;

+        container route {

+            uses tapi-connectivity:route;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='SWITCH'";

+        if-feature tapi-streaming;

+        container switch {

+            uses tapi-connectivity:switch;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='SWITCH_CONTROL'";

+        if-feature tapi-streaming;

+        container switch-control {

+            uses tapi-connectivity:switch-control;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='EQUIPMENT'";

+        if-feature tapi-streaming;

+        container equipment {

+            uses tapi-equipment:equipment;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='HOLDER'";

+        if-feature tapi-streaming;

+        container holder {

+            uses tapi-equipment:holder;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='ACCESS_PORT'";

+        if-feature tapi-streaming;

+        container access-port {

+            uses tapi-equipment:access-port;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='ABSTRACT_STRAND'";

+        if-feature tapi-streaming;

+        container abstract-strand {

+            uses tapi-equipment:abstract-strand;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='DEVICE'";

+        if-feature tapi-streaming;

+        container device {

+            uses tapi-equipment:device;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='PHYSICAL_SPAN'";

+        if-feature tapi-streaming;

+        container physical-span {

+            uses tapi-equipment:physical-span;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='MEG_END_POINT'";

+        if-feature tapi-streaming;

+        container mep {

+            uses tapi-oam:mep;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='OAM_JOB'";

+        if-feature tapi-streaming;

+        container oam-job {

+            uses tapi-oam:oam-job;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='MAINTENANCE_ENTITY_GROUP'";

+        if-feature tapi-streaming;

+        container meg {

+            uses tapi-oam:meg;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='MEG_INTERMEDIATE_POINT'";

+        if-feature tapi-streaming;

+        container mip {

+            uses tapi-oam:mip;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='OAM_SERVICE'";

+        if-feature tapi-streaming;

+        container oam-service {

+            uses tapi-oam:oam-service;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='OAM_SERVICE_END_POINT'";

+        if-feature tapi-streaming;

+        container oam-service-end-point {

+            uses tapi-oam:oam-service-end-point;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='PM_CURRENT_DATA'";

+        if-feature tapi-streaming;

+        container pm-current-data {

+            uses tapi-oam:pm-current-data;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='PM_HISTORY'";

+        if-feature tapi-streaming;

+        container pm-history-data {

+            uses tapi-oam:pm-history-data;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='OAM_PROFILE'";

+        if-feature tapi-streaming;

+        container oam-profile {

+            uses tapi-oam:oam-profile;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='PM_THRESHOLD_DATA'";

+        if-feature tapi-streaming;

+        container pm-threshold-data {

+            uses tapi-oam:pm-threshold-data;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='PM_BIN_DATA'";

+        if-feature tapi-streaming;

+        container pm-bin-data {

+            uses tapi-oam:pm-bin-data;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='PATH'";

+        if-feature tapi-streaming;

+        container path {

+            uses tapi-path-computation:path;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='PATH_COMPUTATION_SERVICE'";

+        if-feature tapi-streaming;

+        container path-computation-service {

+            uses tapi-path-computation:path-computation-service;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='PATH_SERVICE_END_POINT'";

+        if-feature tapi-streaming;

+        container path-service-end-point {

+            uses tapi-path-computation:path-service-end-point;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='PATH_OPTIMIZATION_CONSTRAINT'";

+        if-feature tapi-streaming;

+        container path-optimization-constraint {

+            uses tapi-path-computation:path-optimization-constraint;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='PATH_OBJECTIVE_FUNCTION'";

+        if-feature tapi-streaming;

+        container path-objective-function {

+            uses tapi-path-computation:path-objective-function;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='LINK'";

+        if-feature tapi-streaming;

+        container link {

+             uses tapi-topology:link;

+             description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='NODE'";

+        if-feature tapi-streaming;

+        container node {

+            uses tapi-topology:node;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='TOPOLOGY'";

+        if-feature tapi-streaming;

+        container topology {

+            uses tapi-topology:topology;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='NODE_EDGE_POINT'";

+        if-feature tapi-streaming;

+        container node-edge-point {

+            uses tapi-topology:node-edge-point;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='RULE'";

+        if-feature tapi-streaming;

+        container rule {

+            uses tapi-topology:rule;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='NODE_RULE_GROUP'";

+        if-feature tapi-streaming;

+        container node-rule-group {

+            uses tapi-topology:node-rule-group;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='INTER_RULE_GROUP'";

+        if-feature tapi-streaming;

+        container inter-rule-group {

+            uses tapi-topology:inter-rule-group;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='NETWORK_TOPOLOGY_SERVICE'";

+        if-feature tapi-streaming;

+        container network-topology-service {

+            uses tapi-topology:network-topology-service;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='VIRTUAL_NETWORK_SERVICE'";

+        if-feature tapi-streaming;

+        container virtual-network-service {

+            uses tapi-virtual-network:virtual-network-service;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='VIRTUAL_NETWORK_SERVICE_ENDPOINT'";

+        if-feature tapi-streaming;

+        container virtual-network-service-end-point {

+            uses tapi-virtual-network:virtual-network-service-end-point;

+            description "none";

+        }

+        description "none";

+    }

+    augment "/tapi-streaming:stream-record/tapi-streaming:log-record/tapi-streaming:log-record-body" {

+        when "tapi-streaming:record-content='VIRTUAL_NETWORK_CONSTRAINT'";

+        if-feature tapi-streaming;

+        container virtual-network-constraint {

+            uses tapi-virtual-network:virtual-network-constraint;

+            description "none";

+        }

+        description "none";

+    }

+

+   /**************************

+    * definitions of refrences

+    **************************/

+    grouping available-stream-ref {

+        leaf available-stream-uuid{

+            type leafref {

+                path '/tapi-common:context/tapi-streaming:stream-context/tapi-streaming:available-stream/tapi-streaming:uuid';

+            }

+            description "none";

+        }

+        description "none";

+    }

+    grouping supported-stream-type-ref {

+        leaf supported-stream-type-uuid {

+            type leafref {

+                path '/tapi-common:context/tapi-streaming:stream-context/tapi-streaming:supported-stream-type/tapi-streaming:uuid';

+            }

+            description "none";

+        }

+        description "none";

+    }

+

+   /**************************

+    * package type-definitions

+    **************************/ 

+    identity ALARM_DETECTOR_STATE {

+        description "none";

+    }

+    identity ALARM_DETECTOR_STATE_ACTIVE {

+        base ALARM_DETECTOR_STATE;

+        description "The detector is indicating the operation of the monitored entity is not within acceptable bounds with respect to the specific condition measured.

+            If INTERMITTENT is supported there may be a requirement for persisted unacceptable operation after a problem occurs before ACTIVE is declared. An alternative may be to declare INTERMITTENT.

+            Where INTERMITTENT is supported, ACTIVE indicates the stable presence of a problem.";

+    }

+    identity ALARM_DETECTOR_STATE_INTERMITTENT {

+        base ALARM_DETECTOR_STATE;

+        description "The detector is indicating the operation of the monitored entity is intermittently not within acceptable bounds with respect to the specific condition measured.

+            INTERMITTENT support is optional. Where it is supported there may be a requirement for persisted unacceptable operation after a problem occurs before ACTIVE or INTERMITTENT is declared.";

+    }

+    identity ALARM_DETECTOR_STATE_CLEAR {

+        base ALARM_DETECTOR_STATE;

+        description "The detector is indicating the operation of the monitored entity is within acceptable bounds with respect to the specific condition measured.

+            There may be a requirement for persisted acceptable operation after a problem before clear is declared etc.

+            For a Compacted Log solution a CLEAR alarm will be considered as a DELETE ChangeType in the RecordBody.

+            Hence a CLEAR will also cause a Tombstone record in a Compacted Log solution.";

+    }

+    identity LOG_RECORD_STRATEGY {

+        description "none";

+    }

+    identity LOG_RECORD_STRATEGY_WHOLE_ENTITY_ON_CHANGE {

+        base LOG_RECORD_STRATEGY;

+        description "A record provides a snapshot of a whole entity and a snapshot is taken on each change.

+            The record includes all properties and values whether they have changed or not.";

+    }

+    identity LOG_RECORD_STRATEGY_CHANGE_ONLY {

+        base LOG_RECORD_STRATEGY;

+        description "Each record only provides a view of the changes that have occurred (on a per entity change basis).

+            E.g., the log only includes the attribute that has changed and not other attributes that have not changed.";

+    }

+    identity LOG_RECORD_STRATEGY_WHOLE_ENTITY_PERIODIC {

+        base LOG_RECORD_STRATEGY;

+        description "A snapshot of an entity is recorded periodically regardless of whether there has been change or not.";

+    }

+    identity LOG_STORAGE_STRATEGY {

+        description "none";

+    }

+    identity LOG_STORAGE_STRATEGY_COMPACTED {

+        base LOG_STORAGE_STRATEGY;

+        description "The log uses some mechanism to remove noisy detail whilst enabling the client to achieve eventual consistency (alignment) with current state.";

+    }

+    identity LOG_STORAGE_STRATEGY_TRUNCATED {

+        base LOG_STORAGE_STRATEGY;

+        description "The log only maintains recent records and disposes of old records. 

+            This log does not alone enable the client to achieve alignment with current state.";

+    }

+    identity LOG_STORAGE_STRATEGY_FULL_HISTORY {

+        base LOG_STORAGE_STRATEGY;

+        description "Maintains a history from system initiation with no missing records. 

+            Provides initial state at the beginning of the history";

+    }

+    identity LOG_STORAGE_STRATEGY_FULL_HISTORY_WITH_PERIODIC_BASELINE {

+        base LOG_STORAGE_STRATEGY;

+        description "Provides a history with initial state and periodic/occasional statements of current state at a particular point in time.";

+    }

+    identity STREAM_STATE {

+        description "none";

+    }

+    identity STREAM_STATE_ALIGNING {

+        base STREAM_STATE;

+        description "The log that underpins the stream is aligning with other backend services and hence may not be providing full service.

+            If events are provided, they will be completely valid.";

+    }

+    identity STREAM_STATE_ACTIVE {

+        base STREAM_STATE;

+        description "The stream is operating such that if a client connects records will be provided as per back pressure etc.";

+    }

+    identity STREAM_STATE_PAUSED {

+        base STREAM_STATE;

+        description "Although the stream is available it has been paused by the administrator such that the records are being appended to the log but a new client will not receive any events whilst the stream is paused.";

+    }

+    identity STREAM_STATE_TERMINATED {

+        base STREAM_STATE;

+        description "The stream is essentially no longer available. It will be removed from the AvailableStreams list shortly.";

+    }

+    identity RECORD_TYPE {

+        description "none";

+    }

+    identity RECORD_TYPE_CREATE_UPDATE {

+        base RECORD_TYPE;

+        description "The record includes a create or update.

+            Where there is an update in a non-compacted log the information with be sparse (e.g., a single attribute) and about an entity that is already known.";

+    }

+    identity RECORD_TYPE_DELETE {

+        base RECORD_TYPE;

+        description "The record is about a delete.

+            The record may have a LogRecordHeader and a LogRecordBody but no augmented content.

+            The entityKey should be sufficient to identify the entity to be deleted.

+            Under certain circumstances there may be class content in the LogRecordBody.";

+    }

+    identity RECORD_TYPE_TOMBSTONE {

+        base RECORD_TYPE;

+        description "Used in a Compacted log to remove old records and truncate deletion history.

+            Is only a LogRecordHeader with no LogRecordBody.";

+    }

+    identity SOURCE_PRECISION {

+        description "none";

+    }

+    identity SOURCE_PRECISION_UNKNOWN {

+        base SOURCE_PRECISION;

+        description "The state of the clock at the event source is not known.

+            The view of time of day at the source is suspect.";

+    }

+    identity SOURCE_PRECISION_FREE_RUNNING {

+        base SOURCE_PRECISION;

+        description "The clock at the event source is free-running.

+            The view of time of day at the source may be significantly different from that at other sources.";

+    }

+    identity SOURCE_PRECISION_SYNCHRONIZED {

+        base SOURCE_PRECISION;

+        description "The clock at the event source is appropriately synchroniZed to the timing master.

+            The view of time of day at the source should be essentially the same as that at other time-synchronized sources.";

+    }

+    identity SPREAD {

+        description "none";

+    }

+    identity SPREAD_AT {

+        base SPREAD;

+        description "The event occurred at a particular time.";

+    }

+    identity SPREAD_BEFORE {

+        base SPREAD;

+        description "The event occurred before a particular time.";

+    }

+    identity SPREAD_AFTER {

+        base SPREAD;

+        description "The event occurred after a particular time.";

+    }

+    identity SPREAD_BETWEEN {

+        base SPREAD;

+        description "The event occurred between two stated times.";

+    }

+    identity CONDITION_DETECTOR_TYPE {

+        description "none";

+    }

+    identity CONDITION_DETECTOR_TYPE_ALARM_DETECTOR {

+        base CONDITION_DETECTOR_TYPE;

+        description "A type of detector used for reporting problems.

+            The underlying raw detector is two state from the perspective of the monitored condition. 

+            The detector is asymmetric in nature. 

+            One state indicates that there is a problem and the other state indicates that there is no problem.";

+    }

+    identity CONDITION_DETECTOR_TYPE_EVENT_DETECTOR {

+        base CONDITION_DETECTOR_TYPE;

+        description "A type of detector used for reporting events.";

+    }

+    typedef alarm-detector-state {

+        type identityref {

+            base ALARM_DETECTOR_STATE;

+        }

+        description "The state of the processed Boolean alarm detector.

+            The source applies some analysis to the raw detector to determine the state.

+            The processing by the source my vary.";

+    }

+    grouping legacy-properties {

+        leaf perceived-severity {

+            type perceived-severity;

+            description "A device will provide an indication of importance for each alarm. 

+                This property indicates the importance.

+                In some cases, the severity may change through the life of an active alarm.";

+        }

+        leaf service-affect {

+            type service-affect;

+            description "Some devices will indicate, from its very narrow viewpoint, whether service has been impacted or not.

+                This property carries this detail.";

+        }

+        leaf is-acknowledged {

+            type boolean;

+            description "Devices offer a capability to acknowledge alarms (to stop the bells ringing).

+                Often an EMS will offer a similar capability.

+                This property reflects the current acknowledge state.";

+        }

+        leaf-list additional-alarm-info {

+            type string;

+            description "Often, alarms raised by devices have additional information. 

+                This property can be used to convey this.";

+        }

+        description "At this point in the evolution of control solutions LegacyProperties are probably mandatory, however, it is anticipated that as control solutions advance the LegacyProperties will become irrelevant.";

+    }

+    typedef log-record-strategy {

+        type identityref {

+            base LOG_RECORD_STRATEGY;

+        }

+        description "Defines the different approaches for logging information about an event covering the log trigger and the log content.";

+    }

+    typedef log-storage-strategy {

+        type identityref {

+            base LOG_STORAGE_STRATEGY;

+        }

+        description "Defines the storage (record retention) approach.";

+    }

+    typedef object-class-identifier {

+        type enumeration {

+            enum NODE {

+                description "Node.

+                    A GlobalClass.";

+            }

+            enum CONNECTION {

+                description "Connection.

+                    A GlobalClass.";

+            }

+            enum LINK {

+                description "Link.

+                    A GlobalClass.";

+            }

+            enum CONNECTION_END_POINT {

+                description "ConnectionEndPoint.

+                    A GlobalClass.";

+            }

+            enum CONNECTIVITY_SERVICE {

+                description "ConnectivityService.

+                    A GlobalClass.";

+            }

+            enum INTER_RULE_GROUP {

+                description "InterRuleGroup.

+                    A GlobalClass.";

+            }

+            enum MAINTENANCE_ENTITY {

+                description "MaintenanceEntity.

+                    A GlobalClass.";

+            }

+            enum MAINTENANCE_ENTITY_GROUP {

+                description "Meg.

+                    A GlobalClass.";

+            }

+            enum MEG_END_POINT {

+                description "Mep.

+                    A LocalClass. 

+                    For streaming this requires parentAddress (when reporting the entity alone) or a combination of measuredEntityUuid and measuredEntityLocalId when reporting conditions.";

+            }

+            enum MEG_INTERMEDIATE_POINT {

+                description "Mip.

+                    A LocalClass. 

+                    For streaming this requires parentAddress (when reporting the entity alone) or a combination of measuredEntityUuid and measuredEntityLocalId when reporting conditions. ";

+            }

+            enum NODE_EDGE_POINT {

+                description "NodeEdgePoint.

+                    A GlobalClass.";

+            }

+            enum OAM_JOB {

+                description "OamJob.

+                    A GlobalClass.";

+            }

+            enum PATH {

+                description "Path.

+                    A GlobalClass.";

+            }

+            enum NODE_RULE_GROUP {

+                description "NodeRuleGroup.

+                    A GlobalClass.";

+            }

+            enum PATH_COMPUTATION_SERVICE {

+                description "PathComputationService.

+                    A GlobalClass.";

+            }

+            enum ROUTE {

+                description "Route.

+                    A LocalClass. 

+                    For streaming this requires parentAddress (when reporting the entity alone) or a combination of measuredEntityUuid and measuredEntityLocalId when reporting conditions";

+            }

+            enum RULE {

+                description "Rule.

+                    A LocalClass. 

+                    For streaming this requires parentAddress (when reporting the entity alone) or a combination of measuredEntityUuid and measuredEntityLocalId when reporting conditions";

+            }

+            enum SERVICE_INTERFACE_POINT {

+                description "ServiceInterfacePoint.

+                    A GlobalClass.";

+            }

+            enum SWITCH {

+                description "Switch.

+                    A LocalClass. 

+                    For streaming this requires parentAddress (when reporting the entity alone) or a combination of measuredEntityUuid and measuredEntityLocalId when reporting conditions";

+            }

+            enum SWITCH_CONTROL {

+                description "SwitchControl.

+                    A GlobalClass.";

+            }

+            enum TOPOLOGY {

+                description "Topology.

+                    A GlobalClass.";

+            }

+            enum VIRTUAL_NETWORK_SERVICE {

+                description "VirtualNetworkService.

+                    A GlobalClass.";

+            }

+            enum OAM_PROFILE {

+                description "OamProfile.

+                    A GlobalClass.";

+            }

+            enum OAM_SERVICE {

+                description "OamService.

+                    A GlobalClass.";

+            }

+            enum CONNECTION_SPEC {

+                description "ConnectionSpec.

+                    A class that is a representation of the definition that an instance of a Connection references. This has a globally unique id.";

+            }

+            enum ACCESS_PORT {

+                description "AccessPort.

+                    A GlobalClass.";

+            }

+            enum DEVICE {

+                description "Device.

+                    A GlobalClass.";

+            }

+            enum PHYSICAL_SPAN {

+                description "PhysicalSpan.

+                    A GlobalClass.";

+            }

+            enum EQUIPMENT {

+                description "Equipment.

+                    A GlobalClass.";

+            }

+            enum HOLDER {

+                description "Holder.

+                    A GlobalClass.";

+            }

+            enum CONDITION_DETECTOR {

+                description "ConditionDetector.

+                    Has an id approach that allows for the measured entity to have a NativeId, or UUID or ID combination.";

+            }

+            enum AVAILABLE_STREAM {

+                description "AvailableStream.

+                    A GlobalClass.";

+            }

+            enum STREAM_MONITOR {

+                description "StreamMonitor.

+                    A GlobalClass.";

+            }

+            enum SUPPORTED_STREAM_TYPE {

+                description "SupportedStream.

+                    A GlobalClass.";

+            }

+            enum NETWORK_TOPOLOGY_SERVICE {

+                description "NetworkTopologyService.

+                    A GlobalClass.";

+            }

+            enum TAPI_CONTEXT {

+                description "TapiContext.

+                    A GlobalClass.";

+            }

+            enum OAM_SERVICE_END_POINT {

+                description "OamServiceEndPoint.

+                    Local class. For streaming this requires parentAddress (when reporting the entity alone) or a combination of measuredEntityUuid and measuredEntityLocalId when reporting conditions.";

+            }

+            enum PM_BIN_DATA {

+                description "PmBinData.

+                    Local class. For streaming this requires parentAddress (when reporting the entity alone) or a combination of measuredEntityUuid and measuredEntityLocalId when reporting conditions.";

+            }

+            enum PM_CURRENT_DATA {

+                description "PmCurrentData.

+                    Local class. For streaming this requires parentAddress (when reporting the entity alone) or a combination of measuredEntityUuid and measuredEntityLocalId when reporting conditions.";

+            }

+            enum PM_HISTORY_DATA {

+                description "PmHistoryData.

+                    Local class. For streaming this requires parentAddress (when reporting the entity alone) or a combination of measuredEntityUuid and measuredEntityLocalId when reporting conditions.";

+            }

+            enum PM_THRESHOLD_DATA {

+                description "PmThresholdData.

+                    Local class. For streaming this requires parentAddress (when reporting the entity alone) or a combination of measuredEntityUuid and measuredEntityLocalId when reporting conditions.";

+            }

+            enum CONNECTIVITY_SERVICE_END_POINT {

+                description "ConnectivityServiceEndPoint.

+                    Local class. For streaming this requires parentAddress (when reporting the entity alone) or a combination of measuredEntityUuid and measuredEntityLocalId when reporting conditions.";

+            }

+            enum ABSTRACT_STRAND {

+                description "AbstractStrand.

+                    Local class. For streaming this requires parentAddress (when reporting the entity alone) or a combination of measuredEntityUuid and measuredEntityLocalId when reporting conditions.";

+            }

+            enum PATH_OBJECTIVE_FUNCTION {

+                description "PathObjectiveFunction.

+                    Local class. For streaming this requires parentAddress (when reporting the entity alone) or a combination of measuredEntityUuid and measuredEntityLocalId when reporting conditions.";

+            }

+            enum PATH_OPTIMIZATION_CONSTRAINT {

+                description "PathOptimizationConstraint.

+                    Local class. For streaming this requires parentAddress (when reporting the entity alone) or a combination of measuredEntityUuid and measuredEntityLocalId when reporting conditions.";

+            }

+            enum PATH_SERVICE_END_POINT {

+                description "PathServiceEndPoint.

+                    Local class. For streaming this requires parentAddress (when reporting the entity alone) or a combination of measuredEntityUuid and measuredEntityLocalId when reporting conditions.";

+            }

+            enum VIRTUAL_NETWORK_CONSTRAINT {

+                description "VirtualNetworkConstraint.

+                    Local class. For streaming this requires parentAddress (when reporting the entity alone) or a combination of measuredEntityUuid and measuredEntityLocalId when reporting conditions.";

+            }

+            enum VIRTUAL_NETWORK_SERVICE_END_POINT {

+                description "VirtualNetworkServiceEndPoint.

+                    Local class. For streaming this requires parentAddress (when reporting the entity alone) or a combination of measuredEntityUuid and measuredEntityLocalId when reporting conditions.";

+            }

+            enum ANY_CLASS {

+                description "Empty structure.";

+            }

+        }

+        description "The list of TAPI Global Object Class types for which a record can be streamed.";

+    }

+    typedef stream-state {

+        type identityref {

+            base STREAM_STATE;

+        }

+        description "The state of the available stream.";

+    }

+    grouping approx-date-and-time {

+        leaf primary-time-stamp {

+            type tapi-common:date-and-time;

+            config false;

+            description "Time of the event at the origin where known precisely.

+                Where the event is known to be before particular time, this field records that time.

+                Where the event is known to be after a particular time, this field records that time (this is an unusual case where there is no proposed before time).

+                Where the event is known to have occurred in a time window, this field records the end time (the time before which the event must have occurred).";

+        }

+        leaf start-time-stamp {

+            type tapi-common:date-and-time;

+            config false;

+            description "The time after which the event is known to have occurred when the event is known to have occurred between two times.

+                The primaryTimeStamp provides the end time.";

+        }

+        leaf spread {

+            type spread;

+            config false;

+            description "Indicates the knowledge of the time of occurrence of the event.";

+        }

+        leaf source-precision {

+            type source-precision;

+            config false;

+            description "Indicates how well the source time is synchronized with network time.";

+        }

+        description "Allows for recording of an aspect of imprecise time.";

+    }

+    typedef record-type {

+        type identityref {

+            base RECORD_TYPE;

+        }

+        description "The type of the record.

+            Used to understand what log content will be present and how to interpret it.

+            For some record types there is special encoding.

+            A ACTIVE alarm and an INTERMITTENT alarm are CREATE_UPDATE.

+            A CLEAR alarm is DELETE with an adjacent TOMBSTONE record.";

+    }

+    typedef source-precision {

+        type identityref {

+            base SOURCE_PRECISION;

+        }

+        description "Alternative statements about timing precision at the event source.";

+    }

+    typedef spread {

+        type identityref {

+            base SPREAD;

+        }

+        description "The alternative time of occurrence statements.";

+    }

+    typedef condition-detector-type {

+        type identityref {

+            base CONDITION_DETECTOR_TYPE;

+        }

+        description "The type of condition detector.

+            The type relates to the characteristics of the detection and reporting strategies.

+            This drives the conditional augment.";

+    }

+    typedef event-source {

+        type enumeration {

+            enum RESOURCE_OPERATION {

+                description "The event is from the operation of the network resources.

+                    The event source has a relatively fast time characteristic.";

+            }

+            enum MANAGEMENT_OPERATION {

+                description "Event is from a Management operation (slow control).

+                    The event source has a relatively slow time characteristic.";

+            }

+            enum UNKNOWN {

+                description "The origin of the event is not known.";

+            }

+        }

+        description "Source of the event.

+            Use to give some idea of the time characteristics of the event source.";

+    }

+    typedef perceived-severity {

+        type enumeration {

+            enum CRITICAL {

+                description "The highest severity of ACTIVE/INTERMITTENT alarm.";

+            }

+            enum MAJOR {

+                description "The middle severity of ACTIVE/INTERMITTENT alarm.";

+            }

+            enum MINOR {

+                description "The lowest severity of ACTIVE/INTERMITTENT alarm.";

+            }

+            enum WARNING {

+                description "An extremely low importance ACTIVE/INTERMITTENT alarm (lower than MINOR).";

+            }

+            enum CLEARED {

+                description "The severity of a CLEAR where no other severity information is available.";

+            }

+        }

+        description "The values for importance of an ACTIVE, INTERMITTENT or CLEAR alarm.";

+    }

+    typedef service-affect {

+        type enumeration {

+            enum SERVICE_AFFECTING {

+                description "The condition is believed to impact service.";

+            }

+            enum NOT_SERVICE_AFFECTING {

+                description "The condition is believed to not impact service.";

+            }

+            enum UNKNOWN {

+                description "The service impact of the condition is not known.";

+            }

+        }

+        description "Indicates whether the device considers the condition to be impacting service.

+            Note that the detected condition along with knowledge of the topology and protection provide a more suitable approach.";

+    }

+

+    /**************************

+    * package object-classes

+    **************************/ 

+    grouping compacted-log-details {

+        leaf tombstone-retention {

+            type string;

+            config false;

+            description "Time in minutes.

+                The time period for which a Tombstone record will be held in the log from when it was logged. 

+                This provides an adjustment to the essential Compaction strategy such that after the tombstoneRetention period there will be no records about a particular thing that existed but no longer exists.

+                Tombstone retention overrides recordRetention for Tombstones.

+                Key word 'FOREVER' means that Tombstone records will never be removed from the log.

+                Can be adjusted by an administrator (via a separate view) through the life of the stream.";

+        }

+        leaf compaction-delay {

+            type string;

+            config false;

+            description "Time in minutes. 

+                The delay between logging the record and making the record available for compaction.

+                This provides an adjustment to the essential Compaction strategy such that there may be several distinct records for the same thing in the where those records are not older than the Compaction Delay.

+                Can be adjusted by an administrator (via a separate view) through the life of the stream.";

+        }

+        description "Details relevant for a CompactedLog.

+            The essential Compacted Log strategy is to remove historic records about a particular thing such that only the latest record about each thing exists in the log.

+            The essential strategy is refined by the parameters of this structure.";

+    }

+    grouping alarm-condition-detector-detail {

+        leaf alarm-detector-state {

+            type alarm-detector-state;

+            config false;

+            description "The state of the detector.

+                The detector state accounts for the time characteristics of the detected condition.";

+        }

+        container legacy-properties {

+            config false;

+            uses legacy-properties;

+            description "Alarm systems of the 20th century were based primarily on local lamps (initially filament bulbs) and bells.

+                Lamps can only be on or off, and bells sounding or not sounding, so alarms were Boolean in nature.

+                Where a detector was essentially multi-state it was converted into multiple Boolean statements.

+                The management of the equipments was essentially human only and local only (there were rarely remote systems).

+                The device with the problem was the only possible indicator of importance and it had only three distinct bulbs to illuminate (filament bulbs tend to fail requiring costly replacement).

+                The devices were relatively simple in function and analysis of the detectors was crude.

+                There was only the device to indicate severity

+                The device also could provide the best view as to whether a service was impacted, although clearly it had almost no knowledge.

+                In a modern solution with well-connected remote systems that increasingly analyze problems and where there is increasingly 'lights out' building operation, the device's guess at severity etc. is irrelevant.

+                In addition, with sophisticated resilience mechanisms, the device cannot make any relevant statement on whether the customer service has been impacted.

+                Likewise, in a world where there were no remote systems and local management was the only practice, alarms had to be locally 'acknowledged'. 

+                Where there are remote systems, per alarm acknowledge is burdensome.

+                However, many solutions and operational practices continue to use the historic schemes.

+                On that basis, the schemes are supported but relegated to optional.";

+        }

+        description "A record of the state of a detector where that detector has two underling states that are of asymmetric importance.";

+    }

+    grouping condition-detector {

+        leaf condition-native-name {

+            type string;

+            config false;

+            description "The name used for the Condition by the source of the information.";

+        }

+        leaf measured-entity-uuid {

+            type tapi-common:uuid;

+            config false;

+            description "The uuid of the TAPI entity that represents the entity measured at source.

+                If the TAPI entity cannot be identified as it cannot be mapped, then this property can be omitted.

+                If the TAPI entity is a local class, then this is the UUID of the GlobalClass parent of the entity of which this is part.";

+        }

+        leaf measured-entity-native-id {

+            type string;

+            config false;

+            description "The identifier (invariant over the life) of the instance of the measured entity at the source.";

+        }

+        leaf condition-normalized-name {

+            type string;

+            config false;

+            description "It is often the case that there is a Condition Name that is commonly used or even standardized that has not been used by the source of the condition. 

+                If this is the case, then that common/standard name is provided in via this property.";

+        }

+        leaf measured-entity-class {

+            type object-class-identifier;

+            config false;

+            description "The TAPI class of the measured entity. 

+                If the class cannot be identified as it cannot be mapped, then this property can be omitted.";

+        }

+        leaf detector-uuid {

+            type tapi-common:uuid;

+            config false;

+            description "The uuid of the TAPI entity that represents the detector.

+                If the TAPI entity cannot be identified as it cannot be mapped, then this property can be omitted.

+                Where the detector is not modelled independently, but instead is a part of the measured entity such that it is identified by a 'local id' built from the UUID of the measured entity and the condition name, then this property may be omitted.";

+        }

+        leaf detector-native-id {

+            type string;

+            config false;

+            description "The identifier (invariant over the life) of the instance of the detector at the source (e.g. a device).

+                The string reported in this field must include the:

+                - device identifier

+                - one or more resource identifiers including that of the measured entity

+                It need not include the condition name.

+                ";

+        }

+        leaf condition-detector-type {

+            type condition-detector-type;

+            config false;

+            description "Identifies the type of detector.

+                This drives the conditional augmentation. 

+                Some types of detector may not need specific augmentation.

+                ";

+        }

+        leaf-list measured-entity-local-id {

+            type string;

+            config false;

+            description "Where the measured entity is a local class and hence does not have a UUID the local ID is provided in conjunction with the parents ID. 

+                The parent may also be a local class in which case its ID is a a local ID along with its parent ID.

+                There will be a parent which is a global class which then supplies a UUID.

+                The ID of the entity that is being measured is the combination of the UUID and the ordered list of local IDs.

+                The local ID may not be provided where:

+                - the report about a global class

+                - the report is relying on the detectorNativeId.";

+        }

+        description "ConditionDetector represents any monitoring component that assesses properties of something and determines from those properties what conditions are associated with the thing.

+            For example, a thing might be 'too hot' or might be 'unreliable'.

+            The monitor may a multi-state output. 

+            The ConditionDetector lifecycle depends upon the lifecycle of the thing it is monitoring (this is a general OAM model consideration).

+            The entityKey in the AppendLogRecordHeader for a ConditionDetector record is the nativeDetector Id which may be derived from other ids (most robustly, nativeOwningEntityName (to which the detector is associated) + natveConditionName).";

+    }

+    grouping any-class {

+        description "In the final version all classes that can stream will be explicitly associated with the AppendLogRecordBody";

+    }

+    grouping stream-admin-context {

+        list stream-monitor {

+            key 'uuid';

+            config false;

+            uses stream-monitor;

+            description "The list of available stream monitors.";

+        }

+        uses tapi-common:global-class;

+        description "Context providing access to stream administration functionality.";

+    }

+    grouping stream-monitor {

+        leaf id-of-last-record-read-from-log {

+            type string;

+            config false;

+            description "The id/key of the last record read from the log by the client stream.

+                The analysis of this value needs to account for stream buffering in the comms layer.";

+        }

+        leaf id-of-last-record-written-to-log {

+            type string;

+            config false;

+            description "The id/key of the last record written to the log. 

+                This is the same value for all clients of the stream.";

+        }

+        container available-stream {

+            uses available-stream-ref;

+            config false;

+            description "none";

+        }

+        leaf client-id {

+            type string;

+            config false;

+            description "The id of the connected client.";

+        }

+        leaf last-updated {

+            type tapi-common:date-and-time;

+            config false;

+            description "The date/time when the values provided were recorded.";

+        }

+        leaf client-address {

+            type string;

+            config false;

+            description "The address of the connected client that is being monitored.";

+        }

+        uses tapi-common:global-class;

+        description "Information on the monitoring of the use of a specific AvailableStream.";

+    }

+    grouping connection-protocol-details {

+        leaf-list allowed-connection-protocols {

+            type string;

+            config false;

+            description "Name of the allowed protocol.";

+        }

+        description "Details of the connection protocols available for the specific stream.";

+    }

+    grouping available-stream {

+        leaf connection-address {

+            type string;

+            config false;

+            description "Provides the address for the connection. 

+                The format of the address and attachment mechanism will depend on the connection protocol defined in another attribute of this class.";

+        }

+        leaf stream-state {

+            type stream-state;

+            config false;

+            description "The state of the stream.";

+        }

+        container supported-stream-type {

+            uses supported-stream-type-ref;

+            config false;

+            description "Identifies the type of stream that is available for connection.";

+        }

+        leaf stream-id {

+            type string;

+            config false;

+            description "The id of the stream.";

+        }

+        leaf connection-protocol {

+            type string;

+            config false;

+            description "Names the connection protocol for this particular available stream.

+                The connection protocol is chosen from the list of connection protocols identified in the referenced SupportedStreamType.";

+        }

+        uses tapi-common:global-class;

+        description "Details of stream a stream that can be connected to by a client application.";

+    }

+    grouping stream-context {

+        list available-stream {

+            key 'uuid';

+            config false;

+            uses available-stream;

+            description "none";

+        }

+        list supported-stream-type {

+            key 'uuid';

+            config false;

+            uses supported-stream-type;

+            description "none";

+        }

+        description "All streams relevant to the specific TapiContext.";

+    }

+    grouping supported-stream-type {

+        leaf stream-type-name {

+            type string;

+            config false;

+            description "Name of the stream type.";

+        }

+        leaf record-retention {

+            type string;

+            config false;

+            description "Time in minutes.

+                Statement of retention time and/or retention capacity in bytes.

+                Key word 'FOREVER' means that records will never be removed from the log.

+                May be overridden for particular cases of specific LogStorageStrategy (via augment).";

+        }

+        leaf segment-size {

+            type string;

+            config false;

+            description "Size of sub-structuring of the log.";

+        }

+        leaf-list record-content {

+            type object-class-identifier;

+            description "Identifies the classes that are supported through the stream. 

+                The list may be a subset of the classes within the context.";

+        }

+        leaf log-storage-strategy {

+            type log-storage-strategy;

+            config false;

+            description "Indicates the storage characteristics of the log supporting the stream.";

+        }

+        leaf log-record-strategy {

+            type log-record-strategy;

+            config false;

+            description "Indicates the type of content of each log record.";

+        }

+        uses tapi-common:global-class;

+        description "Definition of a supported stream type.";

+    }

+    grouping log-record {

+        container log-record-header {

+            config false;

+            uses log-record-header;

+            description "The header of the log record providing general parameters of the record common to all records.";

+        }

+        container log-record-body {

+            config false;

+            uses log-record-body;

+            description "The body of the log record providing specific logged details.";

+        }

+        description "A specific atomic entry in a log.";

+    }

+    grouping log-record-body {

+        container event-time-stamp {

+            config false;

+            uses approx-date-and-time;

+            description "Time of the event at the origin of the event that triggered the generation of the record. 

+                The structure allows for time uncertainty.";

+        }

+        leaf event-source {

+            type event-source;

+            config false;

+            description "Indicates whether the source is controlled (under management control) or potentially chaotic (under resource control).

+                The time characteristic of the source may be determined from the metadata describing the resource (e.g., a detector).

+                Where there is an alternative (and probably more detailed) source of information on time characteristic this attribute can be omitted.";

+        }

+        list additional-event-info {

+            key 'value-name';

+            config false;

+            uses tapi-common:name-and-value;

+            description "Addition information related to the event such as change reason where changeReason would be the name and the value text would provide information on the reason for change.";

+        }

+        leaf-list parent-address {

+            type string;

+            config false;

+            description "Where the entity is a local class this provides the ordered list of ids from the closest global class (a UUID cast as a string) to the direct parent (which may be the global class).

+                The field can include all entities back to the Context and hence can be used for global classes where the tree is being represented in full.

+                Gives the position of the entity in the address tree (usually containment) that is raising the event by providing the name/id values in the address of the parent.

+                Is the sequence of named levels in the tree up to but excluding the entity of the notification. 

+                It includes the device id where relevant.";

+        }

+        leaf record-content {

+            type object-class-identifier;

+            config false;

+            description "The identifier of the object class in the record body detail.

+                This property is used to control the conditional augmentation of the body with detail.";

+        }

+        description "The specific details of the Record.";

+    }

+    grouping log-record-header {

+        leaf tapi-context {

+            type tapi-common:uuid;

+            config false;

+            description "The identifier of the context.";

+        }

+        leaf token {

+            type string;

+            config false;

+            description "A coded (and compact) form of the fullLogRecordOffsetId.

+                This property is used to request streaming from a particular point (e.g., the last correctly handled record).";

+        }

+        list full-log-record-offset-id {

+            key 'value-name';

+            config false;

+            min-elements 1;

+            uses tapi-common:name-and-value;

+            description "In a complex log solution there may be various parts to the log.

+                The record token is a compressed form of log record reference.

+                This property provides the verbose form 

+                For example, it may include:

+                - stream id

+                - topic

+                - partition

+                - partition offset

+                - sequence number (the offset is essentially the sequence number associated with the partition)";

+        }

+        leaf log-append-time-stamp {

+            type tapi-common:date-and-time;

+            config false;

+            description "The time when the record was appended to the log.";

+        }

+        leaf entity-key {

+            type string;

+            config false;

+            description "The identifier of the entity that is used in a Compacted log as the compaction key.

+                The entityKey value, where appropriate, may be based upon the identifiers from the event source.

+                It can be built from some specific detail combination that meets the necessary uniqueness and durability requirements.

+                entityKey is the value used during compaction.

+                Ideally it is a UUID format, if this can be formed from the source identifier.";

+        }

+        leaf record-type {

+            type record-type;

+            config false;

+            description "The type of the record.

+                Can be used to understand which elements of the record will be present.";

+        }

+        leaf record-authenticity-token {

+            type string;

+            config false;

+            description "none";

+        }

+        description "The header of the log record providing general parameters of the record common to all records.";

+    }

+    notification stream-record {

+        uses stream-record;

+        description "none";

+    }

+    grouping stream-record {

+        list log-record {

+            config false;

+            uses log-record;

+            description "Each stream record may include a number of log records.";

+        }

+        description "The stream content.";

+    }

+

+    /**************************

+    * package interfaces

+    **************************/ 

+    rpc connect-to-stream {

+        description "none";

+        input {

+            leaf start-from-token {

+                type string;

+                description "none";

+            }

+            leaf connection-address {

+                type string;

+                description "none";

+            }

+        }

+    }

+    rpc get-available-stream-connection-details {

+        description "none";

+        output {

+            list active-connections {

+                uses available-stream;

+                description "none";

+            }

+        }

+    }

+    rpc get-supported-stream-connection-types {

+        description "none";

+        output {

+            list supported-stream-types {

+                uses supported-stream-type;

+                description "none";

+            }

+        }

+    }

+

+}

diff --git a/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-topology@2020-04-23.yang b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-topology@2020-04-23.yang
new file mode 100644
index 0000000..36075d7
--- /dev/null
+++ b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-topology@2020-04-23.yang
@@ -0,0 +1,926 @@
+module tapi-topology {

+    namespace "urn:onf:otcc:yang:tapi-topology";

+    prefix tapi-topology;

+    import tapi-common {

+        prefix tapi-common;

+    }

+    organization "ONF OTCC (Open Transport Configuration & Control) Project";

+    contact "

+         Project Web: <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OTCC/TAPI__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_yiFzE6g$ >

+         Project List: <mailto:transport-api@opennetworking.org>

+         Editor: Karthik Sethuraman <mailto:karthik.sethuraman@necam.com>

+         Andrea Mazzin <mailto:andrea.mazzini@nokia.com>

+         Arturo Mayoral <mailto:arturo.mayoral@telefonica.com>

+         Nigel Davis <mailto:ndavis@ciena.com>";

+    description "

+        This module contains TAPI Topology Model definitions.

+        Source: TapiTopology.uml

+        - The TAPI YANG models included in this TAPI release are a *normative* part of the TAPI SDK.

+        - The YANG specifications have been generated from the corresponding UML model using the [ONF EAGLE UML2YANG mapping tool]

+          <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/EagleUmlYang__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_6pxiNxl$ >

+          and further edited manually to comply with the [ONF IISOMI UML2YANG mapping guidelines]

+          <https://urldefense.com/v3/__https://wiki.opennetworking.org/display/OIMT/UML*-*YANG*Guidelines__;Kysr!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_wxKUbJ_$ >

+        - Status of YANG model artifacts can be determined by referring to the corresponding UML artifacts.

+          As described in the UML models, some artifacts are considered *experimental*, and thus the corresponding YANG artifacts.

+        - The ONF TAPI release process does not guarantee backward compatibility of YANG models across major versions of TAPI releases.

+          The YANG model backward compatibility criteria are outlined in section 11 of <https://urldefense.com/v3/__https://tools.ietf.org/html/rfc7950__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_zcAY1P4$ >.

+          YANG models included in this release may not be backward compatible with previous TAPI releases.

+        Copyright (c) 2018 Open Networking Foundation (ONF). All rights reserved.

+        License: This module is distributed under the Apache License 2.0.";

+    revision 2020-04-23 {

+        description "ONF Transport API version 2.1.3.

+                   Changes included in this TAPI release (v2.1.3) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop_v2_1/CHANGE_LOG/change-log.2.1.3.md__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_xm1nx_D$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_8UH3XnH$ >";

+    }

+    revision 2019-07-16 {

+        description "ONF Transport API version 2.1.2.

+                   Changes included in this TAPI release (v2.1.2) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop_v2_1/CHANGE_LOG/change-log.2.1.2.md__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_0xFu4bN$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_8UH3XnH$ >";

+    }

+    revision 2018-12-10 {

+        description "ONF Transport API version 2.1.1.

+                   Changes included in this TAPI release (v2.1.1) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.1.1.md__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur__2p0od1$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_8UH3XnH$ >";

+    }

+    revision 2018-10-16 {

+        description "ONF Transport API version 2.1.0.

+                   Changes included in this TAPI release (v2.1.0) are listed in

+                   <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.1.0.md__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_4DGi8ul$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_8UH3XnH$ >";

+    }

+    revision 2018-03-07 {

+        description "ONF Transport API version 2.0.2

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.2.md__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_8KlxwJZ$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.2/UML__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_-hMD5Xl$ >";

+    }

+    revision 2018-02-16 {

+        description "ONF Transport API version 2.0.1

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.1.md__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur__C1vuym$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.1/UML__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_5DYNwzZ$ >";

+    }

+    revision 2018-01-02 {

+        description "ONF Transport API version 2.0.0

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.0.md__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_1xZSBRA$ >";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://urldefense.com/v3/__https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.0/UML__;!!OSsGDw!bx-l35NqfQHpJ8R_DmXfi2NX2ll5dMl9VbK5aS_m3ZShiVoz74Ur_xt-GtqY$ >";

+    }

+    augment "/tapi-common:context" {

+        container topology-context {

+            uses topology-context;

+            description "Augments the base TAPI Context with TopologyService information";

+        }

+        description "Augments the base TAPI Context with TopologyService information";

+    }

+

+   /**************************

+    * definitions of refrences

+    **************************/

+    grouping topology-ref {

+        leaf topology-uuid {

+            type leafref {

+                path '/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:uuid';

+            }

+            description "none";

+        }

+        description "none";

+    }

+    grouping link-ref {

+        uses topology-ref;

+        leaf link-uuid {

+            type leafref {

+                path '/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:link/tapi-topology:uuid';

+            }

+            description "none";

+        }

+        description "none";

+    }

+    grouping node-ref {

+        uses topology-ref;

+        leaf node-uuid {

+            type leafref {

+                path '/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:uuid';

+            }

+            description "none";

+        }

+        description "none";

+    }

+    grouping node-edge-point-ref {

+        uses node-ref;

+        leaf node-edge-point-uuid {

+            type leafref {

+                path '/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:owned-node-edge-point/tapi-topology:uuid';

+            }

+            description "none";

+        }

+        description "none";

+    }

+    grouping node-rule-group-ref {

+        uses node-ref;

+        leaf node-rule-group-uuid {

+            type leafref {

+                path '/tapi-common:context/tapi-topology:topology-context/tapi-topology:topology/tapi-topology:node/tapi-topology:node-rule-group/tapi-topology:uuid';

+            }

+            description "none";

+        }

+        description "none";

+    }

+

+   /**************************

+    * package object-classes

+    **************************/ 

+    grouping link {

+        list node-edge-point {

+            uses node-edge-point-ref;

+            key 'topology-uuid node-uuid node-edge-point-uuid';

+            config false;

+            min-elements 2;

+            description "none";

+        }

+        leaf-list layer-protocol-name {

+            type tapi-common:layer-protocol-name;

+            config false;

+            min-elements 1;

+            description "none";

+        }

+        leaf direction {

+            type tapi-common:forwarding-direction;

+            config false;

+            description "The directionality of the Link.

+                Is applicable to simple Links where all LinkEnds are BIDIRECTIONAL (the Link will be BIDIRECTIONAL) or UNIDIRECTIONAL (the Link will be UNIDIRECTIONAL).

+                Is not present in more complex cases.";

+        }

+        container resilience-type {

+            uses resilience-type;

+            description "none";

+        }

+        uses tapi-common:resource-spec;

+        uses tapi-common:admin-state-pac;

+        uses tapi-common:capacity-pac;

+        uses transfer-cost-pac;

+        uses transfer-integrity-pac;

+        uses transfer-timing-pac;

+        uses risk-parameter-pac;

+        uses validation-pac;

+        uses layer-protocol-transition-pac;

+        description "The Link object class models effective adjacency between two or more ForwardingDomains (FD). ";

+    }

+    grouping node {

+        list owned-node-edge-point {

+            key 'uuid';

+            config false;

+            uses node-edge-point;

+            description "none";

+        }

+        list aggregated-node-edge-point {

+            uses node-edge-point-ref;

+            key 'topology-uuid node-uuid node-edge-point-uuid';

+            config false;

+            description "none";

+        }

+        list node-rule-group {

+            key 'uuid';

+            uses node-rule-group;

+            description "none";

+        }

+        container encap-topology {

+            uses topology-ref;

+            config false;

+            description "none";

+        }

+        leaf-list layer-protocol-name {

+            type tapi-common:layer-protocol-name;

+            config false;

+            min-elements 1;

+            description "none";

+        }

+        uses tapi-common:resource-spec;

+        uses tapi-common:admin-state-pac;

+        uses tapi-common:capacity-pac;

+        uses transfer-cost-pac;

+        uses transfer-integrity-pac;

+        uses transfer-timing-pac;

+        description "The ForwardingDomain (FD) object class models the ForwardingDomain topological component which is used to effect forwarding of transport characteristic information and offers the potential to enable forwarding.

+            At the lowest level of recursion, an FD (within a network element (NE)) represents a switch matrix (i.e., a fabric). Note that an NE can encompass multiple switch matrices (FDs). ";

+    }

+    grouping topology {

+        list node {

+            key 'uuid';

+            config false;

+            uses node;

+            description "none";

+        }

+        list link {

+            key 'uuid';

+            config false;

+            uses link;

+            description "none";

+        }

+        leaf-list layer-protocol-name {

+            type tapi-common:layer-protocol-name;

+            config false;

+            min-elements 1;

+            description "none";

+        }

+        uses tapi-common:resource-spec;

+        description "The ForwardingDomain (FD) object class models the ForwardingDomain topological component which is used to effect forwarding of transport characteristic information and offers the potential to enable forwarding. 

+            At the lowest level of recursion, an FD (within a network element (NE)) represents a switch matrix (i.e., a fabric). Note that an NE can encompass multiple switch matrices (FDs). ";

+    }

+    grouping layer-protocol-transition-pac {

+        leaf-list transitioned-layer-protocol-name {

+            type string;

+            min-elements 2;

+            description "Provides the ordered structure of layer protocol transitions encapsulated in the TopologicalEntity. The ordering relates to the LinkPort role.";

+        }

+        description "Relevant for a Link that is formed by abstracting one or more LTPs (in a stack) to focus on the flow and deemphasize the protocol transformation.

+            This abstraction is relevant when considering multi-layer routing.

+            The layer protocols of the LTP and the order of their application to the signal is still relevant and need to be accounted for. This is derived from the LTP spec details.

+            This Pac provides the relevant abstractions of the LTPs and provides the necessary association to the LTPs involved.

+            Links that included details in this Pac are often referred to as Transitional Links.";

+    }

+    grouping node-edge-point {

+        leaf layer-protocol-name {

+            type tapi-common:layer-protocol-name;

+            config false;

+            description "none";

+        }

+        leaf-list supported-cep-layer-protocol-qualifier {

+            type tapi-common:layer-protocol-qualifier;

+            min-elements 1;

+            description "none";

+        }

+        list aggregated-node-edge-point {

+            uses node-edge-point-ref;

+            key 'topology-uuid node-uuid node-edge-point-uuid';

+            config false;

+            description "none";

+        }

+        list mapped-service-interface-point {

+            uses tapi-common:service-interface-point-ref;

+            key 'service-interface-point-uuid';

+            config false;

+            description "NodeEdgePoint mapped to more than ServiceInterfacePoint (slicing/virtualizing) or a ServiceInterfacePoint mapped to more than one NodeEdgePoint (load balancing/Resilience) should be considered experimental";

+        }

+        leaf link-port-direction {

+            type tapi-common:port-direction;

+            config false;

+            description "The orientation of defined flow at the LinkEnd.";

+        }

+        leaf link-port-role {

+            type tapi-common:port-role;

+            config false;

+            description "Each LinkEnd of the Link has a role (e.g., symmetric, hub, spoke, leaf, root)  in the context of the Link with respect to the Link function. ";

+        }

+        uses tapi-common:resource-spec;

+        uses tapi-common:admin-state-pac;

+        uses tapi-common:termination-pac;

+        uses tapi-common:capacity-pac;

+        description "The LogicalTerminationPoint (LTP) object class encapsulates the termination and adaptation functions of one or more transport layers.

+            The structure of LTP supports all transport protocols including circuit and packet forms.";

+    }

+    grouping risk-parameter-pac {

+        list risk-characteristic {

+            key 'risk-characteristic-name';

+            config false;

+            min-elements 1;

+            uses risk-characteristic;

+            description "A list of risk characteristics for consideration in an analysis of shared risk. Each element of the list represents a specific risk consideration.";

+        }

+        description "The risk characteristics of a TopologicalEntity come directly from the underlying physical realization.

+            The risk characteristics propagate from the physical realization to the client and from the server layer to the client layer, this propagation may be modified by protection.

+            A TopologicalEntity may suffer degradation or failure as a result of a problem in a part of the underlying realization.

+            The realization can be partitioned into segments which have some relevant common failure modes.

+            There is a risk of failure/degradation of each segment of the underlying realization.

+            Each segment is a part of a larger physical/geographical unit that behaves as one with respect to failure (i.e. a failure will have a high probability of impacting the whole unit (e.g. all cables in the same duct).

+            Disruptions to that larger physical/geographical unit will impact (cause failure/errors to) all TopologicalEntities that use any part of that larger physical/geographical entity.

+            Any TopologicalEntity that uses any part of that larger physical/geographical unit will suffer impact and hence each TopologicalEntity shares risk.

+            The identifier of each physical/geographical unit that is involved in the realization of each segment of a Topological entity can be listed in the RiskParameter_Pac of that TopologicalEntity.

+            A segment has one or more risk characteristic.

+            Shared risk between two TopologicalEntities compromises the integrity of any solution that use one of those TopologicalEntity as a backup for the other.

+            Where two TopologicalEntities have a common risk characteristic they have an elevated probability of failing simultaneously compared to two TopologicalEntities that do not share risk characteristics.";

+    }

+    grouping transfer-cost-pac {

+        list cost-characteristic {

+            key 'cost-name';

+            config false;

+            min-elements 1;

+            uses cost-characteristic;

+            description "The list of costs where each cost relates to some aspect of the TopologicalEntity.";

+        }

+        description "The cost characteristics of a TopologicalEntity not necessarily correlated to the cost of the underlying physical realization.

+            They may be quite specific to the individual TopologicalEntity e.g. opportunity cost. Relates to layer capacity.

+            There may be many perspectives from which cost may be considered  for a particular TopologicalEntity and hence many specific costs and potentially cost algorithms.

+            Using an entity will incur a cost. ";

+    }

+    grouping transfer-integrity-pac {

+        leaf error-characteristic {

+            type string;

+            config false;

+            description "Describes the degree to which the signal propagated can be errored.

+                Applies to TDM systems as the errored signal will be propagated and not packet as errored packets will be discarded.";

+        }

+        leaf loss-characteristic {

+            type string;

+            config false;

+            description "Describes the acceptable characteristic of lost packets where loss may result from discard due to errors or overflow.

+                Applies to packet systems and not TDM (as for TDM errored signals are propagated unless grossly errored and overflow/underflow turns into timing slips).";

+        }

+        leaf repeat-delivery-characteristic {

+            type string;

+            config false;

+            description "Primarily applies to packet systems where a packet may be delivered more than once (in fault recovery for example).

+                It can also apply to TDM where several frames may be received twice due to switching in a system with a large differential propagation delay.";

+        }

+        leaf delivery-order-characteristic {

+            type string;

+            config false;

+            description "Describes the degree to which packets will be delivered out of sequence.

+                Does not apply to TDM as the TDM protocols maintain strict order.";

+        }

+        leaf unavailable-time-characteristic {

+            type string;

+            config false;

+            description "Describes the duration for which there may be no valid signal propagated.";

+        }

+        leaf server-integrity-process-characteristic {

+            type string;

+            config false;

+            description "Describes the effect of any server integrity enhancement process on the characteristics of the TopologicalEntity.";

+        }

+        description "Transfer intergrity characteristic covers expected/specified/acceptable characteristic of degradation of the transfered signal.

+            It includes all aspects of possible degradation of signal content as well as any damage of any form to the total TopologicalEntity and to the carried signals.

+            Note that the statement is of total impact to the TopologicalEntity so any partial usage of the TopologicalEntity (e.g. a signal that does not use full capacity) will only suffer its portion of the impact.";

+    }

+    grouping transfer-timing-pac {

+        list latency-characteristic {

+            key 'traffic-property-name';

+            config false;

+            min-elements 1;

+            uses latency-characteristic;

+            description "The effect on the latency of a queuing process. This only has significant effect for packet based systems and has a complex characteristic.";

+        }

+        description "A TopologicalEntity will suffer effects from the underlying physical realization related to the timing of the information passed by the TopologicalEntity.";

+    }

+    grouping validation-pac {

+        list validation-mechanism {

+            key 'validation-mechanism';

+            config false;

+            min-elements 1;

+            uses validation-mechanism;

+            description "Provides details of the specific validation mechanism(s) used to confirm the presence of an intended topologicalEntity.";

+        }

+        description "Validation covers the various adjacenct discovery and reachability verification protocols. Also may cover Information source and degree of integrity.";

+    }

+    grouping network-topology-service {

+        list topology {

+            uses topology-ref;

+            key 'topology-uuid';

+            config false;

+            description "none";

+        }

+        uses tapi-common:service-spec;

+        description "none";

+    }

+    grouping topology-context {

+        container nw-topology-service {

+            config false;

+            uses network-topology-service;

+            description "none";

+        }

+        list topology {

+            key 'uuid';

+            config false;

+            uses topology;

+            description "none";

+        }

+        description "none";

+    }

+    grouping inter-rule-group {

+        list rule {

+            key 'local-id';

+			config false;

+            min-elements 1;

+            uses rule;

+            description "The list of rules of the InterRuleGroup.";

+        }

+        list associated-node-rule-group {

+            uses node-rule-group-ref;

+            key 'topology-uuid node-uuid node-rule-group-uuid';

+			config false;

+            min-elements 2;

+            description "The NodeRuleGroups that the InterRuleGroup constrains interconnection between.

+                The CEPs of the NEPs of a referenced NodeRuleGroup can interconnect to the CEPs of the NEPs of another referenced NodeRuleGroup constrained by the rules of the InterRuleGroup.";

+        }

+        uses tapi-common:resource-spec;

+        uses tapi-common:capacity-pac;

+        uses transfer-cost-pac;

+        uses transfer-timing-pac;

+        uses risk-parameter-pac;

+        description "Rules that apply between groups of NEPs.";

+    }

+    grouping node-rule-group {

+        list rule {

+            key 'local-id';

+			config false;

+            min-elements 1;

+            uses rule;

+            description "The list of rules of the NodeRuleGroup.";

+        }

+        list node-edge-point {

+            uses node-edge-point-ref;

+            key 'topology-uuid node-uuid node-edge-point-uuid';

+			config false;

+            min-elements 1;

+            description "NEPs and their client CEPs that the rules apply to.";

+        }

+        list node-rule-group {

+            uses node-rule-group-ref;

+            key 'topology-uuid node-uuid node-rule-group-uuid';

+			config false;

+            description "NodeRuleGroups may be nested such that finer grained rules may be applied.

+                A nested rule group should have a subset of the NEPs of the superior rule group.";

+        }

+        list inter-rule-group {

+            key 'uuid';

+            uses inter-rule-group;

+			config false;

+            description "Nested NodeRuleGroups may have InterRuleGroups. The Superior NodeRuleGroup contains the nested NodeRuleGroups and their associated InterRuleGroups.

+                This is equivalent to the Node-Topology hierarchy.";

+        }

+        uses tapi-common:resource-spec;

+        uses tapi-common:capacity-pac;

+        uses transfer-cost-pac;

+        uses transfer-timing-pac;

+        uses risk-parameter-pac;

+        description "Rules that apply to a group of NEPs.

+            ";

+    }

+    grouping rule {

+        leaf rule-type {

+            type rule-type;

+            config false;

+            description "The focus of the rule.";

+        }

+        leaf forwarding-rule {

+            type forwarding-rule;

+            config false;

+            description "Rule that restricts the creation/deletion of a Connection between points in the node rule group or related by the inter rule group between node rule groups.";

+        }

+        leaf override-priority {

+            type uint64;

+            config false;

+            description "The overridePriority allows for one rule in a rule group to override another.

+                Priority n rules override priority n+1 rules.

+                Rules of the same priority override as follows (n overrides n+1):

+                1 - MustNot

+                2 - Must

+                3 - May

+                4 - Null

+                Within a rule the flexibility rules (signal, port role...) override as follows (n overriedes n+1):

+                1 - Any

+                2 - Same

+                3 - Different

+                Where there are two or more 'Same' rules, they will form an intersection where all must be met.

+                ";

+        }

+        leaf-list cep-direction {

+            type tapi-common:port-direction;

+            config false;

+            description "cep direction is a list of port directions that the rule applies to.

+                No entry means all cep directions.";

+        }

+        list cep-port-role {

+            uses port-role-rule;

+			config false;

+            description "Indicates the port role to which the rule applies. 

+                The port role is interpreted in the context of the connection type which is identified by the connection spec. 

+                The port role is not meaningful in the absence of a connection spec reference.

+                If a node rule group carries a port role, that role applies also to the associated inter rule where the combination of the roles in the node rule groups at the ends of the inter group rule define the connection orientation.

+                For example a root-and-leaf connection may be used in a node where a node rule group collects one set of NEPs has the port role 'root' and another node rule group collects another set of NEPs has the port role 'leaf' where these are joined by an inter rule group. This combination specifies an allowed orientation of the root-and-leaf connection.

+                No port role statement means all port roles are allowed.";

+        }

+        list connection-spec-reference {

+            config false;

+            uses connection-spec-reference;

+            description "Identifies the type of connection that the rule applies to. 

+                If the attribute is not present then the rule applies to all types of connection supported by the device.";

+        }

+        leaf-list layer-protocol-qualifier {

+            type tapi-common:layer-protocol-qualifier;

+            config false;

+            description "Qualifies a rule for a particular layerProtocol identifying the qualifiers that the rule apples to.

+                If the attribute is not present then the rule applies to all relevant qualifiers of the layer protocol of the parent entity.";

+        }

+        container signal-property {

+            config false;

+            uses signal-property-rule;

+            description "The rule only applies to signals with the properties listed. 

+                If the attribute is not present then the rule applies to all signals.";

+        }

+        leaf-list complex-rule {

+            type string;

+            config false;

+            description "Allows for more complex rules where the basic rule system is not sufficient.";

+        }

+        uses tapi-common:local-class;

+        description "Single complex rule statememt.

+            A Node with no rule group has no restrictions and is essentially May/Any

+            A node rule group constrain the CEP connectability in the Node.

+            A connection from a NEP must abide by all rules that relate to that NEP

+            Rules that are for a particular layerProtocolQualifier, connectionSpecReference, cepPortRole and cepDirection combination must be abided by in combination as dictated by overridePriority.

+            If a particular

+            - connectionSpecReference does not have any rule statements then it is not supported and connections of that type are not possible within the rule group.

+            - cepPortRole of a particular connectionSpecReference does not have any rule statements then it is not supported and connections of that connectionSpecReference (type) cannot have that cepPortRole for CEPs from NEPs in that rule group.

+            - cepDirection for a particular connectionSpecReference does not have any rule statements then it is not supported and connections of that connectionSpecReference (type) cannot have that cepPortDirection for CEPs from NEPs in that rule group.

+            Rules that are for different layerProtocolQualifiers or connectionSpecReferences are independent and provide options for connection in the rule group.

+            Some rules may apply to multiple connectionSpecReferences and all cepPortRoles and all cepDirections.";

+    }

+

+    /**************************

+    * package type-definitions

+    **************************/ 

+    identity PORT_ROLE_RULE_OPTION {

+        description "none";

+    }

+    identity PORT_ROLE_RULE_OPTION_SAME_ROLE {

+        base PORT_ROLE_RULE_OPTION;

+        description "The ports of the connection to which the rule applies must have the same role from the list in port role.";

+    }

+    identity PORT_ROLE_RULE_OPTION_DIFFERENT_ROLE {

+        base PORT_ROLE_RULE_OPTION;

+        description "The ports of the connection to which the rule applies must have different roles from the list in port role.";

+    }

+    identity PORT_ROLE_RULE_OPTION_ANY_ROLE {

+        base PORT_ROLE_RULE_OPTION;

+        description "The ports of the connection to which the rule applies may take any identified role.";

+    }

+    identity PORT_ROLE_RULE_OPTION_NOT_ROLE {

+        base PORT_ROLE_RULE_OPTION;

+        description "The ports of the connection to which the rule applies must not have any of the listed roles.";

+    }

+    identity SIGNAL_PROPERTY_VALUE_RULE {

+        description "none";

+    }

+    identity SIGNAL_PROPERTY_VALUE_RULE_SAME_VALUE {

+        base SIGNAL_PROPERTY_VALUE_RULE;

+        description "The signal property of the cep to which the rule applies must have the same value from the identied list.";

+    }

+    identity SIGNAL_PROPERTY_VALUE_RULE_ANY_VALUE {

+        base SIGNAL_PROPERTY_VALUE_RULE;

+        description "The signal property of the cep to which the rule applies may take any identified value.";

+    }

+    identity SIGNAL_PROPERTY_VALUE_RULE_DIFFERENT_VALUE {

+        base SIGNAL_PROPERTY_VALUE_RULE;

+        description "The signal property of the cep to which the rule applies each must have different values from the identified list.";

+    }

+    identity SIGNAL_PROPERTY_VALUE_RULE_NOT_VALUE {

+        base SIGNAL_PROPERTY_VALUE_RULE;

+        description "The signal property of the cep to which the rule applies must not have any of the identified values.";

+    }

+    grouping cost-characteristic {

+        leaf cost-name {

+            type string;

+            description "The cost characteristic will related to some aspect of the TopologicalEntity (e.g. $ cost, routing weight). This aspect will be conveyed by the costName.";

+        }

+        leaf cost-value {

+            type string;

+            description "The specific cost.";

+        }

+        leaf cost-algorithm {

+            type string;

+            description "The cost may vary based upon some properties of the TopologicalEntity. The rules for the variation are conveyed by the costAlgorithm.";

+        }

+        description "The information for a particular cost characteristic.";

+    }

+    grouping latency-characteristic {

+        leaf traffic-property-name {

+            type string;

+            description "The identifier of the specific traffic property to which the queuing latency applies.";

+        }

+        leaf fixed-latency-characteristic {

+            type string;

+            config false;

+            description "A TopologicalEntity suffers delay caused by the realization of the servers (e.g. distance related; FEC encoding etc.) along with some client specific processing. This is the total average latency effect of the TopologicalEntity";

+        }

+        leaf queing-latency-characteristic {

+            type string;

+            description "The specific queuing latency for the traffic property.";

+        }

+        leaf jitter-characteristic {

+            type string;

+            config false;

+            description "High frequency deviation from true periodicity of a signal and therefore a small high rate of change of transfer latency.

+                Applies to TDM systems (and not packet).";

+        }

+        leaf wander-characteristic {

+            type string;

+            config false;

+            description "Low frequency deviation from true periodicity of a signal and therefore a small low rate of change of transfer latency.

+                Applies to TDM systems (and not packet).";

+        }

+        description "Provides information on latency characteristic for a particular stated trafficProperty.";

+    }

+    grouping risk-characteristic {

+        leaf risk-characteristic-name {

+            type string;

+            description "The name of the risk characteristic. The characteristic may be related to a specific degree of closeness.

+                For example a particular characteristic may apply to failures that are localized (e.g. to one side of a road) where as another characteristic may relate to failures that have a broader impact (e.g. both sides of a road that crosses a bridge).

+                Depending upon the importance of the traffic being routed different risk characteristics will be evaluated.";

+        }

+        leaf-list risk-identifier-list {

+            type string;

+            min-elements 1;

+            description "A list of the identifiers of each physical/geographic unit (with the specific risk characteristic) that is related to a segment of the TopologicalEntity.";

+        }

+        description "The information for a particular risk characteristic where there is a list of risk identifiers related to that characteristic.";

+    }

+    grouping validation-mechanism {

+        leaf validation-mechanism {

+            type string;

+            description "Name of mechanism used to validate adjacency";

+        }

+        leaf layer-protocol-adjacency-validated {

+            type string;

+            description "State of validatiion";

+        }

+        leaf validation-robustness {

+            type string;

+            description "Quality of validation (i.e. how likely is the stated validation to be invalid)";

+        }

+        description "Identifies the validation mechanism and describes the characteristics of that mechanism";

+    }

+    typedef forwarding-rule {

+        type enumeration {

+            enum MAY_FORWARD_ACROSS_GROUP {

+                description "NEPs referenced by the node rule group (or indirectly by the inter rule group between node rule groups) may have connections created between them unless some other rule overrides this.

+                    For an inter rule group points in a node rule group at one end of the inter rule group may be connected to points in an node rule group at an other end of the inter rule group.";

+            }

+            enum MUST_FORWARD_ACROSS_GROUP {

+                description "NEPs referenced by the node rule group (or indirectly by the inter rule group between node rule groups) MUST have connections created between them unless some other rule overrides this.

+                    For an inter rule group points in a node rule group at one end of the inter rule group MUST be connected to points in an node rule group at an other end of the inter rule group.";

+            }

+            enum CANNOT_FORWARD_ACROSS_GROUP {

+                description "NEPs referenced by the node rule group (or indirectly by the inter rule group between node rule groups) MUST NOT have connections created between them.

+                    For an inter rule group points in a node rule group at one end of the inter rule group MUST NOT be connected to points in an node rule group at an other end of the inter rule group.";

+            }

+            enum NO_STATEMENT_ON_FORWARDING {

+                description "The rule group makes no statement on forwarding.";

+            }

+            enum INTER_CONNECTION_CONTENTION {

+                description "Connections to NEPs in the rule group contend for resources based upon a constraint of some signal property.

+                    For example, each connection to a NEP in the group must use a different value of the signal property from all other connections to NEPs in the rule group.

+                    For example, each connection to a NEP in the group must use a same value of the signal property as all other connections to NEPs in the rule group. In this case the first connection created in the rule group sets the value and the group constraint is freed when the last connection is deleted.";

+            }

+        }

+        description "Rule that restricts the creation/deletion of an connection between points referenced by rule groups.";

+    }

+    typedef rule-type {

+        type enumeration {

+            enum FORWARDING {

+                description "The rule applies to the creation of connections.";

+            }

+            enum CAPACITY {

+                description "The rule applies to capacity limitations.";

+            }

+            enum COST {

+                description "The rule applies to the cost of the creation of connections.";

+            }

+            enum TIMING {

+                description "The rule applies to timing constraints across the group.";

+            }

+            enum RISK {

+                description "The rule applies to risk considerations across the group so as to express shared risk.";

+            }

+            enum GROUPING {

+                description "The rule is simply for grouping related to other rules.";

+            }

+        }

+        description "The focus of the rule.";

+    }

+    grouping resilience-type {

+        leaf restoration-policy {

+            type restoration-policy;

+            description "none";

+        }

+        leaf protection-type {

+            type protection-type;

+            description "none";

+        }

+        description "none";

+    }

+    typedef restoration-policy {

+        type enumeration {

+            enum PER_DOMAIN_RESTORATION {

+                description "none";

+            }

+            enum END_TO_END_RESTORATION {

+                description "none";

+            }

+            enum NA {

+                description "none";

+            }

+        }

+        description "none";

+    }

+    typedef protection-type {

+        type enumeration {

+            enum NO_PROTECTON {

+                description "none";

+            }

+            enum ONE_PLUS_ONE_PROTECTION {

+                description "none";

+            }

+            enum ONE_PLUS_ONE_PROTECTION_WITH_DYNAMIC_RESTORATION {

+                description "none";

+            }

+            enum PERMANENT_ONE_PLUS_ONE_PROTECTION {

+                description "none";

+            }

+            enum ONE_FOR_ONE_PROTECTION {

+                description "none";

+            }

+            enum DYNAMIC_RESTORATION {

+                description "none";

+            }

+            enum PRE_COMPUTED_RESTORATION {

+                description "none";

+            }

+            enum ONE_PLUS_ONE_PROTECTION_WITH_PRE_COMPUTED_RESTORATION {

+                description "none";

+            }

+        }

+        description "none";

+    }

+    grouping connection-spec-reference {

+        leaf connection-spec-name {

+            type string;

+            config false;

+            description "The name of the connection type spec.

+                This can be used as a reference to a paper document where full formal machine interpretable specs are not supported.";

+        }

+        leaf connection-spec-id {

+            type tapi-common:uuid;

+            config false;

+            description "The reference to a formal spec. 

+                This reference need not be provided (e.g., where there is no formal machine interpretable spec for the type of connection).";

+        }

+        description "The definition of the type of connection.

+            This definition will explain the flows in the connections and how they relate to the port roles.";

+    }

+    typedef port-role {

+        type string;

+        description "The role of a port in the context of the connection spec referenced in the rule.";

+    }

+    grouping port-role-rule {

+        leaf-list port-role {

+            type port-role;

+            config false;

+            description "The role(s) of the port(s) considered in the rule.";

+        }

+        leaf-list port-role-rule {

+            type port-role-rule-option;

+            config false;

+            description "Where the rule references more than one port role or where there are rule intersections either as a result of overlay of rules or inter rule group usage indicates role matching criteria for a connection following the rules.

+                For example if two port roles, 'a' and 'b', are listed and the port role rule is 'different', this means that a connection connecting points in that group must have port roles that are different for each CEP in that group.

+                In the example if a connection can have n ports of role 'a' and m ports of role 'b' then a maximum of two ports can be drawn from the NEPs of the group and where there are two, one must be role 'a' and one must be role 'b'.";

+        }

+        description "Constrains which port roles the rule applies to.";

+    }

+    typedef port-role-rule-option {

+        type identityref {

+            base PORT_ROLE_RULE_OPTION;

+        }

+        description "Indicates how to interpret the port role list.";

+    }

+    grouping signal-property-rule {

+        leaf signal-property-name {

+            type string;

+            config false;

+            description "The name of the signal property to which the rule applies.";

+        }

+        leaf signal-property-value-rule {

+            type signal-property-value-rule;

+            config false;

+            description "Indicates how the signal properties should be accounted for.";

+        }

+        leaf-list applicable-signal-value {

+            type string;

+            config false;

+            description "Specific values of the signal property to which the rule applies.";

+        }

+        leaf number-of-signal-values {

+            type uint64;

+            config false;

+            description "The number of instances of this specific property that can be supported by the group.";

+        }

+        description "Rule related to an identified signal property.";

+    }

+    typedef signal-property-value-rule {

+        type identityref {

+            base SIGNAL_PROPERTY_VALUE_RULE;

+        }

+        description "Indicates how to interpret the signal property value rule.";

+    }

+

+    /**************************

+    * package interfaces

+    **************************/ 

+    rpc get-topology-details {

+        description "none";

+        input {

+            leaf topology-id-or-name {

+                type string;

+                description "none";

+            }

+        }

+        output {

+            container topology {

+                uses topology;

+                description "none";

+            }

+        }

+    }

+    rpc get-node-details {

+        description "none";

+        input {

+            leaf topology-id-or-name {

+                type string;

+                description "none";

+            }

+            leaf node-id-or-name {

+                type string;

+                description "none";

+            }

+        }

+        output {

+            container node {

+                uses node;

+                description "none";

+            }

+        }

+    }

+    rpc get-node-edge-point-details {

+        description "none";

+        input {

+            leaf topology-id-or-name {

+                type string;

+                description "none";

+            }

+            leaf node-id-or-name {

+                type string;

+                description "none";

+            }

+            leaf ep-id-or-name {

+                type string;

+                description "none";

+            }

+        }

+        output {

+            container node-edge-point {

+                uses node-edge-point;

+                description "none";

+            }

+        }

+    }

+    rpc get-link-details {

+        description "none";

+        input {

+            leaf topology-id-or-name {

+                type string;

+                description "none";

+            }

+            leaf link-id-or-name {

+                type string;

+                description "none";

+            }

+        }

+        output {

+            container link {

+                uses link;

+                description "none";

+            }

+        }

+    }

+    rpc get-topology-list {

+        description "none";

+        output {

+            list topology {

+                key 'uuid';

+                uses topology;

+                description "none";

+            }

+        }

+    }

+

+}

diff --git a/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-virtual-network@2020-06-16.yang b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-virtual-network@2020-06-16.yang
new file mode 100644
index 0000000..978b05c
--- /dev/null
+++ b/ntsimulator/deploy/smo-nts-ng-topology-server/yang/tapi-virtual-network@2020-06-16.yang
@@ -0,0 +1,289 @@
+module tapi-virtual-network {

+    namespace "urn:onf:otcc:yang:tapi-virtual-network";

+    prefix tapi-virtual-network;

+    import tapi-topology {

+        prefix tapi-topology;

+    }

+    import tapi-common {

+        prefix tapi-common;

+    }

+    organization "ONF OTCC (Open Transport Configuration & Control) Project";

+    contact "

+         Project Web: <https://wiki.opennetworking.org/display/OTCC/TAPI>

+         Project List: <mailto:transport-api@opennetworking.org>

+         Editor: Karthik Sethuraman <mailto:karthik.sethuraman@necam.com>

+         Andrea Mazzini <mailto:andrea.mazzini@nokia.com>

+         Arturo Mayoral <mailto:arturo.mayoral@telefonica.com>

+         Nigel Davis <mailto:ndavis@ciena.com>";

+    description "

+        This module contains TAPI Virtual Network Model definitions.

+        Source: TapiVirtualNetwork.uml

+        - The TAPI YANG models included in this TAPI release are a *normative* part of the TAPI SDK.

+        - The YANG specifications have been generated from the corresponding UML model using the [ONF EAGLE UML2YANG mapping tool]

+        <https://github.com/OpenNetworkingFoundation/EagleUmlYang>

+        and further edited manually to comply with the [ONF IISOMI UML2YANG mapping guidelines]

+        <https://wiki.opennetworking.org/display/OIMT/UML+-+YANG+Guidelines>

+        - Status of YANG model artifacts can be determined by referring to the corresponding UML artifacts.

+        As described in the UML models, some artifacts are considered *experimental*, and thus the corresponding YANG artifacts.

+        - The ONF TAPI release process does not guarantee backward compatibility of YANG models across major versions of TAPI releases.

+        The YANG model backward compatibility criteria are outlined in section 11 of <https://tools.ietf.org/html/rfc7950>.

+        YANG models included in this release may not be backward compatible with previous TAPI releases.

+        Copyright (c) 2018 Open Networking Foundation (ONF). All rights reserved.

+        License: This module is distributed under the Apache License 2.0.";

+    revision 2020-06-16 {

+        description "ONF Transport API version 2.1.3.

+                   - schedule type changed to tapi-common:time-range.

+                   Changes included in this TAPI release (v2.1.3) are listed in

+                   <https://github.com/OpenNetworkingFoundation/TAPI/blob/develop_v2_1/CHANGE_LOG/change-log.2.1.3.md>";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML>";

+    }

+    revision 2019-07-16 {

+        description "ONF Transport API version 2.1.2.

+                   Changes included in this TAPI release (v2.1.2) are listed in

+                   <https://github.com/OpenNetworkingFoundation/TAPI/blob/develop_v2_1/CHANGE_LOG/change-log.2.1.2.md>";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML>";

+    }

+    revision 2018-12-10 {

+        description "ONF Transport API version 2.1.1.

+                   Changes included in this TAPI release (v2.1.1) are listed in

+                   <https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.1.1.md>";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML>";

+    }

+    revision 2018-10-16 {

+        description "ONF Transport API version 2.1.0.

+                   Changes included in this TAPI release (v2.1.0) are listed in

+                   <https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.1.0.md>";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 7950, RFC 6087 and ONF TAPI UML model

+                  <https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.1.0/UML>";

+    }

+    revision 2018-03-07 {

+        description "ONF Transport API version 2.0.2

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.2.md>";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.2/UML>";

+    }

+    revision 2018-02-16 {

+        description "ONF Transport API version 2.0.1

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.1.md>";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.1/UML>";

+    }

+    revision 2018-01-02 {

+        description "ONF Transport API version 2.0.0

+        This YANG module has been generated from the TAPI UML Model using the IISOMI-Eagle xmi2yang mapping tool.

+        Changes in this revision: <https://github.com/OpenNetworkingFoundation/TAPI/blob/develop/CHANGE_LOG/change-log.2.0.0.md>";

+        reference "ONF-TR-527, ONF-TR-512, ONF-TR-531, RFC 6020, RFC 6087 and ONF TAPI UML model

+                  <https://github.com/OpenNetworkingFoundation/TAPI/tree/v2.0.0/UML>";

+    }

+    augment "/tapi-common:context" {

+        container virtual-network-context {

+            uses virtual-network-context;

+            description "Augments the base TAPI Context with VirtualNetworkService information";

+        }

+        description "Augments the base TAPI Context with VirtualNetworkService information";

+    }

+   /**************************

+    * definitions of references

+    **************************/

+    grouping virtual-nw-service-ref {

+        leaf virtual-nw-service-uuid {

+            type leafref {

+                path '/tapi-common:context/tapi-virtual-network:virtual-network-context/tapi-virtual-network:virtual-nw-service/tapi-virtual-network:uuid';

+            }

+            description "none";

+        }

+        description "none";

+    }

+

+   /**************************

+    * package object-classes

+    **************************/ 

+    grouping virtual-network-constraint {

+        container src-service-end-point {

+            uses tapi-common:service-interface-point-ref;

+            config false;

+            description "none";

+        }

+        container sink-service-end-point {

+            uses tapi-common:service-interface-point-ref;

+            config false;

+            description "none";

+        }

+        list diversity-exclusion {

+            uses virtual-nw-service-ref;

+            key 'virtual-nw-service-uuid';

+            config false;

+            description "none";

+        }

+        container requested-capacity {

+            uses tapi-common:capacity;

+            description "none";

+        }

+        leaf service-level {

+            type string;

+            description "An abstract value the meaning of which is mutually agreed – typically represents metrics such as - Class of service, priority, resiliency, availability";

+        }

+        leaf-list service-layer {

+            type tapi-common:layer-protocol-name;

+            description "none";

+        }

+        list cost-characteristic {

+            key 'cost-name';

+            uses tapi-topology:cost-characteristic;

+            description "The list of costs where each cost relates to some aspect of the TopologicalEntity.";

+        }

+        list latency-characteristic {

+            key 'traffic-property-name';

+            uses tapi-topology:latency-characteristic;

+            description "The effect on the latency of a queuing process. This only has significant effect for packet based systems and has a complex characteristic.";

+        }

+        uses tapi-common:local-class;

+        description "none";

+    }

+    grouping virtual-network-service {

+        container topology {

+            uses tapi-topology:topology-ref;

+            config false;

+            description "none";

+        }

+        list end-point {

+            key 'local-id';

+            min-elements 2;

+            uses virtual-network-service-end-point;

+            description "none";

+        }

+        list vnw-constraint {

+            key 'local-id';

+            min-elements 1;

+            uses virtual-network-constraint;

+            description "none";

+        }

+        container schedule {

+            uses tapi-common:time-range;

+            description "none";

+        }

+        container state {

+            uses tapi-common:admin-state-pac;

+            description "none";

+        }

+        leaf-list layer-protocol-name {

+            type tapi-common:layer-protocol-name;

+            min-elements 1;

+            description "none";

+        }

+        uses tapi-common:service-spec;

+        description "The ForwardingConstruct (FC) object class models enabled potential for forwarding between two or more LTPs and like the LTP supports any transport protocol including all circuit and packet forms.

+            At the lowest level of recursion, a FC represents a cross-connection within an NE.";

+    }

+    grouping virtual-network-service-end-point {

+        container service-interface-point {

+            uses tapi-common:service-interface-point-ref;

+            config false;

+            description "none";

+        }

+        leaf role {

+            type tapi-common:port-role;

+            config false;

+            description "Each EP of the FC has a role (e.g., working, protection, protected, symmetric, hub, spoke, leaf, root)  in the context of the FC with respect to the FC function. ";

+        }

+        leaf direction {

+            type tapi-common:port-direction;

+            config false;

+            description "The orientation of defined flow at the EndPoint.";

+        }

+        leaf service-layer {

+            type tapi-common:layer-protocol-name;

+            config false;

+            description "none";

+        }

+        uses tapi-common:local-class;

+        description "The association of the FC to LTPs is made via EndPoints.

+            The EndPoint (EP) object class models the access to the FC function. 

+            The traffic forwarding between the associated EPs of the FC depends upon the type of FC and may be associated with FcSwitch object instances.  

+            In cases where there is resilience the EndPoint may convey the resilience role of the access to the FC. 

+            It can represent a protected (resilient/reliable) point or a protecting (unreliable working or protection) point.

+            The EP replaces the Protection Unit of a traditional protection model. 

+            The ForwadingConstruct can be considered as a component and the EndPoint as a Port on that component";

+    }

+    grouping virtual-network-context {

+        list virtual-nw-service {

+            key 'uuid';

+            uses virtual-network-service;

+            description "none";

+        }

+        description "none";

+    }

+

+    /**************************

+    * package interfaces

+    **************************/ 

+    rpc create-virtual-network-service {

+        description "none";

+        input {

+            list sep {

+                min-elements 2;

+                uses virtual-network-service-end-point;

+                description "none";

+            }

+            container vnw-constraint {

+                uses virtual-network-constraint;

+                description "none";

+            }

+            container conn-schedule {

+                uses tapi-common:time-range;

+                description "none";

+            }

+        }

+        output {

+            container service {

+                uses virtual-network-service;

+                description "none";

+            }

+        }

+    }

+    rpc delete-virtual-network-service {

+        description "none";

+        input {

+            leaf service-id-or-name {

+                type string;

+                description "none";

+            }

+        }

+        output {

+            container service {

+                uses virtual-network-service;

+                description "none";

+            }

+        }

+    }

+    rpc get-virtual-network-service-details {

+        description "none";

+        input {

+            leaf service-id-or-name {

+                type string;

+                description "none";

+            }

+        }

+        output {

+            container service {

+                uses virtual-network-service;

+                description "none";

+            }

+        }

+    }

+    rpc get-virtual-network-service-list {

+        description "none";

+        output {

+            list service {

+                uses virtual-network-service;

+                description "none";

+            }

+        }

+    }

+

+}