import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
-import java.math.BigDecimal;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
import org.opendaylight.transportpce.common.device.DeviceTransactionManagerImpl;
import org.opendaylight.transportpce.common.fixedflex.SpectrumInformation;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210425.network.NodesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210425.network.NodesKey;
import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.OpticalControlMode;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.degree.ConnectionPorts;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.degree.ConnectionPortsBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.OrgOpenroadmDeviceData;
import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.OrgOpenroadmDevice;
import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.RoadmConnections;
import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev181019.org.openroadm.device.container.org.openroadm.device.RoadmConnectionsKey;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev201211.otn.renderer.input.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210930.otn.renderer.nodes.Nodes;
import org.opendaylight.yangtools.util.concurrent.FluentFutures;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Decimal64;
import org.opendaylight.yangtools.yang.common.Uint32;
public class CrossConnectImpl221Test {
crossConnectImpl221 = new CrossConnectImpl221(deviceTransactionManager);
//mock responses for deviceTransactionManager calls
- InstanceIdentifier<RoadmConnections> deviceIID =
- InstanceIdentifier
- .create(OrgOpenroadmDevice.class)
- .child(RoadmConnections.class, new RoadmConnectionsKey("1"));
+ InstanceIdentifier<RoadmConnections> deviceIID = InstanceIdentifier
+ .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class)
+ .child(RoadmConnections.class, new RoadmConnectionsKey("1"))
+ .build();
Mockito.when(deviceTransactionManager.getDataFromDevice("deviceId",
LogicalDatastoreType.CONFIGURATION, deviceIID,
spectrumInformation.setWaveLength(Uint32.valueOf(1));
spectrumInformation.setLowerSpectralSlotNumber(761);
spectrumInformation.setHigherSpectralSlotNumber(768);
- Optional res = crossConnectImpl221.postCrossConnect("deviceId", "srcTp", "destTp", spectrumInformation);
+ Optional<String> res = crossConnectImpl221.postCrossConnect("deviceId", "srcTp", "destTp", spectrumInformation);
Assert.assertEquals(res.get(), "srcTp-destTp-761:768");
}
@Test(expected = NullPointerException.class)
public void setPowerLevelTest() {
- InstanceIdentifier<RoadmConnections> deviceIID =
- InstanceIdentifier.create(OrgOpenroadmDevice.class)
- .child(RoadmConnections.class, new RoadmConnectionsKey("1"));
+ InstanceIdentifier<RoadmConnections> deviceIID = InstanceIdentifier
+ .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class)
+ .child(RoadmConnections.class, new RoadmConnectionsKey("1"))
+ .build();
Mockito.when(deviceTransactionManager.getDataFromDevice("deviceId",
LogicalDatastoreType.OPERATIONAL, deviceIID,
Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT))
Mockito.when(deviceTransactionManager.getDeviceTransaction("deviceId"))
.thenReturn(CompletableFuture.completedFuture(Optional.of(mock(DeviceTransaction.class))));
- boolean res = crossConnectImpl221
- .setPowerLevel("deviceId", OpticalControlMode.GainLoss, new BigDecimal(100), "1");
+ crossConnectImpl221.setPowerLevel("deviceId", OpticalControlMode.GainLoss, Decimal64.valueOf("100"), "1");
Assert.assertTrue("set Level should be true", true);
}
@Test(expected = NullPointerException.class)
public void postOtnCrossConnect() {
- NodesBuilder nodesBldr = new NodesBuilder().withKey(new NodesKey("nodeId")).setNodeId("nodeId");
Nodes nodes = Mockito.mock(Nodes.class);
Mockito.when(nodes.getNodeId()).thenReturn("nodeId");
Mockito.when(deviceTransactionManager.getDeviceTransaction(any()))
.thenReturn(CompletableFuture.completedFuture(Optional.of(mock(DeviceTransaction.class))));
- Optional res = crossConnectImpl221.postOtnCrossConnect(List.of("src1", "src2"), nodes);
+ Optional<String> res = crossConnectImpl221.postOtnCrossConnect(List.of("src1", "src2"), nodes);
Assert.assertTrue("Optional value should have a value", res.isPresent());
}
-
-
- private ConnectionPorts getConnectionPorts(String c1, String p1) {
- return new ConnectionPortsBuilder().setCircuitPackName(c1).setPortName(p1).build();
- }
}