import org.opendaylight.transportpce.common.device.DeviceTransaction;
import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.OduConnection.Direction;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.OrgOpenroadmDeviceData;
import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.org.openroadm.device.container.OrgOpenroadmDevice;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.org.openroadm.device.container.org.openroadm.device.OduConnection;
import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.org.openroadm.device.container.org.openroadm.device.OduConnectionBuilder;
import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.org.openroadm.device.container.org.openroadm.device.OduConnectionKey;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev210618.otn.renderer.nodes.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev220926.otn.renderer.nodes.Nodes;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
this.deviceTransactionManager = deviceTransactionManager;
}
- public Optional<org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.org.openroadm.device.container
- .org.openroadm.device.OduConnection> getOtnCrossConnect(String deviceId, String connectionNumber) {
-
+ public Optional<OduConnection> getOtnCrossConnect(String deviceId, String connectionNumber) {
return deviceTransactionManager.getDataFromDevice(deviceId, LogicalDatastoreType.OPERATIONAL,
generateOduConnectionIID(connectionNumber), Timeouts.DEVICE_READ_TIMEOUT,
Timeouts.DEVICE_READ_TIMEOUT_UNIT);
}
- private InstanceIdentifier<org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.org.openroadm.device
- .container.org.openroadm.device.OduConnection> generateOduConnectionIID(String connectionNumber) {
-
- return InstanceIdentifier.create(OrgOpenroadmDevice.class).child(org.opendaylight.yang.gen.v1.http.org
- .openroadm.device.rev200529.org.openroadm.device.container.org.openroadm.device.OduConnection.class,
- new OduConnectionKey(connectionNumber));
+ private InstanceIdentifier<OduConnection> generateOduConnectionIID(String connectionNumber) {
+ return InstanceIdentifier
+ .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class)
+ .child(OduConnection.class, new OduConnectionKey(connectionNumber))
+ .build();
}
public Optional<String> postOtnCrossConnect(List<String> createdOduInterfaces, Nodes node) {
String deviceId = node.getNodeId();
String srcTp = createdOduInterfaces.get(0);
String dstTp = createdOduInterfaces.get(1);
-
+ LOG.debug("Client TP: {}, Network TP: {}, Network2TP: {} SrcTP: {}, DstTP: {}",
+ node.getClientTp(), node.getNetworkTp(), node.getNetwork2Tp(), srcTp, dstTp);
+ if (!srcTp.contains(node.getClientTp())) {
+ // If the src-tp does not contain client port, then we swap src-tp & dest-tp
+ String tmp;
+ tmp = dstTp;
+ dstTp = srcTp;
+ srcTp = tmp;
+ LOG.debug("After swap, SrcTP: {}, DstTP: {}", srcTp, dstTp);
+ }
+ // Strip the service name from the src and dst
+ String oduXConnectionName = srcTp.split(":")[0] + "-x-" + dstTp.split(":")[0];
OduConnectionBuilder oduConnectionBuilder = new OduConnectionBuilder()
- .setConnectionName(srcTp + "-x-" + dstTp)
+ .setConnectionName(oduXConnectionName)
.setDestination(new org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.odu.connection
.DestinationBuilder().setDstIf(dstTp).build())
.setSource(new org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.odu.connection
.SourceBuilder().setSrcIf(srcTp).build())
.setDirection(Direction.Bidirectional);
- InstanceIdentifier<org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.org.openroadm.device
- .container.org.openroadm.device.OduConnection> oduConnectionIID =
- InstanceIdentifier.create(
- org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.org.openroadm.device.container
- .OrgOpenroadmDevice.class)
- .child(org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev200529.org.openroadm.device
- .container.org.openroadm.device.OduConnection.class,
- new OduConnectionKey(oduConnectionBuilder.getConnectionName())
- );
+ InstanceIdentifier<OduConnection> oduConnectionIID = InstanceIdentifier
+ .builderOfInherited(OrgOpenroadmDeviceData.class, OrgOpenroadmDevice.class)
+ .child(OduConnection.class, new OduConnectionKey(oduConnectionBuilder.getConnectionName()))
+ .build();
Future<Optional<DeviceTransaction>> deviceTxFuture = deviceTransactionManager.getDeviceTransaction(deviceId);
DeviceTransaction deviceTx;
try {
Optional<DeviceTransaction> deviceTxOpt = deviceTxFuture.get();
if (deviceTxOpt.isPresent()) {
- deviceTx = deviceTxOpt.get();
+ deviceTx = deviceTxOpt.orElseThrow();
} else {
LOG.error("Device transaction for device {} was not found!", deviceId);
return Optional.empty();
deviceTx.commit(Timeouts.DEVICE_WRITE_TIMEOUT, Timeouts.DEVICE_WRITE_TIMEOUT_UNIT);
try {
commit.get();
- LOG.info("Otn-connection successfully created: {}-{}", srcTp, dstTp);
- return Optional.of(srcTp + "-x-" + dstTp);
+ LOG.info("Otn-connection successfully created: {}", oduXConnectionName);
+ return Optional.of(oduXConnectionName);
} catch (InterruptedException | ExecutionException e) {
LOG.warn("Failed to post {}.", oduConnectionBuilder.build(), e);
}
.container.org.openroadm.device.OduConnection> otnXc = getOtnCrossConnect(deviceId, connectionName);
if (otnXc.isPresent()) {
- interfList.add(otnXc.get().getSource().getSrcIf());
- interfList.add(otnXc.get().getDestination().getDstIf());
+ interfList.add(otnXc.orElseThrow().getSource().getSrcIf());
+ interfList.add(otnXc.orElseThrow().getDestination().getDstIf());
} else {
LOG.warn("Cross connect {} does not exist, halting delete", connectionName);
return null;
try {
Optional<DeviceTransaction> deviceTxOpt = deviceTxFuture.get();
if (deviceTxOpt.isPresent()) {
- deviceTx = deviceTxOpt.get();
+ deviceTx = deviceTxOpt.orElseThrow();
} else {
LOG.error("Device transaction for device {} was not found!", deviceId);
return null;