Rewrite NTS Framework.

[sim/o1-interface.git] / ntsimulator / deploy / x-ran / yang / xran-processing-element.yang

diff --git a/ntsimulator/yang/x-ran/xran-processing-element.yang b/ntsimulator/deploy/x-ran/yang/xran-processing-element.yang
similarity index 89%
rename from ntsimulator/yang/x-ran/xran-processing-element.yang
rename to ntsimulator/deploy/x-ran/yang/xran-processing-element.yang
index c3809ab..1551432 100644 (file)
--- a/ntsimulator/yang/x-ran/xran-processing-element.yang
+++ b/ntsimulator/deploy/x-ran/yang/xran-processing-element.yang
@@ -136,11 +136,14 @@ module xran-processing-element {
         }
         container aliasmac-flow {
           when "derived-from(../../../transport-session-type, 'ALIASMAC-INTERFACE')";
+          //checkAL added presence
+          presence "contains aliasmac details";
           if-feature xran-int:ALIASMAC-BASED-CU-PLANE;
           description "leafs for virtual mac type data flows";
           leaf ru-aliasmac-address {
             type leafref {
-              path "/if:interfaces/if:interface[if:name = current()/../../interface-name]/xran-int:alias-macs";
+              //checkAL added prefix to interface-name
+              path "/if:interfaces/if:interface[if:name = current()/../../xran-elements:interface-name]/xran-int:alias-macs";
             }
             config false;
             mandatory true;
@@ -149,7 +152,8 @@ module xran-processing-element {
           }
           leaf vlan-id {
             type leafref {
-              path "/if:interfaces/if:interface[if:name = current()/../../interface-name]/xran-int:vlan-id";
+              //checkAL added prefix to interface-name
+              path "/if:interfaces/if:interface[if:name = current()/../../xran-elements:interface-name]/xran-int:vlan-id";
             }
             description
               "RU's VLAN-ID used for alias MAC based flow";
@@ -163,10 +167,13 @@ module xran-processing-element {
         }
         container eth-flow {
           when "derived-from(../../../transport-session-type, 'ETH-INTERFACE')";
+          //checkAL added presence
+          presence "contains eth details";
           description "leafs for mac + vlan-id type data flows";
           leaf ru-mac-address {
             type leafref {
-              path "/if:interfaces/if:interface[if:name = current()/../../interface-name]/xran-int:mac-address";
+              //checkAL added prefix to interface-name
+              path "/if:interfaces/if:interface[if:name = current()/../../xran-elements:interface-name]/xran-int:mac-address";
             }
             mandatory true;
             description
@@ -174,7 +181,8 @@ module xran-processing-element {
           }
           leaf vlan-id {
             type leafref {
-              path "/if:interfaces/if:interface[if:name = current()/../../interface-name]/xran-int:vlan-id";
+              //checkAL added prefix to interface-name
+              path "/if:interfaces/if:interface[if:name = current()/../../xran-elements:interface-name]/xran-int:vlan-id";
             }
             mandatory true;
             description
@@ -189,18 +197,22 @@ module xran-processing-element {
         }
         container udpip-flow {
           when "derived-from(../../../transport-session-type, 'UDPIP-INTERFACE')";
+          //checkAL added presence
+          presence "contains updip details";
           if-feature xran-int:UDPIP-BASED-CU-PLANE;
           description "leafs for UDP/IP type data flows";
           choice address {
             leaf ru-ipv4-address {
               type leafref {
-                path "/if:interfaces/if:interface[if:name = current()/../../interface-name]/ip:ipv4/ip:address/ip:ip";
+                //checkAL added prefix to interface-name
+                path "/if:interfaces/if:interface[if:name = current()/../../xran-elements:interface-name]/ip:ipv4/ip:address/ip:ip";
               }
               description "RU's IPv4 address";
             }
             leaf ru-ipv6-address {
               type leafref {
-                path "/if:interfaces/if:interface[if:name = current()/../../interface-name]/ip:ipv6/ip:address/ip:ip";
+                //checkAL added prefix to interface-name
+                path "/if:interfaces/if:interface[if:name = current()/../../xran-elements:interface-name]/ip:ipv6/ip:address/ip:ip";
               }
               description "RU's IPv6 address";
             }