Upgrade to Service Path 1.7

[transportpce.git] / api / src / main / yang / service_path / transportpce-pce@2020-01-28.yang

diff --git a/api/src/main/yang/service_path/transportpce-pce@2019-06-24.yang b/api/src/main/yang/service_path/transportpce-pce@2020-01-28.yang
similarity index 83%
rename from api/src/main/yang/service_path/transportpce-pce@2019-06-24.yang
rename to api/src/main/yang/service_path/transportpce-pce@2020-01-28.yang
index 5ccc3e03a402b5ca2f48f736f09824758e0c2b7c..579c665e4ff71cd12c201c7fa88a35c5b051b5f8 100644 (file)
--- a/api/src/main/yang/service_path/transportpce-pce@2019-06-24.yang
+++ b/api/src/main/yang/service_path/transportpce-pce@2020-01-28.yang
@@ -7,7 +7,6 @@ module transportpce-pce {
   }
   import transportpce-routing-constraints {
     prefix transportpce-routing-constraints;
-    revision-date 2017-10-17;
   }
   import org-openroadm-common-service-types {
     prefix org-openroadm-common-service-types;
@@ -17,11 +16,9 @@ module transportpce-pce {
   }
   import transportpce-pathDescription {
     prefix transportpce-pathDescription;
-    revision-date 2017-10-17;
   }
   import gnpy-path-computation-simplified {
     prefix "gnpypc";
-    revision-date 2019-05-02;
   }
 
   organization
@@ -59,9 +56,14 @@ module transportpce-pce {
       ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
       POSSIBILITY OF SUCH DAMAGE";
 
-  revision 2017-04-26 {
-      description
-        "Version 1.5";
+  revision 2020-01-28 {
+    description
+      "Version 1.7";
+  }
+
+  revision 2019-06-24 {
+    description
+      "Version 1.6.1";
   }
 
   revision 2017-10-17 {
@@ -69,9 +71,9 @@ module transportpce-pce {
       "Version 1.6";
   }
 
-  revision 2019-06-24 {
+  revision 2017-04-26 {
     description
-      "Version 1.6.1";
+      "Version 1.5";
   }
 
   rpc path-computation-request {
@@ -79,15 +81,17 @@ module transportpce-pce {
       leaf service-name {
         type string;
         description
-          "Identifier for the service to be created in
-           the ROADM network, e.g., CLFI, CLCI, etc. This is reported against the service, but may not get reflected in the service in the network.";
+          "Identifier for the service to be created in the ROADM network,
+           e.g., CLFI, CLCI, etc. This is reported against the service, but
+           may not get reflected in the service in the network.";
         mandatory true;
       }
       leaf resource-reserve {
-           type boolean;
-           description
-                "indicates if resources (from local PCE topology) must be reserved until further notice (cancel-resource-reserve or topology update)";
-           mandatory true;
+        type boolean;
+        description
+                "indicates if resources (from local PCE topology) must be reserved
+                until further notice (cancel-resource-reserve or topology update)";
+        mandatory true;
       }
       uses transportpce-common-service-path-types:service-handler-header;
       container service-a-end {
@@ -97,6 +101,7 @@ module transportpce-pce {
         uses transportpce-common-service-path-types:service-endpoint-sp;
       }
       uses transportpce-routing-constraints:routing-constraints-sp;
+      uses org-openroadm-common-service-types:routing-metric;
     }
     output {
       uses org-openroadm-common-service-types:configuration-response-common;
@@ -118,33 +123,35 @@ module transportpce-pce {
     }
   }
 
-notification service-path-rpc-result {
+  notification service-path-rpc-result {
     description
-      "This Notification indicates result of  service RPC";
+        "This Notification indicates result of  service RPC";
     leaf notification-type {
       type transportpce-common-service-path-types:service-path-notification-types;
     }
     container path-description {
-           uses transportpce-pathDescription:path-description;
+      uses transportpce-pathDescription:path-description;
     }
     uses transportpce-common-service-path-types:rpc-response-status-ex;
     uses org-openroadm-common-service-types:service-notification-result;
+    uses org-openroadm-common-service-types:routing-metric;
   }
 
   grouping stubpce-path-description {
-      leaf path-name {
-          type string;
-          description
-            "Identifier for the pathDescription to be created in
-             the ROADM network, e.g., CLFI, CLCI, etc.";
-          mandatory true;
-        }
-      uses transportpce-pathDescription:path-description;
+    leaf path-name {
+      type string;
+      description
+            "Identifier for the pathDescription to be created in the ROADM
+            network, e.g., CLFI, CLCI, etc.";
+      mandatory true;
+    }
+    uses transportpce-pathDescription:path-description;
   }
 
   container path-description-list {
     description
-      "List of pathDescription. Can only be created, deleted, modified, etc. using special RPCs.";
+        "List of pathDescription. Can only be created, deleted, modified,
+        etc. using special RPCs.";
     list pathDescriptions {
       key "path-name";
       uses stubpce-path-description;
@@ -156,14 +163,14 @@ notification service-path-rpc-result {
       key path-dir;
       config false;
       description "GNPy response";
-      leaf path-dir{
+      leaf path-dir {
         type string;
         description "A-to-Z or Z-to-A";
       }
       leaf feasibility {
         type boolean;
         description
-          "true : feasible path / False : non-feasible.";
+                "true : feasible path / False : non-feasible.";
       }
       choice response-type {
         config false;