From: Gilles Thouenon <gilles.thouenon@orange.com>
Date: Fri, 11 Feb 2022 11:38:12 +0000 (+0100)
Subject: Fix odu-switching-pool configuration for OTN mpdr
X-Git-Tag: 5.0.0~83
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=commitdiff_plain;h=refs%2Fchanges%2F88%2F99688%2F2

Fix odu-switching-pool configuration for OTN mpdr

Replace switching-pool-type "non-blocking" by "blocking" for
otn-muxponder, in honeynode configuration files, to be compliant with
OpenROADM device model white paper, section 3.2.5.2.

JIRA: TRNSPRTPCE-459
Signed-off-by: Gilles Thouenon <gilles.thouenon@orange.com>
Change-Id: I6185fc8eb0807143e070333419db4bf56106fb71
---

diff --git a/tests/sample_configs/openroadm/2.2.1/oper-SPDRA.xml b/tests/sample_configs/openroadm/2.2.1/oper-SPDRA.xml
index 0de25826a..a9b350c44 100644
--- a/tests/sample_configs/openroadm/2.2.1/oper-SPDRA.xml
+++ b/tests/sample_configs/openroadm/2.2.1/oper-SPDRA.xml
@@ -2571,7 +2571,7 @@
     </xponder>
     <odu-switching-pools>
       <switching-pool-number>1</switching-pool-number>
-      <switching-pool-type xmlns:org-openroadm-switching-pool-types="http://org/openroadm/switching-pool-types">non-blocking</switching-pool-type>
+      <switching-pool-type xmlns:org-openroadm-switching-pool-types="http://org/openroadm/switching-pool-types">blocking</switching-pool-type>
       <non-blocking-list>
         <nbl-number>1</nbl-number>
         <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
@@ -2835,7 +2835,7 @@
     </odu-switching-pools>
     <odu-switching-pools>
       <switching-pool-number>3</switching-pool-number>
-      <switching-pool-type xmlns:org-openroadm-switching-pool-types="http://org/openroadm/switching-pool-types">non-blocking</switching-pool-type>
+      <switching-pool-type xmlns:org-openroadm-switching-pool-types="http://org/openroadm/switching-pool-types">blocking</switching-pool-type>
       <non-blocking-list>
         <nbl-number>1</nbl-number>
         <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
diff --git a/tests/sample_configs/openroadm/2.2.1/oper-SPDRB.xml b/tests/sample_configs/openroadm/2.2.1/oper-SPDRB.xml
index 411a020d0..8b8f0127a 100644
--- a/tests/sample_configs/openroadm/2.2.1/oper-SPDRB.xml
+++ b/tests/sample_configs/openroadm/2.2.1/oper-SPDRB.xml
@@ -2571,7 +2571,7 @@
     </xponder>
     <odu-switching-pools>
       <switching-pool-number>1</switching-pool-number>
-      <switching-pool-type xmlns:org-openroadm-switching-pool-types="http://org/openroadm/switching-pool-types">non-blocking</switching-pool-type>
+      <switching-pool-type xmlns:org-openroadm-switching-pool-types="http://org/openroadm/switching-pool-types">blocking</switching-pool-type>
       <non-blocking-list>
         <nbl-number>1</nbl-number>
         <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
@@ -2835,7 +2835,7 @@
     </odu-switching-pools>
     <odu-switching-pools>
       <switching-pool-number>3</switching-pool-number>
-      <switching-pool-type xmlns:org-openroadm-switching-pool-types="http://org/openroadm/switching-pool-types">non-blocking</switching-pool-type>
+      <switching-pool-type xmlns:org-openroadm-switching-pool-types="http://org/openroadm/switching-pool-types">blocking</switching-pool-type>
       <non-blocking-list>
         <nbl-number>1</nbl-number>
         <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
diff --git a/tests/sample_configs/openroadm/2.2.1/oper-SPDRC.xml b/tests/sample_configs/openroadm/2.2.1/oper-SPDRC.xml
index 97925bc61..9efe009af 100644
--- a/tests/sample_configs/openroadm/2.2.1/oper-SPDRC.xml
+++ b/tests/sample_configs/openroadm/2.2.1/oper-SPDRC.xml
@@ -2571,7 +2571,7 @@
     </xponder>
     <odu-switching-pools>
       <switching-pool-number>1</switching-pool-number>
-      <switching-pool-type xmlns:org-openroadm-switching-pool-types="http://org/openroadm/switching-pool-types">non-blocking</switching-pool-type>
+      <switching-pool-type xmlns:org-openroadm-switching-pool-types="http://org/openroadm/switching-pool-types">blocking</switching-pool-type>
       <non-blocking-list>
         <nbl-number>1</nbl-number>
         <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
@@ -2835,7 +2835,7 @@
     </odu-switching-pools>
     <odu-switching-pools>
       <switching-pool-number>3</switching-pool-number>
-      <switching-pool-type xmlns:org-openroadm-switching-pool-types="http://org/openroadm/switching-pool-types">non-blocking</switching-pool-type>
+      <switching-pool-type xmlns:org-openroadm-switching-pool-types="http://org/openroadm/switching-pool-types">blocking</switching-pool-type>
       <non-blocking-list>
         <nbl-number>1</nbl-number>
         <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
diff --git a/tests/sample_configs/openroadm/7.1/oper-SPDRA.xml b/tests/sample_configs/openroadm/7.1/oper-SPDRA.xml
index 871c8af93..e04b40808 100644
--- a/tests/sample_configs/openroadm/7.1/oper-SPDRA.xml
+++ b/tests/sample_configs/openroadm/7.1/oper-SPDRA.xml
@@ -1061,7 +1061,7 @@
     </xponder>
     <odu-switching-pools>
       <switching-pool-number>1</switching-pool-number>
-      <switching-pool-type xmlns:org-openroadm-switching-pool-types="http://org/openroadm/switching-pool-types">non-blocking</switching-pool-type>
+      <switching-pool-type xmlns:org-openroadm-switching-pool-types="http://org/openroadm/switching-pool-types">blocking</switching-pool-type>
       <non-blocking-list>
         <nbl-number>1</nbl-number>
         <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>
diff --git a/tests/sample_configs/openroadm/7.1/oper-SPDRC.xml b/tests/sample_configs/openroadm/7.1/oper-SPDRC.xml
index 028b85cc7..1db922053 100644
--- a/tests/sample_configs/openroadm/7.1/oper-SPDRC.xml
+++ b/tests/sample_configs/openroadm/7.1/oper-SPDRC.xml
@@ -1061,7 +1061,7 @@
     </xponder>
     <odu-switching-pools>
       <switching-pool-number>1</switching-pool-number>
-      <switching-pool-type xmlns:org-openroadm-switching-pool-types="http://org/openroadm/switching-pool-types">non-blocking</switching-pool-type>
+      <switching-pool-type xmlns:org-openroadm-switching-pool-types="http://org/openroadm/switching-pool-types">blocking</switching-pool-type>
       <non-blocking-list>
         <nbl-number>1</nbl-number>
         <interconnect-bandwidth-unit>1000000000</interconnect-bandwidth-unit>