Refactor: update transportpce yang models

[transportpce.git] / api / src / main / yang / service_path / transportpce-common-types@2021-06-18.yang

diff --git a/api/src/main/yang/service_path/transportpce-common-types@2020-12-11.yang b/api/src/main/yang/service_path/transportpce-common-types@2021-06-18.yang
similarity index 96%
rename from api/src/main/yang/service_path/transportpce-common-types@2020-12-11.yang
rename to api/src/main/yang/service_path/transportpce-common-types@2021-06-18.yang
index 0b5b760e35b2c4623a4824a26cb325f873102d32..33494b8ecf425d492c82e5694b64b82132a65a29 100644 (file)
--- a/api/src/main/yang/service_path/transportpce-common-types@2020-12-11.yang
+++ b/api/src/main/yang/service_path/transportpce-common-types@2021-06-18.yang
@@ -15,11 +15,16 @@ module transportpce-common-types {
     revision-date 2018-10-19;
   }
 
+  revision 2021-06-18 {
+    description
+      "Replace olm-renderer-input by optical-rendrer-input.
+       Create optical-renderer-nodes and otn-renderer-nodes groupings";
+  }
   revision 2020-12-11 {
     description
       "Update grouping olm-renderer-input, adding min, max frequencies
-        lower spectral slot number and higher spectral slot number
-         fix center-freq unit";
+       lower spectral slot number and higher spectral slot number
+       fix center-freq unit";
   }
   revision 2020-06-15 {
     description
@@ -415,35 +420,18 @@ module transportpce-common-types {
     }
   }
 
-  grouping olm-renderer-input {
-    description
-      "Type to be used by OLM and Renderer RPCs";
-    leaf service-name {
-      type string;
-    }
-    leaf wave-number {
-      type uint32;
-    }
-    leaf center-freq {
-      type org-openroadm-common-types:frequency-THz;
-    }
-    leaf width {
-      description
-       " Width of nmc";
-      type org-openroadm-common-types:frequency-GHz;
-    }
-    leaf min-freq {
-      type org-openroadm-common-types:frequency-THz;
-    }
-    leaf max-freq {
-      type org-openroadm-common-types:frequency-THz;
-    }
-    leaf lower-spectral-slot-number {
-      type uint32;
-    }
-    leaf higher-spectral-slot-number {
-      type uint32;
+  grouping link-tp {
+    list link-tp {
+      leaf node-id {
+        type string;
+      }
+      leaf tp-id {
+        type string;
+      }
     }
+  }
+
+  grouping optical-renderer-nodes {
     list nodes {
       key "node-id";
       ordered-by user;
@@ -465,35 +453,9 @@ module transportpce-common-types {
           "Destination termination point ";
       }
     }
-    list node-interface {
-      key "node-id";
-      leaf node-id {
-        type string;
-      }
-      leaf-list och-interface-id {
-        type string;
-      }
-      leaf-list otu-interface-id {
-        type string;
-      }
-      leaf-list odu-interface-id {
-        type string;
-      }
-      leaf-list eth-interface-id {
-        type string;
-      }
-      leaf-list connection-id {
-        type string;
-      }
-    }
   }
 
-  grouping otn-renderer-input {
-    description
-      "Type to be used by OLM and Renderer RPCs for OTN";
-    leaf service-name {
-      type string;
-    }
+  grouping otn-renderer-nodes {
     list nodes {
       key "node-id";
       ordered-by user;
@@ -511,7 +473,6 @@ module transportpce-common-types {
         type string;
         description
           "Destination termination point for end nodes";
-        //mandatory true;
       }
       leaf network2-tp {
         type string;
@@ -521,6 +482,48 @@ module transportpce-common-types {
     }
   }
 
+  grouping optical-renderer-input {
+    description
+      "Type to be used by OLM and Renderer RPCs";
+    leaf service-name {
+      type string;
+    }
+    leaf wave-number {
+      type uint32;
+    }
+    leaf center-freq {
+      type org-openroadm-common-types:frequency-THz;
+    }
+    leaf width {
+      description
+       " Width of nmc";
+      type org-openroadm-common-types:frequency-GHz;
+    }
+    leaf min-freq {
+      type org-openroadm-common-types:frequency-THz;
+    }
+    leaf max-freq {
+      type org-openroadm-common-types:frequency-THz;
+    }
+    leaf lower-spectral-slot-number {
+      type uint32;
+    }
+    leaf higher-spectral-slot-number {
+      type uint32;
+    }
+    uses optical-renderer-nodes;
+    uses node-interfaces;
+  }
+
+  grouping otn-renderer-input {
+    description
+      "Type to be used by OLM and Renderer RPCs for OTN";
+    leaf service-name {
+      type string;
+    }
+    uses otn-renderer-nodes;
+  }
+
   grouping olm-get-pm-input {
     leaf node-id {
       type string;