package org.opendaylight.transportpce.renderer.provisiondevice;
import com.google.common.collect.Sets;
-
+import com.google.common.util.concurrent.FluentFuture;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.ReadTransaction;
+import org.opendaylight.mdsal.binding.api.WriteTransaction;
+import org.opendaylight.mdsal.common.api.CommitInfo;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.transportpce.common.StringConstants;
import org.opendaylight.transportpce.common.Timeouts;
import org.opendaylight.transportpce.common.crossconnect.CrossConnect;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102.ServiceNodelist;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102.service.nodelist.NodelistBuilder;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102.service.nodelist.NodelistKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.Mapping;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.CreateOtsOmsInput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.CreateOtsOmsOutput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.CreateOtsOmsOutputBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.RendererRollbackInput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.RendererRollbackOutput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.RendererRollbackOutputBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.ServicePathInput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.ServicePathOutput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.ServicePathOutputBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.renderer.rollback.output.FailedToRollback;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.renderer.rollback.output.FailedToRollbackBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev170228.renderer.rollback.output.FailedToRollbackKey;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev161014.service.Topology;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200128.network.nodes.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev200128.CreateOtsOmsInput;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev200128.CreateOtsOmsOutput;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev200128.CreateOtsOmsOutputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev200128.RendererRollbackInput;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev200128.RendererRollbackOutput;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev200128.RendererRollbackOutputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev200128.ServicePathInput;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev200128.ServicePathOutput;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev200128.ServicePathOutputBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev200128.renderer.rollback.output.FailedToRollback;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev200128.renderer.rollback.output.FailedToRollbackBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.device.rev200128.renderer.rollback.output.FailedToRollbackKey;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.common.service.types.rev190531.service.Topology;
import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev161014.OchAttributes.ModulationFormat;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev161014.R100G;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.ServiceList;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.service.list.Services;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.service.list.ServicesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev161014.service.list.ServicesKey;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.node.interfaces.NodeInterface;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.node.interfaces.NodeInterfaceBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.node.interfaces.NodeInterfaceKey;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev170907.olm.renderer.input.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.ServiceList;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.list.Services;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.list.ServicesBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.list.ServicesKey;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200128.node.interfaces.NodeInterface;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200128.node.interfaces.NodeInterfaceBuilder;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200128.node.interfaces.NodeInterfaceKey;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.common.types.rev200128.olm.renderer.input.Nodes;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Long waveNumber = input.getWaveNumber();
if ((destTp != null) && destTp.contains(StringConstants.NETWORK_TOKEN)) {
crossConnectFlag++;
- // create OpenRoadm Xponder Line Interfaces
+ Mapping mapping = this.portMapping.getMapping(nodeId,destTp);
String supportingOchInterface = this.openRoadmInterfaceFactory.createOpenRoadmOchInterface(
- nodeId, destTp, waveNumber, R100G.class, ModulationFormat.DpQpsk);
+ nodeId, destTp, waveNumber, ModulationFormat.DpQpsk);
createdOchInterfaces.add(supportingOchInterface);
String supportingOtuInterface = this.openRoadmInterfaceFactory
.createOpenRoadmOtu4Interface(nodeId, destTp, supportingOchInterface);
createdOtuInterfaces.add(supportingOtuInterface);
- createdOduInterfaces.add(this.openRoadmInterfaceFactory.createOpenRoadmOdu4Interface(nodeId,
- destTp, supportingOtuInterface));
+ if (mapping != null && mapping.getXponderType() != null
+ && (mapping.getXponderType().getIntValue() == 3
+ || mapping.getXponderType().getIntValue() == 2)) {
+ createdOduInterfaces.add(this.openRoadmInterfaceFactory
+ .createOpenRoadmOtnOdu4Interface(nodeId,destTp, supportingOtuInterface));
+ } else {
+ createdOduInterfaces.add(this.openRoadmInterfaceFactory.createOpenRoadmOdu4Interface(nodeId,
+ destTp, supportingOtuInterface));
+ }
}
if ((srcTp != null) && srcTp.contains(StringConstants.CLIENT_TOKEN)) {
crossConnectFlag++;
crossConnectFlag++;
// create OpenRoadm Xponder Line Interfaces
String supportingOchInterface = this.openRoadmInterfaceFactory.createOpenRoadmOchInterface(
- nodeId, srcTp, waveNumber, R100G.class, ModulationFormat.DpQpsk);
+ nodeId, srcTp, waveNumber, ModulationFormat.DpQpsk);
createdOchInterfaces.add(supportingOchInterface);
String supportingOtuInterface = this.openRoadmInterfaceFactory
.createOpenRoadmOtu4Interface(nodeId, srcTp, supportingOchInterface);
createdOtuInterfaces.add(supportingOtuInterface);
createdOduInterfaces.add(this.openRoadmInterfaceFactory.createOpenRoadmOdu4Interface(nodeId,
srcTp, supportingOtuInterface));
+ Mapping mapping = this.portMapping.getMapping(nodeId,srcTp);
+ if (mapping != null && mapping.getXponderType() != null
+ && (mapping.getXponderType().getIntValue() == 3
+ || mapping.getXponderType().getIntValue() == 2)) {
+ createdOduInterfaces.add(this.openRoadmInterfaceFactory
+ .createOpenRoadmOtnOdu4Interface(nodeId, destTp, supportingOtuInterface));
+ } else {
+ createdOduInterfaces.add(this.openRoadmInterfaceFactory.createOpenRoadmOdu4Interface(nodeId,
+ destTp, supportingOtuInterface));
+ }
}
if ((destTp != null) && destTp.contains(StringConstants.CLIENT_TOKEN)) {
crossConnectFlag++;
processErrorMessage("Setup service path failed! Exception:" + ex.toString(), forkJoinPool, results);
success.set(false);
}
- NodeInterfaceBuilder nodeInterfaceBuilder = new NodeInterfaceBuilder();
- nodeInterfaceBuilder.withKey(new NodeInterfaceKey(nodeId));
- nodeInterfaceBuilder.setNodeId(nodeId);
- nodeInterfaceBuilder.setConnectionId(createdConnections);
- nodeInterfaceBuilder.setEthInterfaceId(createdEthInterfaces);
- nodeInterfaceBuilder.setOtuInterfaceId(createdOtuInterfaces);
- nodeInterfaceBuilder.setOduInterfaceId(createdOduInterfaces);
- nodeInterfaceBuilder.setOchInterfaceId(createdOchInterfaces);
+ NodeInterfaceBuilder nodeInterfaceBuilder = new NodeInterfaceBuilder()
+ .withKey(new NodeInterfaceKey(nodeId))
+ .setNodeId(nodeId)
+ .setConnectionId(createdConnections)
+ .setEthInterfaceId(createdEthInterfaces)
+ .setOtuInterfaceId(createdOtuInterfaces)
+ .setOduInterfaceId(createdOduInterfaces)
+ .setOchInterfaceId(createdOchInterfaces);
nodeInterfaces.add(nodeInterfaceBuilder.build());
}));
try {
if (success.get()) {
results.add("Roadm-connection successfully created for nodes: " + String.join(", ", nodesProvisioned));
}
- ServicePathOutputBuilder setServBldr = new ServicePathOutputBuilder();
- setServBldr.setNodeInterface(new ArrayList<>(nodeInterfaces));
- setServBldr.setSuccess(success.get());
- setServBldr.setResult(String.join("\n", results));
+ ServicePathOutputBuilder setServBldr = new ServicePathOutputBuilder()
+ .setNodeInterface(new ArrayList<>(nodeInterfaces))
+ .setSuccess(success.get())
+ .setResult(String.join("\n", results));
// setting topology in the service list data store
try {
setTopologyForService(input.getServiceName(), topology.getTopology());
List<String> interfacesToDelete = new LinkedList<>();
String nodeId = node.getNodeId();
LOG.info("Deleting service setup on node {}", nodeId);
- String srcTp = node.getSrcTp();
- String destTp = node.getDestTp();
+ String srcTp;
+ String destTp;
Long waveNumber = input.getWaveNumber();
- if ((srcTp == null) || (destTp == null)) {
- LOG.error("Source ({}) or destination ({}) termination point is null.", srcTp, destTp);
+ if (node.getDestTp() == null) {
+ LOG.error("Destination termination point must not be null.");
return;
+ } else {
+ destTp = node.getDestTp();
+ }
+ if (node.getSrcTp() != null) {
+ srcTp = node.getSrcTp();
+ } else {
+ srcTp = "";
}
// if the node is currently mounted then proceed.
if (this.deviceTransactionManager.isDeviceMounted(nodeId)) {
|| srcTp.contains(StringConstants.NETWORK_TOKEN)
|| destTp.contains(StringConstants.CLIENT_TOKEN)) {
if (destTp.contains(StringConstants.NETWORK_TOKEN)) {
- interfacesToDelete.add(destTp + "-ODU");
+ try {
+ if (this.openRoadmInterfaces.getInterface(nodeId, destTp + "-ODU").isPresent()) {
+ interfacesToDelete.add(destTp + "-ODU");
+ }
+ if (this.openRoadmInterfaces.getInterface(nodeId, destTp + "-ODU4").isPresent()) {
+ interfacesToDelete.add(destTp + "-ODU4");
+ }
+ }
+ catch (OpenRoadmInterfaceException e) {
+ LOG.error("impossible to get interface {} or {}", destTp + "-ODU", destTp + "-ODU4", e);
+ }
interfacesToDelete.add(destTp + "-OTU");
interfacesToDelete.add(
this.openRoadmInterfaceFactory.createOpenRoadmOchInterfaceName(destTp, waveNumber));
}
} else {
String connectionNumber = srcTp + "-" + destTp + "-" + waveNumber;
- List<String> intToDelete = this.crossConnect.deleteCrossConnect(nodeId, connectionNumber);
+ List<String> intToDelete = this.crossConnect.deleteCrossConnect(nodeId, connectionNumber, false);
connectionNumber = destTp + "-" + srcTp + "-" + waveNumber;
if (intToDelete != null) {
for (String interf : intToDelete) {
List<String> failedInterfaces = new ArrayList<>();
String nodeId = nodeInterfaces.getNodeId();
for (String connectionId : nodeInterfaces.getConnectionId()) {
- List<String> listInter = this.crossConnect.deleteCrossConnect(nodeId, connectionId);
+ List<String> listInter = this.crossConnect.deleteCrossConnect(nodeId, connectionId, false);
if (listInter != null) {
LOG.info("Cross connect {} on node {} successfully deleted.", connectionId, nodeId);
} else {
}
private boolean alarmSuppressionNodeRegistration(ServicePathInput input) {
- NodelistBuilder nodeListBuilder = new NodelistBuilder();
- nodeListBuilder.withKey(new NodelistKey(input.getServiceName()));
- nodeListBuilder.setServiceName(input.getServiceName());
+ NodelistBuilder nodeListBuilder = new NodelistBuilder()
+ .withKey(new NodelistKey(input.getServiceName()))
+ .setServiceName(input.getServiceName());
List<org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.alarmsuppression.rev171102.service
.nodelist.nodelist.Nodes> nodeList =
new ArrayList<>();
new NodelistKey(input.getServiceName()));
final WriteTransaction writeTransaction = this.dataBroker.newWriteOnlyTransaction();
writeTransaction.merge(LogicalDatastoreType.CONFIGURATION, nodeListIID, nodeListBuilder.build());
- Future<Void> submit = writeTransaction.submit();
+ FluentFuture<? extends @NonNull CommitInfo> commit = writeTransaction.commit();
try {
- submit.get(Timeouts.DATASTORE_WRITE, TimeUnit.MILLISECONDS);
+ commit.get(Timeouts.DATASTORE_WRITE, TimeUnit.MILLISECONDS);
LOG.info("Nodes are register for alarm suppression for service: {}", input.getServiceName());
return true;
} catch (ExecutionException | InterruptedException | TimeoutException e) {
new NodelistKey(serviceName));
final WriteTransaction writeTransaction = this.dataBroker.newWriteOnlyTransaction();
writeTransaction.delete(LogicalDatastoreType.CONFIGURATION, nodeListIID);
- Future<Void> submit = writeTransaction.submit();
+ FluentFuture<? extends @NonNull CommitInfo> commit = writeTransaction.commit();
try {
- submit.get(Timeouts.DATASTORE_DELETE, TimeUnit.MILLISECONDS);
+ commit.get(Timeouts.DATASTORE_DELETE, TimeUnit.MILLISECONDS);
LOG.info("Nodes are unregister for alarm suppression for service: {}", serviceName);
return true;
} catch (InterruptedException | TimeoutException | ExecutionException e) {
InstanceIdentifier<Services> iid =
InstanceIdentifier.create(ServiceList.class).child(Services.class, serviceKey);
Optional<Services> services;
- try (ReadOnlyTransaction readTx = this.dataBroker.newReadOnlyTransaction()) {
- Future<com.google.common.base.Optional<Services>> future =
+ try (ReadTransaction readTx = this.dataBroker.newReadOnlyTransaction()) {
+ Future<java.util.Optional<Services>> future =
readTx.read(LogicalDatastoreType.OPERATIONAL, iid);
- services = future.get(Timeouts.DATASTORE_READ, TimeUnit.MILLISECONDS).toJavaUtil();
+ services = future.get(Timeouts.DATASTORE_READ, TimeUnit.MILLISECONDS);
} catch (InterruptedException | ExecutionException | TimeoutException e) {
throw e;
}
if (services.isPresent()) {
LOG.info("service {} already exists", name);
- servicesBuilder = new ServicesBuilder(services.get());
- servicesBuilder.setTopology(topo);
+ servicesBuilder = new ServicesBuilder(services.get()).setTopology(topo);
WriteTransaction writeTx = this.dataBroker.newWriteOnlyTransaction();
writeTx.merge(LogicalDatastoreType.OPERATIONAL, iid, servicesBuilder.build());
- writeTx.submit().get(Timeouts.DATASTORE_WRITE, TimeUnit.MILLISECONDS);
+ writeTx.commit().get(Timeouts.DATASTORE_WRITE, TimeUnit.MILLISECONDS);
} else {
LOG.warn("Service {} does not exist - topology can not be updated", name);
}
Code Review / transportpce.git / blobdiff