X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=olm%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Folm%2Fservice%2FOlmPowerServiceImplSpanLossBaseTest.java;h=335c7b6f8af59aada2707eb921a30511cd284ba3;hb=refs%2Fchanges%2F46%2F100646%2F27;hp=257ef1e25ef48cdee71ccefc10027ef8dc621404;hpb=8ea6d16bba042fed9f2d12347b1a9ca99074a779;p=transportpce.git diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplSpanLossBaseTest.java b/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplSpanLossBaseTest.java index 257ef1e25..335c7b6f8 100644 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplSpanLossBaseTest.java +++ b/olm/src/test/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImplSpanLossBaseTest.java @@ -8,9 +8,7 @@ package org.opendaylight.transportpce.olm.service; -import java.math.BigDecimal; import java.util.Optional; - import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -22,7 +20,9 @@ import org.opendaylight.transportpce.common.NetworkUtils; import org.opendaylight.transportpce.common.StringConstants; import org.opendaylight.transportpce.common.Timeouts; import org.opendaylight.transportpce.common.device.DeviceTransactionManager; +import org.opendaylight.transportpce.common.device.DeviceTransactionManagerImpl; import org.opendaylight.transportpce.common.mapping.MappingUtils; +import org.opendaylight.transportpce.common.mapping.MappingUtilsImpl; import org.opendaylight.transportpce.common.mapping.PortMapping; import org.opendaylight.transportpce.common.mapping.PortMappingImpl; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException; @@ -30,14 +30,16 @@ import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfa import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl121; import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl221; +import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl710; import org.opendaylight.transportpce.olm.power.PowerMgmt; import org.opendaylight.transportpce.olm.power.PowerMgmtImpl; import org.opendaylight.transportpce.olm.util.OlmPowerServiceRpcImplUtil; import org.opendaylight.transportpce.olm.util.OlmTransactionUtils; import org.opendaylight.transportpce.test.AbstractTest; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossBaseInput; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.CalculateSpanlossBaseOutput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.CalculateSpanlossBaseInput; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.CalculateSpanlossBaseOutput; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.RatioDB; +import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.OrgOpenroadmDeviceData; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.interfaces.grp.Interface; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.interfaces.grp.InterfaceBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.interfaces.grp.InterfaceKey; @@ -53,6 +55,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.NetworkKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.common.Decimal64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -66,6 +69,7 @@ public class OlmPowerServiceImplSpanLossBaseTest extends AbstractTest { private MappingUtils mappingUtils; private OpenRoadmInterfacesImpl221 openRoadmInterfacesImpl221; private OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121; + private OpenRoadmInterfacesImpl710 openRoadmInterfacesImpl710; private OlmPowerService olmPowerService; private DataBroker dataBroker; @@ -73,16 +77,16 @@ public class OlmPowerServiceImplSpanLossBaseTest extends AbstractTest { public void setUp() throws OpenRoadmInterfaceException { this.openRoadmInterfacesImpl121 = Mockito.mock(OpenRoadmInterfacesImpl121.class); this.openRoadmInterfacesImpl221 = Mockito.mock(OpenRoadmInterfacesImpl221.class); - this.mappingUtils = Mockito.mock(MappingUtils.class); + this.mappingUtils = Mockito.mock(MappingUtilsImpl.class); this.portMapping = Mockito.mock(PortMappingImpl.class); - this.deviceTransactionManager = Mockito.mock(DeviceTransactionManager.class); + this.deviceTransactionManager = Mockito.mock(DeviceTransactionManagerImpl.class); this.powerMgmt = Mockito.mock(PowerMgmtImpl.class); this.openRoadmInterfaces = new OpenRoadmInterfacesImpl(this.deviceTransactionManager, this.mappingUtils, - this.openRoadmInterfacesImpl121, this.openRoadmInterfacesImpl221); - this.olmPowerService = new OlmPowerServiceImpl(this.getDataBroker(), this.powerMgmt, + this.openRoadmInterfacesImpl121, this.openRoadmInterfacesImpl221, this.openRoadmInterfacesImpl710); + this.olmPowerService = new OlmPowerServiceImpl(getDataBroker(), this.powerMgmt, this.deviceTransactionManager, this.portMapping, this.mappingUtils, this.openRoadmInterfaces); - this.dataBroker = this.getDataBroker(); - MockitoAnnotations.initMocks(this); + this.dataBroker = getDataBroker(); + MockitoAnnotations.openMocks(this); Mockito.doReturn(StringConstants.OPENROADM_DEVICE_VERSION_2_2_1).when(this.mappingUtils) .getOpenRoadmVersion(Mockito.anyString()); @@ -99,10 +103,14 @@ public class OlmPowerServiceImplSpanLossBaseTest extends AbstractTest { iidCurrentPmList, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT)).thenReturn(OlmTransactionUtils.getCurrentPmListC()); - InstanceIdentifier interfacesIIDA = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(Interface.class, new InterfaceKey("OTS-DEG2-TTP-TXRX")); - InstanceIdentifier interfacesIIDC = InstanceIdentifier.create(OrgOpenroadmDevice.class) - .child(Interface.class, new InterfaceKey("OTS-DEG1-TTP-TXRX")); + InstanceIdentifier interfacesIIDA = InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .child(Interface.class, new InterfaceKey("OTS-DEG2-TTP-TXRX")) + .build(); + InstanceIdentifier interfacesIIDC = InstanceIdentifier + .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class) + .child(Interface.class, new InterfaceKey("OTS-DEG1-TTP-TXRX")) + .build(); Optional interfaceA = Optional.of(new InterfaceBuilder().setName("OTS-DEG2-TTP-TXRX").build()); Optional interfaceC = Optional.of(new InterfaceBuilder().setName("OTS-DEG1-TTP-TXRX").build()); Mockito.when(this.deviceTransactionManager.getDataFromDevice("ROADM-A1", LogicalDatastoreType.CONFIGURATION, @@ -112,13 +120,15 @@ public class OlmPowerServiceImplSpanLossBaseTest extends AbstractTest { interfacesIIDC, Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT)).thenReturn(interfaceC); - Ots otsValue = new OtsBuilder().setSpanLossTransmit(new RatioDB(new BigDecimal(25))) - .setSpanLossReceive(new RatioDB(new BigDecimal(25))).build(); + Ots otsValue = new OtsBuilder() + .setSpanLossTransmit(new RatioDB(Decimal64.valueOf("25"))) + .setSpanLossReceive(new RatioDB(Decimal64.valueOf("25"))) + .build(); Interface1 ots = new Interface1Builder().setOts(otsValue).build(); Interface interA = new InterfaceBuilder().setName("OTS-DEG2-TTP-TXRX").setType(OpticalTransport.class) - .addAugmentation(Interface1.class, ots).build(); + .addAugmentation(ots).build(); Interface interC = new InterfaceBuilder().setName("OTS-DEG1-TTP-TXRX").setType(OpticalTransport.class) - .addAugmentation(Interface1.class, ots).build(); + .addAugmentation(ots).build(); Optional interOptA = Optional.of(interA); Optional interOptC = Optional.of(interC); Mockito.when(this.openRoadmInterfacesImpl221.getInterface("ROADM-A1", "OTS-DEG2-TTP-TXRX")) @@ -151,7 +161,7 @@ public class OlmPowerServiceImplSpanLossBaseTest extends AbstractTest { Assert.assertEquals("Success", output.getResult()); Assert.assertEquals("ROADM-A1-to-ROADM-C1", output.getSpans().get(0).getLinkId().getValue()); - Assert.assertEquals("15", output.getSpans().get(0).getSpanloss()); + Assert.assertEquals("14.6", output.getSpans().get(0).getSpanloss()); } @Test @@ -174,6 +184,6 @@ public class OlmPowerServiceImplSpanLossBaseTest extends AbstractTest { Assert.assertEquals("Success", output.getResult()); Assert.assertEquals("ROADM-A1-to-ROADM-C1", output.getSpans().get(0).getLinkId().getValue()); - Assert.assertEquals("15", output.getSpans().get(0).getSpanloss()); + Assert.assertEquals("14.6", output.getSpans().get(0).getSpanloss()); } }