BUG-608 : additional rework of models

Change-Id: I19b4e1fb605bcfc5dbc9c3956711a38ede2c53a3
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>

diff --git a/bgp/linkstate/src/main/yang/bgp-linkstate.yang b/bgp/linkstate/src/main/yang/bgp-linkstate.yang
index 5064d3db540faaee2d2a8154974286c44f98289a..e4cd6d881c0df7975a6f3792a0650f27c3eeec0d 100644 (file)
--- a/bgp/linkstate/src/main/yang/bgp-linkstate.yang
+++ b/bgp/linkstate/src/main/yang/bgp-linkstate.yang
@@ -391,9 +391,15 @@ module bgp-linkstate {
         leaf ipv6-router-id {
             type ipv6-router-identifier;
         }
-        uses bgp-sr:sid-label-binding;
-        uses bgp-sr:sr-capabilities;
-        uses bgp-sr:sr-algorithm;
+        container sr-sid-label {
+            uses bgp-sr:sid-label-binding;
+        }
+        container sr-capabilities {
+            uses bgp-sr:sr-capabilities;
+        }
+        container sr-algorithm {
+            uses bgp-sr:sr-algorithm;
+        }
     }
 
     typedef link-protection-type {
@@ -493,8 +499,12 @@ module bgp-linkstate {
         leaf admin-group {
             type administrative-group;
         }
-        uses bgp-sr:adjacency-segment-identifier;
-        uses bgp-sr:lan-adjacency-segment-identifier;
+        container sr-adj-id {
+            uses bgp-sr:adjacency-segment-identifier;
+        }
+        container sr-lan-adj-id {
+            uses bgp-sr:lan-adjacency-segment-identifier;
+        }
     }
 
     typedef route-tag {
@@ -538,7 +548,9 @@ module bgp-linkstate {
         leaf ospf-forwarding-address {
             type inet:ip-address;
         }
-        uses bgp-sr:prefix-sid;
+        container sr-prefix {
+            uses bgp-sr:prefix-sid;
+        }
     }
 
     grouping linkstate-routes {

diff --git a/bgp/linkstate/src/main/yang/bgp-segment-routing.yang b/bgp/linkstate/src/main/yang/bgp-segment-routing.yang
index 57eb75da5e0e3f2d97f4a7d33d0867178f08ca78..6ae12f5146f366f33e97bfed9c25eb9635eee640 100644 (file)
--- a/bgp/linkstate/src/main/yang/bgp-segment-routing.yang
+++ b/bgp/linkstate/src/main/yang/bgp-segment-routing.yang
@@ -59,7 +59,9 @@ module bgp-segment-routing {
 
     typedef sid-label {
         reference "https://tools.ietf.org/html/draft-ietf-isis-segment-routing-extensions-02#section-2.3";
-        type uint64;
+        type binary {
+            range 0...255;
+        }
     }
 
     typedef weight {
@@ -160,36 +162,36 @@ module bgp-segment-routing {
 
     grouping adjacency-segment-identifier {
         reference "https://tools.ietf.org/html/draft-ietf-isis-segment-routing-extensions-02#section-2.2.1";
-        leaf adj-flags {
+        leaf flags {
             type adjacency-flags;
         }
-        leaf adj-weight {
+        leaf weight {
             type weight;
         }
-        leaf adj-sid {
+        leaf sid {
             type sid-label;
         }
     }
 
     grouping lan-adjacency-segment-identifier {
         reference "https://tools.ietf.org/html/draft-ietf-isis-segment-routing-extensions-02#section-2.2.2";
-        leaf lan-flags {
+        leaf flags {
             type adjacency-flags;
         }
-        leaf lan-weight {
+        leaf weight {
             type weight;
         }
-        leaf lan-iso-system-id {
+        leaf iso-system-id {
             type netc:iso-system-identifier;
         }
-        leaf lan-sid {
+        leaf sid {
             type sid-label;
         }
     }
 
     grouping sr-capabilities {
         reference "https://tools.ietf.org/html/draft-ietf-isis-segment-routing-extensions-02#section-3.1";
-        leaf cap-flags {
+        leaf flags {
             type bits {
                 bit ipv4 {
                     position 0;
@@ -199,7 +201,7 @@ module bgp-segment-routing {
                 }
             }
         }
-        leaf cap-value-range {
+        leaf value-range {
             type uint32 {
                 range "0..16777215";
             }
@@ -218,7 +220,7 @@ module bgp-segment-routing {
 
     grouping prefix-sid {
         reference "https://tools.ietf.org/html/draft-ietf-isis-segment-routing-extensions-02#section-2.1";
-        leaf prefix-sid-flags {
+        leaf flags {
             type bits {
                 bit readvertisement {
                     position 0;