Fix junit dependencies in poms. Reuse existing from parent,

[bgpcep.git] / pcep / api / src / main / yang / pcep-types.yang

diff --git a/pcep/api/src/main/yang/pcep-types.yang b/pcep/api/src/main/yang/pcep-types.yang
index 56ac4c63aa95291621643d360fac8774f8e2eff3..7734c0364e24545eef7b1fc2bb8941c851660ff1 100644 (file)
--- a/pcep/api/src/main/yang/pcep-types.yang
+++ b/pcep/api/src/main/yang/pcep-types.yang
@@ -60,6 +60,10 @@ module pcep-types {
                type uint16;
        }
 
+       typedef path-key {
+               type uint16;
+       }
+
        typedef pce-id {
                type union {
                        type binary {
@@ -574,7 +578,16 @@ module pcep-types {
                                mandatory true;
                        }
 
-                       uses rsvp:route-subobjects;
+                       uses rsvp:explicit-route-subobjects {
+// FIXME: yangtools bug
+//                             augment "subobject-type" {
+//                                     case path-key {
+//                                             container path-key {
+//                                                     uses path-key-subobject;
+//                                             }
+//                                     }
+//                             }
+                       }
                }
        }
 
@@ -586,13 +599,7 @@ module pcep-types {
                uses object;
 
                list subobjects {
-                       uses rsvp:route-subobjects {
-                               augment subobject-type {
-                                       case explicit-exclusion-route {
-                                               uses rsvp:exclude-route-subobjects;
-                                       }
-                               }
-                       }
+                       uses rsvp:explicit-route-subobjects;
                }
        }
 
@@ -737,6 +744,22 @@ module pcep-types {
                }
                
                container tlvs {
+
+               }
+       }
+
+       grouping path-key-subobject {
+               reference "https://tools.ietf.org/html/rfc5520#section-3.1";
+               uses rsvp:c-subobject;
+
+               leaf pce-id {
+                       type pce-id;
+                       mandatory true;
+               }
+
+               leaf path-key {
+                       type path-key;
+                       mandatory true;
                }
        }
 
@@ -754,10 +777,7 @@ module pcep-types {
                                default false;
                        }
 
-                       leaf pce-id {
-                               type pce-id;
-                               mandatory true;
-                       }
+                       uses path-key-subobject;
                }
        }
 
@@ -976,6 +996,10 @@ module pcep-types {
                        uses metric-object;
                }
 
+               container exclude-route {
+                       uses exclude-route-object;
+               }
+
                container include-route {
                        uses include-route-object;
                }
@@ -1048,11 +1072,12 @@ module pcep-types {
                                container of {
                                        uses of-object;
                                }
-
                                container gc {
                                        uses gc-object;
                                }
-
+                               container xro {
+                                       uses exclude-route-object;
+                               }
                                list metric {
                                        uses metric-object;
                                }