From 0c434e8a2ef64abd67905b03ba58d7614523ae5d Mon Sep 17 00:00:00 2001 From: Balagangadhar Bathula Date: Tue, 14 Jul 2020 01:00:37 -0400 Subject: [PATCH] Missing modulation format for 2.2.1 OCH interface - Modified the OCH builder for 2.2.1 - Modified the test-suites JIRA: TRNSPRTPCE-288 Change-Id: If2411fb08c358b65c6af11fdc4684daff92ac111 --- .../renderer/openroadminterface/OpenRoadmInterface221.java | 3 +++ tests/transportpce_tests/2.2.1/test_otn_end2end.py | 4 ++-- tests/transportpce_tests/2.2.1/test_otn_renderer.py | 2 +- tests/transportpce_tests/2.2.1/test_otn_sh_renderer.py | 4 ++-- .../2.2.1/test_renderer_service_path_nominal.py | 1 + 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java index e6b7f4ad2..541c22e4e 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java @@ -23,6 +23,7 @@ import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfa import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200429.network.nodes.Mapping; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.FrequencyGHz; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.FrequencyTHz; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.ModulationFormat; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.PowerDBm; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.R100G; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.interfaces.grp.InterfaceBuilder; @@ -235,6 +236,8 @@ public class OpenRoadmInterface221 { OchBuilder ocIfBuilder = new OchBuilder() .setFrequency(FrequencyTHz.getDefaultInstance(String.valueOf(fixedFlex.getCenterFrequency()))) .setRate(R100G.class) + // TODO: Check if this the correct way to set modulation format here + .setModulationFormat(ModulationFormat.DpQpsk) .setTransmitPower(new PowerDBm(new BigDecimal("-5"))); // Create generic interface diff --git a/tests/transportpce_tests/2.2.1/test_otn_end2end.py b/tests/transportpce_tests/2.2.1/test_otn_end2end.py index 0e6acc1f7..7775a2446 100644 --- a/tests/transportpce_tests/2.2.1/test_otn_end2end.py +++ b/tests/transportpce_tests/2.2.1/test_otn_end2end.py @@ -261,7 +261,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertDictEqual( {u'frequency': 196.1, u'rate': u'org-openroadm-common-types:R100G', - u'transmit-power': -5}, + u'transmit-power': -5, u'modulation-format': 'dp-qpsk'}, res['interface'][0]['org-openroadm-optical-channel-interfaces:och']) def test_15_check_interface_OTU4_spdra(self): @@ -301,7 +301,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertDictEqual( {u'frequency': 196.1, u'rate': u'org-openroadm-common-types:R100G', - u'transmit-power': -5}, + u'transmit-power': -5, u'modulation-format': 'dp-qpsk'}, res['interface'][0]['org-openroadm-optical-channel-interfaces:och']) def test_17_check_interface_OTU4_spdrc(self): diff --git a/tests/transportpce_tests/2.2.1/test_otn_renderer.py b/tests/transportpce_tests/2.2.1/test_otn_renderer.py index f07c78e0a..3129089e2 100644 --- a/tests/transportpce_tests/2.2.1/test_otn_renderer.py +++ b/tests/transportpce_tests/2.2.1/test_otn_renderer.py @@ -133,7 +133,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertDictEqual( {u'frequency': 196.1, u'rate': u'org-openroadm-common-types:R100G', - u'transmit-power': -5}, + u'transmit-power': -5, u'modulation-format': 'dp-qpsk'}, res['interface'][0]['org-openroadm-optical-channel-interfaces:och']) def test_07_check_interface_OTU(self): diff --git a/tests/transportpce_tests/2.2.1/test_otn_sh_renderer.py b/tests/transportpce_tests/2.2.1/test_otn_sh_renderer.py index 0d6113ed1..2ec03efa7 100644 --- a/tests/transportpce_tests/2.2.1/test_otn_sh_renderer.py +++ b/tests/transportpce_tests/2.2.1/test_otn_sh_renderer.py @@ -177,7 +177,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertDictEqual( {u'frequency': 196.1, u'rate': u'org-openroadm-common-types:R100G', - u'transmit-power': -5}, + u'transmit-power': -5, u'modulation-format': 'dp-qpsk'}, res['interface'][0]['org-openroadm-optical-channel-interfaces:och']) def test_05_check_interface_OTU(self): @@ -220,7 +220,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertDictEqual( {u'frequency': 196.1, u'rate': u'org-openroadm-common-types:R100G', - u'transmit-power': -5}, + u'transmit-power': -5, u'modulation-format': 'dp-qpsk'}, res['interface'][0]['org-openroadm-optical-channel-interfaces:och']) def test_07_check_interface_OTU(self): diff --git a/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py b/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py index 7332ebe38..29b7fb49c 100644 --- a/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py +++ b/tests/transportpce_tests/2.2.1/test_renderer_service_path_nominal.py @@ -195,6 +195,7 @@ class TransportPCERendererTesting(unittest.TestCase): self.assertDictEqual( {u'rate': u'org-openroadm-common-types:R100G', u'transmit-power': -5, + u'modulation-format': 'dp-qpsk', u'frequency': 195.8}, res['interface'][0]['org-openroadm-optical-channel-interfaces:och']) -- 2.36.6