Updated Amplifier Model to support C+L-Band Amplifiers

Updated Amplifier Model to support C+L-Band Amplifiers Closing issue #46 Co-authored-by: <sergiobelotti sergio.belotti@nokia.com>
ietf-ccamp-wg · Feb 16, 2021 · 5901240 · 5901240
1 parent 55036d9
commit 5901240
Show file tree

Hide file tree

Showing 2 changed files with 88 additions and 50 deletions.
diff --git a/ietf-optical-impairment-topology.tree b/ietf-optical-impairment-topology.tree
@@ -27,21 +27,29 @@ module: ietf-optical-impairment-topology
              |  +--ro amplifier
              |     +--ro type-variety    string
              |     +--ro operational
-             |        +--ro actual-gain
-             |        |       decimal64
-             |        +--ro tilt-target
-             |        |       decimal64
-             |        +--ro out-voa
-             |        |       decimal64
-             |        +--ro in-voa
-             |        |       decimal64
-             |        +--ro (power-param)?
-             |           +--:(channel-power)
-             |           |  +--ro nominal-channel-power?
-             |           |          decimal64
-             |           +--:(power-spectral-density)
-             |              +--ro nominal-power-spectral-density?
-             |                      decimal64
+             |        +--ro amplifier-element* []
+             |           +--ro name?
+             |           |       string
+             |           +--ro frequency-range
+             |           |  +--ro lower-frequency?
+             |           |  |       l0-types-ext:frequency-thz
+             |           |  +--ro upper-frequency?
+             |           |          l0-types-ext:frequency-thz
+             |           +--ro actual-gain
+             |           |       decimal64
+             |           +--ro tilt-target
+             |           |       decimal64
+             |           +--ro out-voa
+             |           |       decimal64
+             |           +--ro in-voa
+             |           |       decimal64
+             |           +--ro (power-param)?
+             |              +--:(channel-power)
+             |              |  +--ro nominal-channel-power?
+             |              |          decimal64
+             |              +--:(power-spectral-density)
+             |                 +--ro nominal-power-spectral-density?
+             |                         decimal64
              +--:(fiber)
              |  +--ro fiber
              |     +--ro type-variety    string
@@ -216,3 +224,4 @@ module: ietf-optical-impairment-topology
             /tet:local-link-connectivity:
     +--ro add-path-impairments?    leafref
     +--ro drop-path-impairments?   leafref
+
diff --git a/ietf-optical-impairment-topology.yang b/ietf-optical-impairment-topology.yang
@@ -68,7 +68,7 @@ module ietf-optical-impairment-topology {
 // the format is (year-month-day)
 
 
-  revision 2021-02-04 {
+  revision 2021-02-16 {
     description
       "Initial Version";
     reference
@@ -389,8 +389,8 @@ module ietf-optical-impairment-topology {
   grouping amplifier-params {
     description "describes parameters for an amplifier";
     container amplifier{
-    description "amplifier type, operatonal parameters 
-                 are described";
+      description
+        "amplifier type, operatonal parameters are described.";
       leaf type-variety {
         type string ;
         mandatory true ;
@@ -399,42 +399,71 @@ module ietf-optical-impairment-topology {
           a specification in a separate equipment catalog";
       }
       container operational {
-        description "amplifier operationnal parameters";
-        leaf actual-gain {
-          type decimal64 {
-            fraction-digits 2;
+        description "amplifier operational parameters";
+        list amplifier-element {
+          description
+            "The list of parallel amplifier elements within an
+            amplifier used to amplify different frequency ranges.";
+          leaf name {
+            type string;
+            description
+              "The name of the amplifier element as specified in
+              the vendor's specification associated with the
+              type-variety.";
           }
-          units dB ;
-      mandatory true ;
-          description "..";
-        }
-        leaf tilt-target {
-          type decimal64 {
-            fraction-digits 2;
+          container frequency-range {
+            description
+              "The frequency range amplified by the amplifier
+              element.";
+            leaf lower-frequency {
+              type l0-types-ext:frequency-thz;
+              description
+                "The lower frequency boundary of the
+                frequency range.";
+            }
+            leaf upper-frequency {
+              type l0-types-ext:frequency-thz;
+              description
+                "The upper frequency boundary of the
+                frequency range.";
+            }
           }
-          mandatory true ;
-          description "..";
-        }
-        leaf out-voa {
-          type decimal64 {
-            fraction-digits 2;
+          leaf actual-gain {
+            type decimal64 {
+              fraction-digits 2;
+            }
+            units dB ;
+            mandatory true ;
+            description "..";
           }
-          units dB;
-      mandatory true;
-          description "..";
-        }
-        leaf in-voa {
-          type decimal64 {
-            fraction-digits 2;
+          leaf tilt-target {
+            type decimal64 {
+              fraction-digits 2;
+            }
+            mandatory true ;
+            description "..";
           }
-          units dB;
-      mandatory true;
-          description "..";
-        }
-        uses power-param;
-      }
-    }
-  }
+          leaf out-voa {
+            type decimal64 {
+              fraction-digits 2;
+            }
+            units dB;
+            mandatory true;
+            description "..";
+          }
+          leaf in-voa {
+            type decimal64 {
+              fraction-digits 2;
+            }
+            units dB;
+            mandatory true;
+            description "..";
+          }
+          uses power-param;
+        }  // list amplifier-element
+      }  // container operational
+    }  // container amplifier
+  }  // grouping amplifier-params
 
   grouping fiber-params {
     description