package org.opendaylight.transportpce.renderer.provisiondevice;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException;
import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces;
-import org.opendaylight.transportpce.common.service.ServiceTypes;
import org.opendaylight.transportpce.networkmodel.service.NetworkModelService;
import org.opendaylight.transportpce.renderer.openroadminterface.OpenRoadmInterfaceFactory;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.device.renderer.rev210618.OtnServicePathInput;
//TODO Align log messages and returned results messages
@Override
- public OtnServicePathOutput setupOtnServicePath(OtnServicePathInput input) {
+ public OtnServicePathOutput setupOtnServicePath(OtnServicePathInput input, String serviceType) {
LOG.info("Calling setup otn-service path");
if (input.getServiceFormat() == null || input.getServiceRate() == null) {
return new OtnServicePathOutputBuilder()
}
List<NodeInterface> nodeInterfaces = new ArrayList<>();
CopyOnWriteArrayList<LinkTp> otnLinkTps = new CopyOnWriteArrayList<>();
- String serviceType = ServiceTypes.getOtnServiceType(input.getServiceFormat(), input.getServiceRate());
try {
switch (serviceType) {
case StringConstants.SERVICE_TYPE_1GE:
case StringConstants.SERVICE_TYPE_ODUC4:
createOduc4TtpInterface(input, nodeInterfaces, otnLinkTps);
break;
+ case StringConstants.SERVICE_TYPE_100GE_S:
+ LOG.info("Calling Node interface for service-type {}", serviceType);
+ if (input.getNodes() != null) {
+ createHighOrderInterfaces(input, nodeInterfaces, otnLinkTps);
+ LOG.info("Node interfaces created");
+ }
+ break;
default:
LOG.error("Service-type {} not managed yet", serviceType);
return new OtnServicePathOutputBuilder()
// FIXME check if the ForkJoinTask raw type can be avoided
// Raw types use are discouraged since they lack type safety.
// Resulting Problems are observed at run time and not at compile time
- public OtnServicePathOutput deleteOtnServicePath(OtnServicePathInput input) {
+ public OtnServicePathOutput deleteOtnServicePath(OtnServicePathInput input, String serviceType) {
if (input.getNodes() == null) {
LOG.error("Unable to delete otn service path. input nodes = null");
return new OtnServicePathOutputBuilder()
// if the node is currently mounted then proceed.
List<String> interfacesToDelete = new LinkedList<>();
String connectionNumber = "";
- switch (input.getServiceRate().intValue()) {
- case 100:
- if ("ODU".equals(input.getServiceFormat())) {
- interfacesToDelete.add(networkTp + "-ODU4");
- if (node.getNetwork2Tp() != null) {
- interfacesToDelete.add(node.getNetwork2Tp() + "-ODU4");
- }
- } else if ("Ethernet".equals(input.getServiceFormat())) {
- connectionNumber = getConnectionNumber(input.getServiceName(), node, networkTp, "ODU4");
+ switch (serviceType) {
+ case StringConstants.SERVICE_TYPE_100GE_S:
+ connectionNumber = getConnectionNumber(null, node, networkTp, "ODU4");
+ break;
+ case StringConstants.SERVICE_TYPE_100GE_M:
+ connectionNumber = getConnectionNumber(input.getServiceName(), node, networkTp, "ODU4");
+ break;
+ case StringConstants.SERVICE_TYPE_ODU4:
+ interfacesToDelete.add(networkTp + "-ODU4");
+ if (node.getNetwork2Tp() != null) {
+ interfacesToDelete.add(node.getNetwork2Tp() + "-ODU4");
}
break;
- case 400:
- if ("ODU".equals(input.getServiceFormat())) {
- interfacesToDelete.add(networkTp + "-ODUC4");
- if (node.getNetwork2Tp() != null) {
- interfacesToDelete.add(node.getNetwork2Tp() + "-ODUC4");
- }
+ case StringConstants.SERVICE_TYPE_ODUC4:
+ interfacesToDelete.add(networkTp + "-ODUC4");
+ if (node.getNetwork2Tp() != null) {
+ interfacesToDelete.add(node.getNetwork2Tp() + "-ODUC4");
}
break;
- case 10:
+ case StringConstants.SERVICE_TYPE_10GE:
connectionNumber = getConnectionNumber(input.getServiceName(), node, networkTp, "ODU2e");
break;
- case 1:
+ case StringConstants.SERVICE_TYPE_1GE:
connectionNumber = getConnectionNumber(input.getServiceName(), node, networkTp, "ODU0");
break;
default:
- LOG.error("service rate {} not managed yet", input.getServiceRate());
- String result = input.getServiceRate() + " is not supported";
+ LOG.error("service-type {} not managed yet", serviceType);
+ String result = serviceType + " is not supported";
results.add(result);
success.set(false);
return;
this.deviceTransactionManager)) {
interfacesToDelete.add(interf);
String supportedInterface = this.openRoadmInterfaces.getSupportedInterface(nodeId, interf);
- if (input.getServiceRate().intValue() == 100) {
- if (!supportedInterface.contains("ODUC4")) {
- interfacesToDelete.add(supportedInterface);
- }
- } else {
- if (!supportedInterface.contains("ODU4")) {
- interfacesToDelete.add(supportedInterface);
- }
+ if (supportedInterface == null) {
+ continue;
+ }
+ if ((input.getServiceRate().intValue() == 100 && !supportedInterface.contains("ODUC4"))
+ || (input.getServiceRate().intValue() != 100 && !supportedInterface.contains("ODU4"))) {
+ interfacesToDelete.add(supportedInterface);
}
}
}
}
private String getConnectionNumber(String serviceName, Nodes node, String networkTp, String oduType) {
+ List<String> list1 = new ArrayList<>();
+ List<String> list2 = new ArrayList<>(Arrays.asList("x"));
if (node.getClientTp() != null) {
- return String.join("-", node.getClientTp(), oduType, serviceName, "x", networkTp, oduType, serviceName);
+ list1.addAll(Arrays.asList(node.getClientTp(), oduType));
+ list2.addAll(Arrays.asList(networkTp, oduType));
} else if (node.getNetwork2Tp() != null) {
- return String.join("-", networkTp, oduType, serviceName, "x", node.getNetwork2Tp(), oduType, serviceName);
+ list1.addAll(Arrays.asList(networkTp, oduType));
+ list2.addAll(Arrays.asList(node.getNetwork2Tp(), oduType));
} else {
return "";
}
+ if (serviceName != null) {
+ list1.add(serviceName);
+ list2.add(serviceName);
+ }
+ list1.addAll(list2);
+ return String.join("-", list1);
}
private Optional<String> postCrossConnect(List<String> createdOduInterfaces, Nodes node)
}
}
+ private void createHighOrderInterfaces(OtnServicePathInput input, List<NodeInterface> nodeInterfaces,
+ CopyOnWriteArrayList<LinkTp> linkTpList) throws OpenRoadmInterfaceException {
+ for (Nodes node : input.getNodes()) {
+ // check if the node is mounted or not?
+ List<String> createdEthInterfaces = new ArrayList<>();
+ List<String> createdOduInterfaces = new ArrayList<>();
+ switch (input.getServiceRate().intValue()) {
+ case 100:
+ LOG.info("Input service is 100G");
+ if (node.getClientTp() != null) {
+ String supEthInter = openRoadmInterfaceFactory.createOpenRoadmEth100GInterface(
+ node.getNodeId(), node.getClientTp());
+ createdEthInterfaces.add(supEthInter);
+ createdOduInterfaces.add(openRoadmInterfaceFactory.createOpenRoadmOdu4HOInterface(
+ node.getNodeId(), node.getClientTp(), false, supEthInter));
+ }
+ createdOduInterfaces.add(
+ // supporting interface? payload ?
+ openRoadmInterfaceFactory.createOpenRoadmOdu4HOInterface(node.getNodeId(), node.getNetworkTp(),
+ true, null));
+ linkTpList.add(
+ new LinkTpBuilder().setNodeId(node.getNodeId()).setTpId(node.getNetworkTp()).build());
+ if (node.getNetwork2Tp() != null) {
+ createdOduInterfaces.add(
+ // supporting interface? payload ?
+ openRoadmInterfaceFactory.createOpenRoadmOdu4HOInterface(node.getNodeId(),
+ node.getNetwork2Tp(), true, null));
+ linkTpList.add(
+ new LinkTpBuilder().setNodeId(node.getNodeId()).setTpId(node.getNetworkTp()).build());
+ }
+ break;
+ default:
+ LOG.error("service rate {} not managed yet", input.getServiceRate());
+ return;
+ }
+
+ // implement cross connect
+ List<String> createdConnections = new ArrayList<>();
+ if (!createdOduInterfaces.isEmpty()) {
+ Optional<String> connectionNameOpt = postCrossConnect(createdOduInterfaces, node);
+ createdConnections.add(connectionNameOpt.get());
+ LOG.info("Created cross connects");
+ }
+ nodeInterfaces.add(new NodeInterfaceBuilder()
+ .withKey(new NodeInterfaceKey(node.getNodeId()))
+ .setNodeId(node.getNodeId())
+ .setConnectionId(createdConnections)
+ .setEthInterfaceId(createdEthInterfaces)
+ .setOduInterfaceId(createdOduInterfaces)
+ .build());
+ }
+ }
+
private void createOduc4TtpInterface(OtnServicePathInput input, List<NodeInterface> nodeInterfaces,
CopyOnWriteArrayList<LinkTp> linkTpList) throws OpenRoadmInterfaceException {
if (input.getNodes() == null) {
Code Review / transportpce.git / blobdiff