BUG-2982 : moved path-attributes container to grouping

[bgpcep.git] / bgp / flowspec / src / main / yang / bgp-flowspec.yang

diff --git a/bgp/flowspec/src/main/yang/bgp-flowspec.yang b/bgp/flowspec/src/main/yang/bgp-flowspec.yang
index b6f3f51f260eb065d68f23a321644ad48880e703..d7f63fd948f29c611c79bc18e7656d6f298dda62 100644 (file)
--- a/bgp/flowspec/src/main/yang/bgp-flowspec.yang
+++ b/bgp/flowspec/src/main/yang/bgp-flowspec.yang
@@ -275,7 +275,7 @@ module bgp-flowspec {
         }
     }
 
-    augment "/bgp-msg:update/bgp-msg:path-attributes/bgp-mp:mp-reach-nlri/bgp-mp:advertized-routes/bgp-mp:destination-type" {
+    augment "/bgp-msg:update/bgp-msg:attributes/bgp-mp:mp-reach-nlri/bgp-mp:advertized-routes/bgp-mp:destination-type" {
         case destination-flowspec-case {
             container destination-flowspec {
                 uses flowspec-destination;
@@ -283,7 +283,7 @@ module bgp-flowspec {
         }
     }
 
-    augment "/bgp-msg:update/bgp-msg:path-attributes/bgp-mp:mp-unreach-nlri/bgp-mp:withdrawn-routes/bgp-mp:destination-type" {
+    augment "/bgp-msg:update/bgp-msg:attributes/bgp-mp:mp-unreach-nlri/bgp-mp:withdrawn-routes/bgp-mp:destination-type" {
         case destination-flowspec-case {
             container destination-flowspec {
                 uses flowspec-destination;
@@ -300,14 +300,19 @@ module bgp-flowspec {
                         to act as the key in the list.
                         Its format does not form the
                         API contract of this model.";
-                    type binary;
+                    type string;
                 }
                 key "route-key";
+                uses bgp-rib:route {
+                    augment bgp-msg:attributes {
+                        uses flowspec-destination;
+                    }
+                }
             }
         }
     }
 
-    augment "/bgp-msg:update/bgp-msg:path-attributes/bgp-msg:extended-communities/bgp-msg:extended-community" {
+    augment "/bgp-msg:update/bgp-msg:attributes/bgp-msg:extended-communities/bgp-msg:extended-community" {
         reference "https://tools.ietf.org/html/rfc5575#section-7";
         case traffic-rate-extended-community-case {
             container traffic-rate-extended-community {