PCEP Entity Id configurable per Topology Node

- Introduce interfaces and models
- extend pcep stats

Change-Id: I47e597100b2293ef8cd8da14e6018a6309caf436
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>

diff --git a/pcep/ietf-stateful07/src/main/yang/odl-pcep-stateful-stats.yang b/pcep/ietf-stateful07/src/main/yang/odl-pcep-stateful-stats.yang
index 4c4eaf886c8d0bc08bbd97408de5572be8110eff..92e4fc8182845785e4d0f222e105df9aa394df24 100644 (file)
--- a/pcep/ietf-stateful07/src/main/yang/odl-pcep-stateful-stats.yang
+++ b/pcep/ietf-stateful07/src/main/yang/odl-pcep-stateful-stats.yang
@@ -9,6 +9,7 @@ module odl-pcep-stateful-stats {
     import yang-ext { prefix ext; revision-date 2013-07-09; }
     import pcep-session-stats { prefix pss; revision-date 2017-11-13; }
     import network-pcep-topology-stats { prefix npts; revision-date 2017-11-13; }
+    import odl-pcep-sync-optimizations { prefix opso; revision-date 2017-10-25; }
 
     description
         "This module contains the PCEP Stateful stats YANG definitions for
@@ -90,4 +91,12 @@ module odl-pcep-stateful-stats {
 
         uses stateful-preferences;
     }
+
+    augment "/nt:network-topology/nt:topology/nt:node/npts:pcep-session-state/npts:local-pref" {
+        when "../../../nt:topology-types/pn:topology-pcep";
+        ext:augment-identifier pcep-entity-id-stats-aug;
+        description "PCEP Entity Identifier";
+
+        uses opso:speaker-entity-id;
+    }
 }
\ No newline at end of file

diff --git a/pcep/ietf-stateful07/src/main/yang/odl-pcep-sync-optimizations.yang b/pcep/ietf-stateful07/src/main/yang/odl-pcep-sync-optimizations.yang
index 36d369e7c1342099c0f58f10163982bf7d1f7df6..97ca817a3b9e0e3573554d65d8601738ecf07c82 100644 (file)
--- a/pcep/ietf-stateful07/src/main/yang/odl-pcep-sync-optimizations.yang
+++ b/pcep/ietf-stateful07/src/main/yang/odl-pcep-sync-optimizations.yang
@@ -62,12 +62,16 @@ module odl-pcep-sync-optimizations {
         }
     }
 
+    grouping speaker-entity-id {
+        leaf speaker-entity-id-value {
+            type binary;
+        }
+    }
+
     grouping speaker-entity-id-tlv {
         container speaker-entity-id {
             uses pcep:tlv;
-            leaf speaker-entity-id-value {
-                type binary;
-            }
+            uses speaker-entity-id;
         }
     }
 

diff --git a/pcep/ietf-stateful07/src/main/yang/odl-pcep-topology-sync-optimizations-config.yang b/pcep/ietf-stateful07/src/main/yang/odl-pcep-topology-sync-optimizations-config.yang
new file mode 100644 (file)
index 0000000..b8258a5
--- /dev/null
+++ b/pcep/ietf-stateful07/src/main/yang/odl-pcep-topology-sync-optimizations-config.yang
@@ -0,0 +1,38 @@
+// vi: set smarttab et sw=4 tabstop=4:
+module odl-pcep-topology-sync-optimizations-config {
+    yang-version 1;
+    namespace "urn:opendaylight:params:xml:ns:yang:topology:pcep:sync:optimizations:config";
+    prefix pnc;
+
+    import network-topology { prefix nt; revision-date 2013-10-21; }
+    import network-topology-pcep { prefix pn; revision-date 2017-10-25; }
+    import yang-ext { prefix ext; revision-date 2013-07-09; }
+    import pcep-config { prefix pc; revision-date 2017-10-25; }
+    import odl-pcep-sync-optimizations { prefix opso; revision-date 2017-10-25; }
+    import network-pcep-topology-config { prefix nptc; revision-date 2017-10-25; }
+
+    description
+        "This module contains the PCEP config extensions to base topology model.
+         Copyright (c)2017 AT&T Services, Inc. All rights reserved.;
+
+         This program and the accompanying materials are made available
+         under the terms of the Eclipse Public License v1.0 which
+         accompanies this distribution, and is available at
+         http://www.eclipse.org/legal/epl-v10.html";
+
+    organization "AT&T Services, Inc.";
+    contact "Claudio D. Gasparini <claudio.gasparini@pantheon.sk>";
+
+    revision "2017-10-25" {
+        description
+            "Initial revision.";
+    }
+
+    augment "/nt:network-topology/nt:topology/nt:node/nptc:session-config" {
+        when "../nt:topology-types/pn:topology-pcep";
+        ext:augment-identifier pcep-node-sync-config;
+        description "Augment Pcep topology node with synchronization config";
+
+        uses opso:speaker-entity-id;
+    }
+}
\ No newline at end of file