<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>7.0.9</version>
+ <version>8.0.4</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>7.0.9</version>
+ <version>8.0.4</version>
<relativePath />
</parent>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-artifacts</artifactId>
- <version>1.13.4</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.mdsal</groupId>
- <artifactId>mdsal-artifacts</artifactId>
- <version>7.0.9</version>
+ <version>2.0.3</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<artifactId>mdsal-binding-dom-adapter</artifactId>
</dependency>
<!-- Aluminium bump: undocumented new dependencies -->
- <dependency>
+ <!-- dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-dom-broker</artifactId>
- </dependency>
- <dependency>
+ </dependency-->
+ <!-- dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-dom-inmemory-datastore</artifactId>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.opendaylight.transportpce</groupId>
<artifactId>test-common</artifactId>
LOG.info("Found MC-cap for {} - {}. Mapping: {}", nodeId, mcLcp, mcCap.toString());
return mcCap;
}
- LOG.warn("Could not find mapping for logical connection point {} for nodeId {}", mcLcp, nodeId);
+ LOG.warn("Could not find mc-capabilities for logical connection point {} for nodeId {}", mcLcp, nodeId);
} catch (InterruptedException | ExecutionException ex) {
LOG.error("Unable to read mapping for logical connection point : {} for nodeId {}", mcLcp,
nodeId, ex);
InstanceIdentifier<Ports> port2ID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
.child(CircuitPacks.class,
new CircuitPacksKey(port.getPartnerPort().getCircuitPackName()))
- .child(Ports.class, new PortsKey(port.getPartnerPort().getPortName().toString()));
+ .child(Ports.class, new PortsKey(port.getPartnerPort().getPortName()));
Optional<Ports> port2Object = this.deviceTransactionManager
.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, port2ID,
Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
|| port2Object.get().getPortQual().getIntValue()
!= Port.PortQual.RoadmExternal.getIntValue()) {
LOG.error("{} : port {} on {} - error getting partner",
- nodeId, port.getPartnerPort().getPortName().toString(),
+ nodeId, port.getPartnerPort().getPortName(),
port.getPartnerPort().getCircuitPackName());
continue;
}
return null;
}
Optional<Ports> poOpt = cpOpt.get().nonnullPorts().values().stream()
- .filter(p -> p.getPortName().equals(port.getPartnerPort().getPortName().toString()))
+ .filter(p -> p.getPortName().equals(port.getPartnerPort().getPortName()))
.findFirst();
if (!poOpt.isPresent()) {
LOG.error("{} : Error fetching port {} on {}",
.child(CircuitPacks.class,
new CircuitPacksKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName()))
.child(Ports.class,
- new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString()));
+ new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName()));
LOG.debug("{} : Fetching connection-port {} at circuit pack {}",
nodeId,
connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(),
InstanceIdentifier<Ports> port1ID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
.child(CircuitPacks.class, new CircuitPacksKey(cp1Name))
.child(Ports.class,
- new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString()));
+ new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName()));
LOG.debug("{} : Fetching connection-port {} at circuit pack {}",
nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(), cp1Name);
Optional<Ports> port1Object = this.deviceTransactionManager.getDataFromDevice(nodeId,
InstanceIdentifier<Ports> port2ID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
.child(CircuitPacks.class, new CircuitPacksKey(cp2Name))
.child(Ports.class,
- new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName().toString()));
+ new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName()));
LOG.debug("{} : Fetching connection-port {} at circuit pack {}",
nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName(), cp2Name);
Optional<Ports> port2Object = this.deviceTransactionManager.getDataFromDevice(nodeId,
Timeouts.DEVICE_READ_TIMEOUT_UNIT);
if (!port1Object.isPresent() || !port2Object.isPresent()) {
LOG.error("No port {} on circuit pack {} for node {}",
- connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString(),
+ connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(),
connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName(), nodeId);
return false;
}
for (XpdrPort xpdrPort : xponder.nonnullXpdrPort().values().stream()
.sorted((xp1, xp2) -> xp1.getIndex().compareTo(xp2.getIndex())).collect(Collectors.toList())) {
String circuitPackName = xpdrPort.getCircuitPackName();
- String portName = xpdrPort.getPortName().toString();
+ String portName = xpdrPort.getPortName();
// If there xponder-subtree has missing circuit-packs or ports,
// This gives a null-pointer expection,
if (device.nonnullCircuitPacks().values().stream()
InstanceIdentifier<Ports> port2ID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
.child(CircuitPacks.class,
new CircuitPacksKey(port.getPartnerPort().getCircuitPackName()))
- .child(Ports.class, new PortsKey(port.getPartnerPort().getPortName().toString()));
+ .child(Ports.class, new PortsKey(port.getPartnerPort().getPortName()));
Optional<Ports> port2Object = this.deviceTransactionManager
.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, port2ID,
Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
|| port2Object.get().getPortQual().getIntValue()
!= PortQual.RoadmExternal.getIntValue()) {
LOG.error("{} : port {} on {} - error getting partner",
- nodeId, port.getPartnerPort().getPortName().toString(),
+ nodeId, port.getPartnerPort().getPortName(),
port.getPartnerPort().getCircuitPackName());
continue;
}
return null;
}
Optional<Ports> poOpt = cpOpt.get().nonnullPorts().values().stream()
- .filter(p -> p.getPortName().equals(port.getPartnerPort().getPortName().toString()))
+ .filter(p -> p.getPortName().equals(port.getPartnerPort().getPortName()))
.findFirst();
if (!poOpt.isPresent()) {
LOG.error("{} : Error fetching port {} on {}",
.child(CircuitPacks.class,
new CircuitPacksKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName()))
.child(Ports.class,
- new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString()));
+ new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName()));
LOG.debug("{} : Fetching connection-port {} at circuit pack {}",
nodeId,
connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(),
InstanceIdentifier<Ports> port1ID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
.child(CircuitPacks.class, new CircuitPacksKey(cp1Name))
.child(Ports.class,
- new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString()));
+ new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName()));
LOG.debug("{} : Fetching connection-port {} at circuit pack {}",
nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(), cp1Name);
Optional<Ports> port1Object = this.deviceTransactionManager.getDataFromDevice(nodeId,
InstanceIdentifier<Ports> port2ID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
.child(CircuitPacks.class, new CircuitPacksKey(cp2Name))
.child(Ports.class,
- new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName().toString()));
+ new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName()));
LOG.debug("{} : Fetching connection-port {} at circuit pack {}",
nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName(), cp2Name);
Optional<Ports> port2Object = this.deviceTransactionManager.getDataFromDevice(nodeId,
for (XpdrPort xpdrPort : xponder.nonnullXpdrPort().values().stream()
.sorted((xp1, xp2) -> xp1.getIndex().compareTo(xp2.getIndex())).collect(Collectors.toList())) {
String circuitPackName = xpdrPort.getCircuitPackName();
- String portName = xpdrPort.getPortName().toString();
+ String portName = xpdrPort.getPortName();
// If there xponder-subtree has missing circuit-packs or ports,
// This gives a null-pointer expection,
if (device.nonnullCircuitPacks().values().stream()
InstanceIdentifier<Ports> port2ID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
.child(CircuitPacks.class,
new CircuitPacksKey(port.getPartnerPort().getCircuitPackName()))
- .child(Ports.class, new PortsKey(port.getPartnerPort().getPortName().toString()));
+ .child(Ports.class, new PortsKey(port.getPartnerPort().getPortName()));
Optional<Ports> port2Object = this.deviceTransactionManager
.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, port2ID,
Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
|| port2Object.get().getPortQual().getIntValue()
!= PortQual.RoadmExternal.getIntValue()) {
LOG.error("{} : port {} on {} - error getting partner",
- nodeId, port.getPartnerPort().getPortName().toString(),
+ nodeId, port.getPartnerPort().getPortName(),
port.getPartnerPort().getCircuitPackName());
continue;
}
return null;
}
Optional<Ports> poOpt = cpOpt.get().nonnullPorts().values().stream()
- .filter(p -> p.getPortName().equals(port.getPartnerPort().getPortName().toString()))
+ .filter(p -> p.getPortName().equals(port.getPartnerPort().getPortName()))
.findFirst();
if (!poOpt.isPresent()) {
LOG.error("{} : Error fetching port {} on {}",
.child(CircuitPacks.class,
new CircuitPacksKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getCircuitPackName()))
.child(Ports.class,
- new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString()));
+ new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName()));
LOG.debug("{} : Fetching connection-port {} at circuit pack {}",
nodeId,
connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(),
InstanceIdentifier<Ports> port1ID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
.child(CircuitPacks.class, new CircuitPacksKey(cp1Name))
.child(Ports.class,
- new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName().toString()));
+ new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName()));
LOG.debug("{} : Fetching connection-port {} at circuit pack {}",
nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(0).getPortName(), cp1Name);
Optional<Ports> port1Object = this.deviceTransactionManager.getDataFromDevice(nodeId,
InstanceIdentifier<Ports> port2ID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
.child(CircuitPacks.class, new CircuitPacksKey(cp2Name))
.child(Ports.class,
- new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName().toString()));
+ new PortsKey(connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName()));
LOG.debug("{} : Fetching connection-port {} at circuit pack {}",
nodeId, connectionPortMap.get(cpMapEntry.getKey()).get(1).getPortName(), cp2Name);
Optional<Ports> port2Object = this.deviceTransactionManager.getDataFromDevice(nodeId,
import org.opendaylight.yang.gen.v1.gnpy.gnpy.api.rev190103.GnpyApi;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.data.codec.gson.JSONCodecFactorySupplier;
DataObjectConverter dataObjectConverter = JSONDataObjectConverter
.createWithDataStoreUtil(getDataStoreContextUtil());
try (Reader reader = new FileReader("src/test/resources/gnpy_request.json", StandardCharsets.UTF_8)) {
- NormalizedNode<? extends PathArgument, ?> normalizedNode = dataObjectConverter
+ NormalizedNode normalizedNode = dataObjectConverter
.transformIntoNormalizedNode(reader).get();
GnpyApi gnpyRequest = (GnpyApi) getDataStoreContextUtil().getBindingDOMCodecServices()
.fromNormalizedNode(YangInstanceIdentifier.of(GnpyApi.QNAME), normalizedNode).getValue();
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210426.Network;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
DataObjectConverter dataObjectConverter = JSONDataObjectConverter
.createWithDataStoreUtil(getDataStoreContextUtil());
try (Reader reader = new FileReader("src/test/resources/network.json", StandardCharsets.UTF_8)) {
- NormalizedNode<? extends PathArgument, ?> normalizedNode = dataObjectConverter
+ NormalizedNode normalizedNode = dataObjectConverter
.transformIntoNormalizedNode(reader).get();
Network network = (Network) getDataStoreContextUtil()
.getBindingDOMCodecServices().fromNormalizedNode(YangInstanceIdentifier
-{"gnpy-api":{"topology-file":{"elements":[{"uid":"127.0.0.31","metadata":{"location":{"latitude":0,"longitude":0,"region":"XPONDER-3"}},"type":"gnpy-network-topology:Transceiver"},{"uid":"127.0.0.30","metadata":{"location":{"latitude":0,"longitude":0,"region":"OpenROADM-3"}},"type":"gnpy-network-topology:Roadm","params":{"target_pch_out_db":-20}},{"uid":"127.0.0.51","metadata":{"location":{"latitude":0,"longitude":0,"region":"XPONDER-5"}},"type":"gnpy-network-topology:Transceiver"},{"uid":"127.0.0.50","metadata":{"location":{"latitude":0,"longitude":0,"region":"OpenROADM-5"}},"type":"gnpy-network-topology:Roadm","params":{"target_pch_out_db":-20}},{"uid":"127.0.0.11","metadata":{"location":{"latitude":0,"longitude":0,"region":"XPONDER-1"}},"type":"gnpy-network-topology:Transceiver"},{"uid":"127.0.0.10","metadata":{"location":{"latitude":0,"longitude":0,"region":"OpenROADM-1"}},"type":"gnpy-network-topology:Roadm","params":{"target_pch_out_db":-20}},{"uid":"243.0.0.10","metadata":{"location":{"latitude":0,"longitude":0,"city":"N/A","region":"N/A"}},"type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"con_in":0,"loss_coef":0.12,"con_out":0,"length":60,"att_in":0,"length_units":"gnpy-network-topology:km"}},{"uid":"243.0.0.12","metadata":{"location":{"latitude":0,"longitude":0,"city":"N/A","region":"N/A"}},"type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"con_in":0,"loss_coef":0.29,"con_out":0,"length":100,"att_in":0,"length_units":"gnpy-network-topology:km"}},{"uid":"243.0.0.11","metadata":{"location":{"latitude":0,"longitude":0,"city":"N/A","region":"N/A"}},"type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"con_in":0,"loss_coef":0.12,"con_out":0,"length":60,"att_in":0,"length_units":"gnpy-network-topology:km"}},{"uid":"243.0.0.14","metadata":{"location":{"latitude":0,"longitude":0,"city":"N/A","region":"N/A"}},"type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"con_in":0,"loss_coef":0.29,"con_out":0,"length":100,"att_in":0,"length_units":"gnpy-network-topology:km"}},{"uid":"243.0.0.13","metadata":{"location":{"latitude":0,"longitude":0,"city":"N/A","region":"N/A"}},"type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"con_in":0,"loss_coef":0.2127659574468085124099303584443987347185611724853515625,"con_out":0,"length":140,"att_in":0,"length_units":"gnpy-network-topology:km"}},{"uid":"243.0.0.8","metadata":{"location":{"latitude":0,"longitude":0,"city":"N/A","region":"N/A"}},"type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"con_in":0,"loss_coef":0.11999999999999999555910790149937383830547332763671875,"con_out":0,"length":100,"att_in":0,"length_units":"gnpy-network-topology:km"}},{"uid":"243.0.0.9","metadata":{"location":{"latitude":0,"longitude":0,"city":"N/A","region":"N/A"}},"type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"con_in":0,"loss_coef":0.29,"con_out":0,"length":100,"att_in":0,"length_units":"gnpy-network-topology:km"}},{"uid":"243.0.0.2","metadata":{"location":{"latitude":0,"longitude":0,"city":"N/A","region":"N/A"}},"type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"con_in":0,"loss_coef":0.29,"con_out":0,"length":100,"att_in":0,"length_units":"gnpy-network-topology:km"}},{"uid":"243.0.0.3","metadata":{"location":{"latitude":0,"longitude":0,"city":"N/A","region":"N/A"}},"type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"con_in":0,"loss_coef":0.12,"con_out":0,"length":60,"att_in":0,"length_units":"gnpy-network-topology:km"}},{"uid":"243.0.0.1","metadata":{"location":{"latitude":0,"longitude":0,"city":"N/A","region":"N/A"}},"type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"con_in":0,"loss_coef":0.11999999999999999555910790149937383830547332763671875,"con_out":0,"length":100,"att_in":0,"length_units":"gnpy-network-topology:km"}},{"uid":"243.0.0.6","metadata":{"location":{"latitude":0,"longitude":0,"city":"N/A","region":"N/A"}},"type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"con_in":0,"loss_coef":0.2127659574468085124099303584443987347185611724853515625,"con_out":0,"length":140,"att_in":0,"length_units":"gnpy-network-topology:km"}},{"uid":"243.0.0.7","metadata":{"location":{"latitude":0,"longitude":0,"city":"N/A","region":"N/A"}},"type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"con_in":0,"loss_coef":0.29,"con_out":0,"length":100,"att_in":0,"length_units":"gnpy-network-topology:km"}},{"uid":"243.0.0.4","metadata":{"location":{"latitude":0,"longitude":0,"city":"N/A","region":"N/A"}},"type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"con_in":0,"loss_coef":0.29,"con_out":0,"length":100,"att_in":0,"length_units":"gnpy-network-topology:km"}},{"uid":"243.0.0.5","metadata":{"location":{"latitude":0,"longitude":0,"city":"N/A","region":"N/A"}},"type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"con_in":0,"loss_coef":0.12,"con_out":0,"length":60,"att_in":0,"length_units":"gnpy-network-topology:km"}},{"uid":"127.0.0.20","metadata":{"location":{"latitude":0,"longitude":0,"region":"OpenROADM-2"}},"type":"gnpy-network-topology:Roadm","params":{"target_pch_out_db":-20}},{"uid":"127.0.0.41","metadata":{"location":{"latitude":0,"longitude":0,"region":"XPONDER-4"}},"type":"gnpy-network-topology:Transceiver"},{"uid":"127.0.0.40","metadata":{"location":{"latitude":0,"longitude":0,"region":"OpenROADM-4"}},"type":"gnpy-network-topology:Roadm","params":{"target_pch_out_db":-20}},{"uid":"127.0.0.21","metadata":{"location":{"latitude":0,"longitude":0,"region":"XPONDER-2"}},"type":"gnpy-network-topology:Transceiver"}],"connections":[{"from_node":"127.0.0.51","to_node":"127.0.0.50"},{"from_node":"127.0.0.30","to_node":"127.0.0.31"},{"from_node":"127.0.0.10","to_node":"243.0.0.1"},{"from_node":"243.0.0.1","to_node":"127.0.0.30"},{"from_node":"127.0.0.20","to_node":"127.0.0.21"},{"from_node":"127.0.0.20","to_node":"243.0.0.2"},{"from_node":"243.0.0.2","to_node":"127.0.0.10"},{"from_node":"127.0.0.20","to_node":"243.0.0.3"},{"from_node":"243.0.0.3","to_node":"127.0.0.50"},{"from_node":"127.0.0.40","to_node":"127.0.0.41"},{"from_node":"127.0.0.40","to_node":"243.0.0.4"},{"from_node":"243.0.0.4","to_node":"127.0.0.30"},{"from_node":"127.0.0.50","to_node":"243.0.0.5"},{"from_node":"243.0.0.5","to_node":"127.0.0.30"},{"from_node":"127.0.0.31","to_node":"127.0.0.30"},{"from_node":"127.0.0.50","to_node":"127.0.0.51"},{"from_node":"127.0.0.20","to_node":"243.0.0.6"},{"from_node":"243.0.0.6","to_node":"127.0.0.30"},{"from_node":"127.0.0.30","to_node":"243.0.0.7"},{"from_node":"243.0.0.7","to_node":"127.0.0.40"},{"from_node":"127.0.0.11","to_node":"127.0.0.10"},{"from_node":"127.0.0.30","to_node":"243.0.0.8"},{"from_node":"243.0.0.8","to_node":"127.0.0.10"},{"from_node":"127.0.0.40","to_node":"243.0.0.9"},{"from_node":"243.0.0.9","to_node":"127.0.0.50"},{"from_node":"127.0.0.30","to_node":"243.0.0.10"},{"from_node":"243.0.0.10","to_node":"127.0.0.50"},{"from_node":"127.0.0.50","to_node":"243.0.0.11"},{"from_node":"243.0.0.11","to_node":"127.0.0.20"},{"from_node":"127.0.0.50","to_node":"243.0.0.12"},{"from_node":"243.0.0.12","to_node":"127.0.0.40"},{"from_node":"127.0.0.21","to_node":"127.0.0.20"},{"from_node":"127.0.0.41","to_node":"127.0.0.40"},{"from_node":"127.0.0.30","to_node":"243.0.0.13"},{"from_node":"243.0.0.13","to_node":"127.0.0.20"},{"from_node":"127.0.0.10","to_node":"127.0.0.11"},{"from_node":"127.0.0.10","to_node":"243.0.0.14"},{"from_node":"243.0.0.14","to_node":"127.0.0.20"}]},"service-file":{"path-request":[{"request-id":2,"bidirectional":false,"dst-tp-id":"ZHN0VHBJZA\u003d\u003d","source":"127.0.0.11","explicit-route-objects":{"route-object-include-exclude":[{"num-unnum-hop":{"node-id":"127.0.0.20","link-tp-id":"1","hop-type":"STRICT"},"index":0,"explicit-route-usage":"gnpy-path-computation-simplified:route-include-ero"},{"num-unnum-hop":{"node-id":"127.0.0.30","link-tp-id":"1","hop-type":"STRICT"},"index":1,"explicit-route-usage":"gnpy-path-computation-simplified:route-include-ero"}]},"path-constraints":{"te-bandwidth":{"spacing":50000000000,"trx_mode":"W100G","trx_type":"openroadm-beta1","effective-freq-slot":[{"N":0,"M":4}],"technology":"flexi-grid","path_bandwidth":100}},"src-tp-id":"c3JjVHBJZA\u003d\u003d","destination":"127.0.0.41"}]}}}
\ No newline at end of file
+{"gnpy-api":{"service-file":{"path-request":[{"request-id":2,"src-tp-id":"c3JjVHBJZA\u003d\u003d","destination":"127.0.0.41","explicit-route-objects":{"route-object-include-exclude":[{"explicit-route-usage":"gnpy-path-computation-simplified:route-include-ero","num-unnum-hop":{"hop-type":"STRICT","link-tp-id":"1","node-id":"127.0.0.20"},"index":0},{"explicit-route-usage":"gnpy-path-computation-simplified:route-include-ero","num-unnum-hop":{"hop-type":"STRICT","link-tp-id":"1","node-id":"127.0.0.30"},"index":1}]},"bidirectional":false,"dst-tp-id":"ZHN0VHBJZA\u003d\u003d","path-constraints":{"te-bandwidth":{"technology":"flexi-grid","trx_mode":"W100G","spacing":50000000000,"trx_type":"openroadm-beta1","path_bandwidth":100,"effective-freq-slot":[{"N":0,"M":4}]}},"source":"127.0.0.11"}]},"topology-file":{"elements":[{"uid":"243.0.0.10","type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"loss_coef":0.12,"att_in":0,"con_out":0,"con_in":0,"length":60,"length_units":"gnpy-network-topology:km"},"metadata":{"location":{"city":"N/A","region":"N/A","latitude":0,"longitude":0}}},{"uid":"243.0.0.11","type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"loss_coef":0.12,"att_in":0,"con_out":0,"con_in":0,"length":60,"length_units":"gnpy-network-topology:km"},"metadata":{"location":{"city":"N/A","region":"N/A","latitude":0,"longitude":0}}},{"uid":"243.0.0.12","type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"loss_coef":0.29,"att_in":0,"con_out":0,"con_in":0,"length":100,"length_units":"gnpy-network-topology:km"},"metadata":{"location":{"city":"N/A","region":"N/A","latitude":0,"longitude":0}}},{"uid":"243.0.0.13","type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"loss_coef":0.2127659574468085124099303584443987347185611724853515625,"att_in":0,"con_out":0,"con_in":0,"length":140,"length_units":"gnpy-network-topology:km"},"metadata":{"location":{"city":"N/A","region":"N/A","latitude":0,"longitude":0}}},{"uid":"243.0.0.14","type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"loss_coef":0.29,"att_in":0,"con_out":0,"con_in":0,"length":100,"length_units":"gnpy-network-topology:km"},"metadata":{"location":{"city":"N/A","region":"N/A","latitude":0,"longitude":0}}},{"uid":"127.0.0.20","type":"gnpy-network-topology:Roadm","params":{"target_pch_out_db":-20},"metadata":{"location":{"region":"OpenROADM-2","latitude":0,"longitude":0}}},{"uid":"127.0.0.41","type":"gnpy-network-topology:Transceiver","metadata":{"location":{"region":"XPONDER-4","latitude":0,"longitude":0}}},{"uid":"127.0.0.40","type":"gnpy-network-topology:Roadm","params":{"target_pch_out_db":-20},"metadata":{"location":{"region":"OpenROADM-4","latitude":0,"longitude":0}}},{"uid":"127.0.0.21","type":"gnpy-network-topology:Transceiver","metadata":{"location":{"region":"XPONDER-2","latitude":0,"longitude":0}}},{"uid":"243.0.0.1","type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"loss_coef":0.11999999999999999555910790149937383830547332763671875,"att_in":0,"con_out":0,"con_in":0,"length":100,"length_units":"gnpy-network-topology:km"},"metadata":{"location":{"city":"N/A","region":"N/A","latitude":0,"longitude":0}}},{"uid":"243.0.0.3","type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"loss_coef":0.12,"att_in":0,"con_out":0,"con_in":0,"length":60,"length_units":"gnpy-network-topology:km"},"metadata":{"location":{"city":"N/A","region":"N/A","latitude":0,"longitude":0}}},{"uid":"243.0.0.2","type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"loss_coef":0.29,"att_in":0,"con_out":0,"con_in":0,"length":100,"length_units":"gnpy-network-topology:km"},"metadata":{"location":{"city":"N/A","region":"N/A","latitude":0,"longitude":0}}},{"uid":"243.0.0.5","type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"loss_coef":0.12,"att_in":0,"con_out":0,"con_in":0,"length":60,"length_units":"gnpy-network-topology:km"},"metadata":{"location":{"city":"N/A","region":"N/A","latitude":0,"longitude":0}}},{"uid":"243.0.0.4","type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"loss_coef":0.29,"att_in":0,"con_out":0,"con_in":0,"length":100,"length_units":"gnpy-network-topology:km"},"metadata":{"location":{"city":"N/A","region":"N/A","latitude":0,"longitude":0}}},{"uid":"243.0.0.7","type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"loss_coef":0.29,"att_in":0,"con_out":0,"con_in":0,"length":100,"length_units":"gnpy-network-topology:km"},"metadata":{"location":{"city":"N/A","region":"N/A","latitude":0,"longitude":0}}},{"uid":"243.0.0.6","type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"loss_coef":0.2127659574468085124099303584443987347185611724853515625,"att_in":0,"con_out":0,"con_in":0,"length":140,"length_units":"gnpy-network-topology:km"},"metadata":{"location":{"city":"N/A","region":"N/A","latitude":0,"longitude":0}}},{"uid":"243.0.0.9","type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"loss_coef":0.29,"att_in":0,"con_out":0,"con_in":0,"length":100,"length_units":"gnpy-network-topology:km"},"metadata":{"location":{"city":"N/A","region":"N/A","latitude":0,"longitude":0}}},{"uid":"243.0.0.8","type":"gnpy-network-topology:Fiber","type_variety":"SSMF","params":{"loss_coef":0.11999999999999999555910790149937383830547332763671875,"att_in":0,"con_out":0,"con_in":0,"length":100,"length_units":"gnpy-network-topology:km"},"metadata":{"location":{"city":"N/A","region":"N/A","latitude":0,"longitude":0}}},{"uid":"127.0.0.31","type":"gnpy-network-topology:Transceiver","metadata":{"location":{"region":"XPONDER-3","latitude":0,"longitude":0}}},{"uid":"127.0.0.30","type":"gnpy-network-topology:Roadm","params":{"target_pch_out_db":-20},"metadata":{"location":{"region":"OpenROADM-3","latitude":0,"longitude":0}}},{"uid":"127.0.0.51","type":"gnpy-network-topology:Transceiver","metadata":{"location":{"region":"XPONDER-5","latitude":0,"longitude":0}}},{"uid":"127.0.0.50","type":"gnpy-network-topology:Roadm","params":{"target_pch_out_db":-20},"metadata":{"location":{"region":"OpenROADM-5","latitude":0,"longitude":0}}},{"uid":"127.0.0.11","type":"gnpy-network-topology:Transceiver","metadata":{"location":{"region":"XPONDER-1","latitude":0,"longitude":0}}},{"uid":"127.0.0.10","type":"gnpy-network-topology:Roadm","params":{"target_pch_out_db":-20},"metadata":{"location":{"region":"OpenROADM-1","latitude":0,"longitude":0}}}],"connections":[{"from_node":"127.0.0.51","to_node":"127.0.0.50"},{"from_node":"127.0.0.30","to_node":"127.0.0.31"},{"from_node":"127.0.0.10","to_node":"243.0.0.1"},{"from_node":"243.0.0.1","to_node":"127.0.0.30"},{"from_node":"127.0.0.20","to_node":"127.0.0.21"},{"from_node":"127.0.0.20","to_node":"243.0.0.2"},{"from_node":"243.0.0.2","to_node":"127.0.0.10"},{"from_node":"127.0.0.20","to_node":"243.0.0.3"},{"from_node":"243.0.0.3","to_node":"127.0.0.50"},{"from_node":"127.0.0.40","to_node":"127.0.0.41"},{"from_node":"127.0.0.40","to_node":"243.0.0.4"},{"from_node":"243.0.0.4","to_node":"127.0.0.30"},{"from_node":"127.0.0.50","to_node":"243.0.0.5"},{"from_node":"243.0.0.5","to_node":"127.0.0.30"},{"from_node":"127.0.0.31","to_node":"127.0.0.30"},{"from_node":"127.0.0.50","to_node":"127.0.0.51"},{"from_node":"127.0.0.20","to_node":"243.0.0.6"},{"from_node":"243.0.0.6","to_node":"127.0.0.30"},{"from_node":"127.0.0.30","to_node":"243.0.0.7"},{"from_node":"243.0.0.7","to_node":"127.0.0.40"},{"from_node":"127.0.0.11","to_node":"127.0.0.10"},{"from_node":"127.0.0.30","to_node":"243.0.0.8"},{"from_node":"243.0.0.8","to_node":"127.0.0.10"},{"from_node":"127.0.0.40","to_node":"243.0.0.9"},{"from_node":"243.0.0.9","to_node":"127.0.0.50"},{"from_node":"127.0.0.30","to_node":"243.0.0.10"},{"from_node":"243.0.0.10","to_node":"127.0.0.50"},{"from_node":"127.0.0.50","to_node":"243.0.0.11"},{"from_node":"243.0.0.11","to_node":"127.0.0.20"},{"from_node":"127.0.0.50","to_node":"243.0.0.12"},{"from_node":"243.0.0.12","to_node":"127.0.0.40"},{"from_node":"127.0.0.21","to_node":"127.0.0.20"},{"from_node":"127.0.0.41","to_node":"127.0.0.40"},{"from_node":"127.0.0.30","to_node":"243.0.0.13"},{"from_node":"243.0.0.13","to_node":"127.0.0.20"},{"from_node":"127.0.0.10","to_node":"127.0.0.11"},{"from_node":"127.0.0.10","to_node":"243.0.0.14"},{"from_node":"243.0.0.14","to_node":"127.0.0.20"}]}}}
\ No newline at end of file
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>7.0.9</version>
+ <version>8.0.4</version>
<relativePath />
</parent>
<groupId>org.opendaylight.transportpce</groupId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>8.1.3</version>
+ <version>9.0.5</version>
<relativePath />
</parent>
<groupId>org.opendaylight.transportpce</groupId>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>8.1.3</version>
+ <version>9.0.5</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>8.1.3</version>
+ <version>9.0.5</version>
<relativePath />
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>8.1.3</version>
+ <version>9.0.5</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>8.1.3</version>
+ <version>9.0.5</version>
<relativePath/>
</parent>
<name>OpenDaylight :: transportpce</name>
<properties>
- <netconf.version>1.13.4</netconf.version>
+ <netconf.version>2.0.3</netconf.version>
<configfile.directory>etc/opendaylight/karaf</configfile.directory>
</properties>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>8.1.3</version>
+ <version>9.0.5</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>7.0.9</version>
+ <version>8.0.4</version>
<relativePath />
</parent>
String parentPortCircuitPackName = (cpPort.getPartnerPort() == null ? "" :
(cpPort.getPartnerPort().getCircuitPackName() == null ? "" : cpPort.getPartnerPort().getCircuitPackName()));
String partnerPortPortName = (cpPort.getPartnerPort() == null ? "" :
- (cpPort.getPartnerPort().getPortName() == null ? "" : cpPort.getPartnerPort().getPortName().toString()));
+ (cpPort.getPartnerPort().getPortName() == null ? "" : cpPort.getPartnerPort().getPortName()));
String partnerPortCircuitPackName = (cpPort.getParentPort() == null ? "" :
(cpPort.getParentPort().getCircuitPackName() == null ? "" : cpPort.getParentPort().getCircuitPackName()));
String parentPortPortName = (cpPort.getParentPort() == null ? "" :
String circuitId = deviceInterface.getCircuitId();
String supportingInterface = deviceInterface.getSupportingInterface();
String supportingCircuitPackName = deviceInterface.getSupportingCircuitPackName();
- String supportingPort = deviceInterface.getSupportingPort().toString();
+ String supportingPort = deviceInterface.getSupportingPort();
switch (deviceInterface.getType().toString()) {
InternalLink internalLink = internalLinkEntry.getValue();
String internalLinkName = internalLink.getInternalLinkName();
String sourceCircuitPackName = internalLink.getSource().getCircuitPackName();
- String sourcePortName = internalLink.getSource().getPortName().toString();
+ String sourcePortName = internalLink.getSource().getPortName();
String destinationCircuitPackName = internalLink.getDestination().getCircuitPackName();
- String destinationPortName = internalLink.getDestination().getPortName().toString();
+ String destinationPortName = internalLink.getDestination().getPortName();
Object[] parameters = { nodeId, internalLinkName, sourceCircuitPackName, sourcePortName,
destinationCircuitPackName, destinationPortName, startTimestamp, startTimestamp };
PhysicalLink physicalLink = physicalLinkEntry.getValue();
String physicalLinkName = physicalLink.getPhysicalLinkName();
String sourceCircuitPackName = physicalLink.getSource().getCircuitPackName();
- String sourcePortName = physicalLink.getSource().getPortName().toString();
+ String sourcePortName = physicalLink.getSource().getPortName();
String destinationCircuitPackName = physicalLink.getDestination().getCircuitPackName();
- String destinationPortName = physicalLink.getDestination().getPortName().toString();
+ String destinationPortName = physicalLink.getDestination().getPortName();
Object[] parameters = {nodeId,
physicalLinkName,
String otdrPortCircuitPackName =
(degree.getOtdrPort() == null ? "" : degree.getOtdrPort().getCircuitPackName());
String otdrPortPortName =
- (degree.getOtdrPort() == null ? "" : degree.getOtdrPort().getPortName().toString());
+ (degree.getOtdrPort() == null ? "" : degree.getOtdrPort().getPortName());
// String mcCapabilitiesSlotWidthGranularity = "";
// String mcCapabilitiesCenterFreqGranularity = "";
// String mcCapabilitiesMinSlots = "-1";
for (Map.Entry<ConnectionPortsKey, ConnectionPorts> portEntry : connectionPortsMap.entrySet()) {
String connectionPortIndex = portEntry.getValue().getIndex().toString();
String circuitPackName = portEntry.getValue().getCircuitPackName();
- String portName = portEntry.getValue().getPortName().toString();
+ String portName = portEntry.getValue().getPortName();
Object[] parameters = {nodeId,
degreeNumber,
String circuitId = deviceInterface.getCircuitId();
String supportingInterface = deviceInterface.getSupportingInterface();
String supportingCircuitPackName = deviceInterface.getSupportingCircuitPackName();
- String supportingPort = deviceInterface.getSupportingPort().toString();
+ String supportingPort = deviceInterface.getSupportingPort();
String ethernetSpeed = "";
String ethernetFec = "";
String ethernetMtu = "";
InternalLink internalLink = entry.getValue();
String internalLinkName = internalLink.getInternalLinkName();
String sourceCircuitPackName = internalLink.getSource().getCircuitPackName();
- String sourcePortName = internalLink.getSource().getPortName().toString();
+ String sourcePortName = internalLink.getSource().getPortName();
String destinationCircuitPackName = internalLink.getDestination().getCircuitPackName();
- String destinationPortName = internalLink.getDestination().getPortName().toString();
+ String destinationPortName = internalLink.getDestination().getPortName();
Object[] parameters = {nodeId,
internalLinkName,
PhysicalLink physicalLink = entry.getValue();
String physicalLinkName = physicalLink.getPhysicalLinkName();
String sourceCircuitPackName = physicalLink.getSource().getCircuitPackName();
- String sourcePortName = physicalLink.getSource().getPortName().toString();
+ String sourcePortName = physicalLink.getSource().getPortName();
String destinationCircuitPackName = physicalLink.getDestination().getCircuitPackName();
- String destinationPortName = physicalLink.getDestination().getPortName().toString();
+ String destinationPortName = physicalLink.getDestination().getPortName();
Object[] parameters = {nodeId,
physicalLinkName,
String degreeNumber = degree.getDegreeNumber().toString();
String maxWavelengths = degree.getMaxWavelengths().toString();
String otdrPortCircuitPackName = degree.getOtdrPort().getCircuitPackName();
- String otdrPortPortName = degree.getOtdrPort().getPortName().toString();
+ String otdrPortPortName = degree.getOtdrPort().getPortName();
persistDevDegreeCircuitPack(nodeId, degree, degreeNumber, connection);
persistDevDegreeConnectionPort(nodeId, degree, degreeNumber, connection);
//String mcCapabilitiesSlotWidthGranularity = "";
ConnectionPorts connectionPorts = entry.getValue();
String connectionPortIndex = connectionPorts.getIndex().toString();
String circuitPackName = connectionPorts.getCircuitPackName();
- String portName = connectionPorts.getPortName().toString();
+ String portName = connectionPorts.getPortName();
Object[] parameters = {nodeId,
degreeNumber,
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>karaf4-parent</artifactId>
- <version>8.1.3</version>
+ <version>9.0.5</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>7.0.9</version>
+ <version>8.0.4</version>
<relativePath />
</parent>
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>bundle-parent</artifactId>
- <version>8.1.3</version>
+ <version>9.0.5</version>
<relativePath/>
</parent>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-artifacts</artifactId>
- <version>7.0.9</version>
+ <version>8.0.4</version>
<scope>import</scope>
<type>pom</type>
</dependency>
.stream().filter(lk -> lk.getLinkId().getValue().startsWith("ODTU4"))
.collect(Collectors.toList());
}
+ if (odu4links == null) {
+ return null;
+ }
List<Link> links = new ArrayList<>();
- if (odu4links != null) {
- for (LinkTp linkTp : nodesTopoTps) {
- String tp = linkTp.getTpId();
- String nodeId = new StringBuilder(linkTp.getNodeId()).append("-")
- .append(tp.split("-")[0]).toString();
- Link slink = odu4links.stream().filter(lk -> lk.getSource().getSourceNode().getValue()
- .equals(nodeId) && lk.getSource().getSourceTp().toString().equals(tp)).findFirst().get();
- if (!links.contains(slink)) {
- links.add(slink);
- }
- Link dlink = odu4links.stream().filter(lk -> lk.getDestination().getDestNode().getValue()
- .equals(nodeId) && lk.getDestination().getDestTp().toString().equals(tp)).findFirst().get();
- if (!links.contains(dlink)) {
- links.add(dlink);
- }
+ for (LinkTp linkTp : nodesTopoTps) {
+ String tp = linkTp.getTpId();
+ String nodeId = new StringBuilder(linkTp.getNodeId()).append("-")
+ .append(tp.split("-")[0]).toString();
+ Link slink = odu4links.stream().filter(lk -> lk.getSource().getSourceNode().getValue()
+ .equals(nodeId) && lk.getSource().getSourceTp().getValue().equals(tp)).findFirst().get();
+ if (!links.contains(slink)) {
+ links.add(slink);
+ }
+ Link dlink = odu4links.stream().filter(lk -> lk.getDestination().getDestNode().getValue()
+ .equals(nodeId) && lk.getDestination().getDestTp().getValue().equals(tp)).findFirst().get();
+ if (!links.contains(dlink)) {
+ links.add(dlink);
}
- LOG.debug("odu4links = {}", links.toString());
- return links;
- } else {
- return null;
}
+ LOG.debug("odu4links = {}", links.toString());
+ return links;
}
private void createOpenRoadmOtnNode(String nodeId) {
}
if (links.size() == 2) {
links.addAll(initialiseOtnLinks(suppOtuLinks.get(0).getSource().getSourceNode().getValue(),
- suppOtuLinks.get(0).getSource().getSourceTp().toString(),
+ suppOtuLinks.get(0).getSource().getSourceTp().getValue(),
suppOtuLinks.get(0).getDestination().getDestNode().getValue(),
- suppOtuLinks.get(0).getDestination().getDestTp().toString(),
+ suppOtuLinks.get(0).getDestination().getDestTp().getValue(),
linkType));
}
List<TerminationPoint> tps = new ArrayList<>();
SupportingTerminationPoint stp = new SupportingTerminationPointBuilder()
.setNetworkRef(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID))
.setNodeRef(new NodeId(node.getNodeId() + XPDR + node.getXpdrNb()))
- .setTpRef(tpId.getValue())
+ .setTpRef(tpId)
.build();
TerminationPoint ietfTpNw = buildIetfTp(tpceTp1Bldr, otnTp1, tpType, tpId, Map.of(stp.key(), stp),
mapping);
.setOperationalState(TopologyUtils.setNetworkOperState(mapping.getPortOperState()))
.build();
- ietfTpBldr.setTpId(tpId)
- .withKey(new TerminationPointKey(tpId))
- .addAugmentation(otnTp1)
- .addAugmentation(ocnTp);
- return ietfTpBldr.build();
+ return ietfTpBldr.setTpId(tpId)
+ .withKey(new TerminationPointKey(tpId))
+ .addAugmentation(otnTp1)
+ .addAugmentation(ocnTp)
+ .build();
}
private static String formatNodeName(String nodeName, String tpName) {
- String newNodeName = null;
- if (nodeName.contains(XPDR)) {
- newNodeName = nodeName;
- } else {
- newNodeName = new StringBuilder(nodeName).append("-").append(tpName.split("-")[0]).toString();
- }
- return newNodeName;
+ return nodeName.contains(XPDR)
+ ? nodeName
+ : new StringBuilder(nodeName).append("-").append(tpName.split("-")[0]).toString();
}
}
private static LinkBuilder createLink(String srcNode, String destNode, String srcTp, String destTp) {
//create source link
- SourceBuilder ietfSrcLinkBldr = new SourceBuilder().setSourceNode(new NodeId(srcNode)).setSourceTp(srcTp);
+ SourceBuilder ietfSrcLinkBldr = new SourceBuilder().setSourceNode(new NodeId(srcNode))
+ .setSourceTp(new TpId(srcTp));
//create destination link
DestinationBuilder ietfDestLinkBldr = new DestinationBuilder().setDestNode(new NodeId(destNode))
- .setDestTp(destTp);
+ .setDestTp(new TpId(destTp));
LinkId linkId = LinkIdUtil.buildLinkId(srcNode, srcTp, destNode, destTp);
return new LinkBuilder()
.setSource(ietfSrcLinkBldr.build())
// Create Destination for link
DestinationBuilder dstNodeBldr = new DestinationBuilder()
- .setDestTp(destTp)
+ .setDestTp(new TpId(destTp))
.setDestNode(new NodeId(dstNode));
// Create Source for the link
SourceBuilder srcNodeBldr = new SourceBuilder()
.setSourceNode(new NodeId(srcNode))
- .setSourceTp(srcTp);
+ .setSourceTp(new TpId(srcTp));
LinkId linkId;
LinkId oppositeLinkId;
// update links terminating on the given termination-point
List<Link> filteredTopoLinks = links.values().stream()
.filter(l1 -> (l1.getSource().getSourceNode().getValue().equals(abstractNodeid)
- && l1.getSource().getSourceTp().toString().equals(tpId))
+ && l1.getSource().getSourceTp().getValue().equals(tpId))
|| (l1.getDestination().getDestNode().getValue().equals(abstractNodeid)
- && l1.getDestination().getDestTp().toString().equals(tpId)))
+ && l1.getDestination().getDestTp().getValue().equals(tpId)))
.collect(Collectors.toList());
List<Link> topoLinks = new ArrayList<>();
for (Link link : filteredTopoLinks) {
.get(new NodeKey(new NodeId(link.getDestination().getDestNode().getValue())))
.augmentation(Node1.class)
.getTerminationPoint()
- .get(new TerminationPointKey(new TpId(link.getDestination().getDestTp().toString())));
+ .get(new TerminationPointKey(new TpId(link.getDestination().getDestTp().getValue())));
} else {
otherLinkTp = nodes
.get(new NodeKey(new NodeId(link.getSource().getSourceNode().getValue())))
.augmentation(Node1.class)
.getTerminationPoint()
- .get(new TerminationPointKey(new TpId(link.getSource().getSourceTp().toString())));
+ .get(new TerminationPointKey(new TpId(link.getSource().getSourceTp().getValue())));
}
Link1Builder link1Bldr = new Link1Builder(link.augmentation(Link1.class));
if (tpBldr.augmentation(TerminationPoint1.class).getAdministrativeState().equals(AdminStates.InService)
import org.opendaylight.yang.gen.v1.pathdescription.stub.rev201211.PathDescription;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
DataObjectConverter dataObjectConverter = JSONDataObjectConverter
.createWithDataStoreUtil(getDataStoreContextUtil());
try (Reader reader = new FileReader(PATH_DESCRIPTION_FILE, StandardCharsets.UTF_8)) {
- NormalizedNode<? extends PathArgument, ?> normalizedNode = dataObjectConverter
+ NormalizedNode normalizedNode = dataObjectConverter
.transformIntoNormalizedNode(reader).get();
pathDescription = (PathDescription) getDataStoreContextUtil()
.getBindingDOMCodecServices().fromNormalizedNode(YangInstanceIdentifier
assertEquals(
"XPDR" + xpdrNb + "-NETWORK1",
tpList.get(4).getSupportingTerminationPoint().values().stream().findFirst()
- .get().getTpRef().toString());
+ .get().getTpRef().getValue());
if (xpdrNb.equals(Uint16.valueOf(1))) {
assertEquals("should contain 5 TPs", 5, tpList.size());
assertEquals("XPDR1-CLIENT1", tpList.get(0).getTpId().getValue());
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.node.SupportingNode;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.LinkId;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Network1;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.TpId;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.Link;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.LinkBuilder;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.LinkKey;
assertEquals("Should contain 2 express links", 2, links.size());
assertEquals("ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX", links.get(0).getLinkId().getValue());
assertEquals("ROADMA01-DEG1", links.get(0).getSource().getSourceNode().getValue());
- assertEquals("DEG1-CTP-TXRX", links.get(0).getSource().getSourceTp());
+ assertEquals("DEG1-CTP-TXRX", links.get(0).getSource().getSourceTp().getValue());
assertEquals("ROADMA01-DEG2", links.get(0).getDestination().getDestNode().getValue());
- assertEquals("DEG2-CTP-TXRX", links.get(0).getDestination().getDestTp());
+ assertEquals("DEG2-CTP-TXRX", links.get(0).getDestination().getDestTp().getValue());
assertEquals("ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX", links.get(1).getLinkId().getValue());
assertEquals("ROADMA01-DEG2", links.get(1).getSource().getSourceNode().getValue());
- assertEquals("DEG2-CTP-TXRX", links.get(1).getSource().getSourceTp());
+ assertEquals("DEG2-CTP-TXRX", links.get(1).getSource().getSourceTp().getValue());
assertEquals("ROADMA01-DEG1", links.get(1).getDestination().getDestNode().getValue());
- assertEquals("DEG1-CTP-TXRX", links.get(1).getDestination().getDestTp());
+ assertEquals("DEG1-CTP-TXRX", links.get(1).getDestination().getDestTp().getValue());
}
@Test
new Link1Builder().build();
Link link = new LinkBuilder()
.setLinkId(linkId)
- .setSource(new SourceBuilder().setSourceNode(new NodeId(srcNode)).setSourceTp(srcTp).build())
- .setDestination(new DestinationBuilder().setDestNode(new NodeId(dstNode)).setDestTp(destTp).build())
+ .setSource(new SourceBuilder().setSourceNode(new NodeId(srcNode)).setSourceTp(new TpId(srcTp)).build())
+ .setDestination(new DestinationBuilder().setDestNode(new NodeId(dstNode)).setDestTp(new TpId(destTp))
+ .build())
.addAugmentation(link1)
.build();
InstanceIdentifier<Link> linkIID = InstanceIdentifier.builder(Networks.class).child(Network.class,
NormalizedNodeResult result = new NormalizedNodeResult();
try (NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
JsonParserStream jsonParser = JsonParserStream.create(streamWriter,
- JSONCodecFactorySupplier.RFC7951.getShared(schemaCtx), schemaCtx);) {
+ JSONCodecFactorySupplier.RFC7951.getShared(schemaCtx));) {
jsonParser.parse(reader);
YangInstanceIdentifier yangId = YangInstanceIdentifier.of(pathQname);
if (codecRegistry.fromNormalizedNode(yangId, result.getResult()) != null) {
.setLinkId(new LinkId(type.getName() + "-SPDRA-XPDR1-XPDR1-NETWORK1toSPDRZ-XPDR1-XPDR1-NETWORK1"))
.setSource(new SourceBuilder()
.setSourceNode(new NodeId("SPDRA-XPDR1"))
- .setSourceTp("XPDR1-NETWORK1").build())
+ .setSourceTp(new TpId("XPDR1-NETWORK1")).build())
.setDestination(new DestinationBuilder()
.setDestNode(new NodeId("SPDRZ-XPDR1"))
- .setDestTp("XPDR1-NETWORK1").build())
+ .setDestTp(new TpId("XPDR1-NETWORK1")).build())
.addAugmentation(
new Link1Builder()
.setLinkType(OpenroadmLinkType.OTNLINK)
.setLinkId(new LinkId(type.getName() + "-SPDRZ-XPDR1-XPDR1-NETWORK1toSPDRA-XPDR1-XPDR1-NETWORK1"))
.setSource(new SourceBuilder()
.setSourceNode(new NodeId("SPDRZ-XPDR1"))
- .setSourceTp("XPDR1-NETWORK1").build())
+ .setSourceTp(new TpId("XPDR1-NETWORK1")).build())
.setDestination(new DestinationBuilder()
.setDestNode(new NodeId("SPDRA-XPDR1"))
- .setDestTp("XPDR1-NETWORK1").build())
+ .setDestTp(new TpId("XPDR1-NETWORK1")).build())
.addAugmentation(
new Link1Builder()
.setLinkType(OpenroadmLinkType.OTNLINK)
SupportingTerminationPoint supTermPointA = new SupportingTerminationPointBuilder()
.setNetworkRef(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID))
.setNodeRef(new NodeId("SPDRA-XPDR1"))
- .setTpRef("XPDR1-NETWORK1")
+ .setTpRef(new TpId("XPDR1-NETWORK1"))
.build();
Map<SupportingTerminationPointKey,SupportingTerminationPoint> supTermPointMapA =
Map.of(supTermPointA.key(), supTermPointA);
SupportingTerminationPoint supTermPointZ = new SupportingTerminationPointBuilder()
.setNetworkRef(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID))
.setNodeRef(new NodeId("SPDRZ-XPDR1"))
- .setTpRef("XPDR1-NETWORK1")
+ .setTpRef(new TpId("XPDR1-NETWORK1"))
.build();
Map<SupportingTerminationPointKey,SupportingTerminationPoint> supTermPointMapZ =
Map.of(supTermPointZ.key(), supTermPointZ);
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>7.0.9</version>
+ <version>8.0.4</version>
<relativePath/>
</parent>
if (inputLink != null) {
RoadmLinks roadmLink = new RoadmLinks();
roadmLink.setSrcNodeId(inputLink.getSource().getSourceNode().getValue());
- roadmLink.setSrcTpId(inputLink.getSource().getSourceTp().toString());
+ roadmLink.setSrcTpId(inputLink.getSource().getSourceTp().getValue());
roadmLink.setDestNodeId(inputLink.getDestination().getDestNode().getValue());
- roadmLink.setDestTpid(inputLink.getDestination().getDestTp().toString());
+ roadmLink.setDestTpid(inputLink.getDestination().getDestTp().getValue());
roadmLink.setLinkId(inputLink.getLinkId());
roadmLinks.add(roadmLink);
spanLossResult = getLinkSpanloss(roadmLinks);
// Only calculate spanloss for Roadm-to-Roadm links
RoadmLinks roadmLink = new RoadmLinks();
roadmLink.setSrcNodeId(link.getSource().getSourceNode().getValue());
- roadmLink.setSrcTpId(link.getSource().getSourceTp().toString());
+ roadmLink.setSrcTpId(link.getSource().getSourceTp().getValue());
roadmLink.setDestNodeId(link.getDestination().getDestNode().getValue());
- roadmLink.setDestTpid(link.getDestination().getDestTp().toString());
+ roadmLink.setDestTpid(link.getDestination().getDestTp().getValue());
roadmLink.setLinkId(link.getLinkId());
roadmLinks.add(roadmLink);
}
// Only calculate spanloss for Roadm-to-Roadm links
RoadmLinks roadmLink = new RoadmLinks();
roadmLink.setSrcNodeId(link.getSource().getSourceNode().getValue());
- roadmLink.setSrcTpId(link.getSource().getSourceTp().toString());
+ roadmLink.setSrcTpId(link.getSource().getSourceTp().getValue());
roadmLink.setDestNodeId(link.getDestination().getDestNode().getValue());
- roadmLink.setDestTpid(link.getDestination().getDestTp().toString());
+ roadmLink.setDestTpid(link.getDestination().getDestTp().getValue());
roadmLinks.add(roadmLink);
}
}
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.LinkId;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Network1;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Network1Builder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.TpId;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.Link;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.LinkBuilder;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.link.DestinationBuilder;
.setLinkType(OpenroadmLinkType.ROADMTOROADM).build();
// create the roadm-to-roadm link to be measured
Link roadm2roadmLink = new LinkBuilder().setLinkId(new LinkId("ROADM-A1-to-ROADM-C1"))
- .setSource(new SourceBuilder().setSourceNode(ietfNodeA.getNodeId()).setSourceTp("DEG2-TTP-TXRX")
+ .setSource(new SourceBuilder()
+ .setSourceNode(ietfNodeA.getNodeId())
+ .setSourceTp(new TpId("DEG2-TTP-TXRX"))
+ .build())
+ .setDestination(new DestinationBuilder()
+ .setDestNode(ietfNodeC.getNodeId())
+ .setDestTp(new TpId("DEG1-TTP-TXRX"))
.build())
- .setDestination(
- new DestinationBuilder().setDestNode(ietfNodeC.getNodeId()).setDestTp("DEG1-TTP-TXRX").build())
.addAugmentation(aug11)
.addAugmentation(aug12)
.addAugmentation(aug21)
return Optional.of(new CurrentPmListBuilder()
.setCurrentPmEntry(Map.of(currentPmEntryC.key(),currentPmEntryC)).build());
}
-}
\ No newline at end of file
+}
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.LinkId;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Network1;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Network1Builder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.TpId;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.Link;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.LinkBuilder;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.LinkKey;
public static Network1 getNetwork() {
Map<SupportingLinkKey,SupportingLink> supportingLinks = new HashMap<>();
SupportingLink supportingLink1 = new SupportingLinkBuilder()
- .setLinkRef("ref1")
+ .setLinkRef(new LinkId("ref1"))
.setNetworkRef(new NetworkId("net1"))
.build();
SupportingLink supportingLink2 = new SupportingLinkBuilder()
- .setLinkRef("ref2")
+ .setLinkRef(new LinkId("ref2"))
.setNetworkRef(new NetworkId("net2"))
.build();
supportingLinks.put(supportingLink1.key(),supportingLink1);
.setDestination(
new DestinationBuilder()
.setDestNode(new NodeId("node 1"))
- .setDestTp("dest tp").build())
+ .setDestTp(new TpId("dest tp")).build())
.setSource(
new SourceBuilder()
.setSourceNode(new NodeId("node 2"))
- .setSourceTp("src tp")
+ .setSourceTp(new TpId("src tp"))
.build())
.setSupportingLink(supportingLinks)
.build();
.setDestination(
new DestinationBuilder()
.setDestNode(new NodeId("node 3"))
- .setDestTp("dest tp")
+ .setDestTp(new TpId("dest tp"))
.build())
.setSource(
new SourceBuilder()
.setSourceNode(new NodeId("node 4"))
- .setSourceTp("src tp")
+ .setSourceTp(new TpId("src tp"))
.build())
.setSupportingLink(supportingLinks)
.build();
.build();
Map<SupportingLinkKey,SupportingLink> supportingLinks = new HashMap<>();
- SupportingLink supportingLink = new SupportingLinkBuilder().setLinkRef("ref1")
+ SupportingLink supportingLink = new SupportingLinkBuilder().setLinkRef(new LinkId("ref1"))
.setNetworkRef(new NetworkId("net1")).build();
- SupportingLink supportingLink2 = new SupportingLinkBuilder().setLinkRef("ref2")
+ SupportingLink supportingLink2 = new SupportingLinkBuilder().setLinkRef(new LinkId("ref2"))
.setNetworkRef(new NetworkId("net1")).build();
supportingLinks.put(supportingLink.key(),supportingLink);
supportingLinks.put(supportingLink2.key(),supportingLink2);
Map<LinkKey,Link> links = new HashMap<>();
Link link1 = new LinkBuilder().setLinkId(new LinkId("link 1"))
.setDestination(new DestinationBuilder().setDestNode(new NodeId("node 1"))
- .setDestTp("dest tp").build())
+ .setDestTp(new TpId("dest tp")).build())
.setSource(new SourceBuilder().setSourceNode(new NodeId("node 2"))
- .setSourceTp("src tp").build())
+ .setSourceTp(new TpId("src tp")).build())
.setSupportingLink(supportingLinks)
.addAugmentation(aug1)
.addAugmentation(aug2).build();
Link link2 = new LinkBuilder().setLinkId(new LinkId("link 2"))
.setDestination(new DestinationBuilder().setDestNode(new NodeId("node 3"))
- .setDestTp("dest tp").build())
+ .setDestTp(new TpId("dest tp")).build())
.setSource(new SourceBuilder().setSourceNode(new NodeId("node 4"))
- .setSourceTp("src tp").build())
+ .setSourceTp(new TpId("src tp")).build())
.setSupportingLink(supportingLinks).build();
links.put(link1.key(),link1);
links.put(link2.key(),link2);
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>7.0.9</version>
+ <version>8.0.4</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>7.0.9</version>
+ <version>8.0.4</version>
<relativePath/>
</parent>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-artifacts</artifactId>
- <version>1.13.4</version>
+ <version>2.0.3</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>7.0.9</version>
+ <version>8.0.4</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>7.0.9</version>
+ <version>8.0.4</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>7.0.9</version>
+ <version>8.0.4</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>7.0.9</version>
+ <version>8.0.4</version>
<relativePath />
</parent>
atozMap.put(srcResource.key(),srcResource);
// source TP
- tpName = pcelink.getSourceTP().toString();
+ tpName = pcelink.getSourceTP().getValue();
stp = new TerminationPointBuilder()
.setTpNodeId(srcName).setTpId(tpName)
.build();
String destName = pcelink.getDestId().getValue();
// target TP
- tpName = pcelink.getDestTP().toString();
+ tpName = pcelink.getDestTP().getValue();
TerminationPoint dtp = new TerminationPointBuilder()
.setTpNodeId(destName).setTpId(tpName)
.build();
ztoaList.put(srcResource.key(),srcResource);
// source TP
- tpName = pcelink.getSourceTP().toString();
+ tpName = pcelink.getSourceTP().getValue();
stp = new TerminationPointBuilder()
.setTpNodeId(srcName).setTpId(tpName)
.build();
String destName = pcelink.getDestId().getValue();
// target TP
- tpName = pcelink.getDestTP().toString();
+ tpName = pcelink.getDestTP().getValue();
TerminationPoint ttp = new TerminationPointBuilder()
.setTpNodeId(destName).setTpId(tpName).build();
for (PceGraphEdge edge : path.getEdgeList()) {
NodeId linkSrcNode = edge.link().getSourceId();
- String linkSrcTp = edge.link().getSourceTP().toString();
+ String linkSrcTp = edge.link().getSourceTP().getValue();
NodeId linkDestNode = edge.link().getDestId();
- String linkDestTp = edge.link().getDestTP().toString();
+ String linkDestTp = edge.link().getDestTP().getValue();
PceNode pceOtnNodeSrc = allPceNodes.get(linkSrcNode);
PceNode pceOtnNodeDest = allPceNodes.get(linkDestNode);
List<Uint16> srcTpnPool = pceOtnNodeSrc.getAvailableTribPorts().get(linkSrcTp);
for (PceGraphEdge edge : path.getEdgeList()) {
NodeId linkSrcNode = edge.link().getSourceId();
- String linkSrcTp = edge.link().getSourceTP().toString();
+ String linkSrcTp = edge.link().getSourceTP().getValue();
NodeId linkDestNode = edge.link().getDestId();
- String linkDestTp = edge.link().getDestTP().toString();
+ String linkDestTp = edge.link().getDestTP().getValue();
PceNode pceOtnNodeSrc = allPceNodes.get(linkSrcNode);
PceNode pceOtnNodeDest = allPceNodes.get(linkDestNode);
List<Uint16> srcTsPool = pceOtnNodeSrc.getAvailableTribSlots().get(linkSrcTp);
LOG.warn("no otn links in otn-topology");
} else {
allLinks = nw1.nonnullLink().values().stream().sorted((l1, l2)
- -> l1.getSource().getSourceTp().toString().compareTo(l2.getSource().getSourceTp().toString()))
+ -> l1.getSource().getSourceTp().getValue().compareTo(l2.getSource().getSourceTp().getValue()))
.collect(Collectors.toList());
}
if (allNodes == null || allNodes.isEmpty()) {
pcelink.getlinkType(), pcelink);
break;
case ADDLINK:
- pcelink.setClient(source.getRdmSrgClient(pcelink.getSourceTP().toString()));
+ pcelink.setClient(source.getRdmSrgClient(pcelink.getSourceTP().getValue()));
addLinks.add(pcelink);
LOG.debug("validateLink: ADD-LINK saved {}", pcelink);
break;
case DROPLINK:
- pcelink.setClient(dest.getRdmSrgClient(pcelink.getDestTP().toString()));
+ pcelink.setClient(dest.getRdmSrgClient(pcelink.getDestTP().getValue()));
dropLinks.add(pcelink);
LOG.debug("validateLink: DROP-LINK saved {}", pcelink);
break;
// store separately all SRG links directly
azSrgs.add(sourceId);
// connected to A/Z
- if (!dest.checkTP(pcelink.getDestTP().toString())) {
+ if (!dest.checkTP(pcelink.getDestTP().getValue())) {
LOG.debug(
"validateLink: XPONDER-INPUT is rejected as NW port is busy - {} ", pcelink);
return false;
}
- if (dest.getXpdrClient(pcelink.getDestTP().toString()) != null) {
- pcelink.setClient(dest.getXpdrClient(pcelink.getDestTP().toString()));
+ if (dest.getXpdrClient(pcelink.getDestTP().getValue()) != null) {
+ pcelink.setClient(dest.getXpdrClient(pcelink.getDestTP().getValue()));
}
allPceLinks.put(linkId, pcelink);
source.addOutgoingLink(pcelink);
// store separately all SRG links directly
azSrgs.add(destId);
// connected to A/Z
- if (!source.checkTP(pcelink.getSourceTP().toString())) {
+ if (!source.checkTP(pcelink.getSourceTP().getValue())) {
LOG.debug(
"validateLink: XPONDER-OUTPUT is rejected as NW port is busy - {} ", pcelink);
return false;
}
- if (source.getXpdrClient(pcelink.getSourceTP().toString()) != null) {
- pcelink.setClient(source.getXpdrClient(pcelink.getSourceTP().toString()));
+ if (source.getXpdrClient(pcelink.getSourceTP().getValue()) != null) {
+ pcelink.setClient(source.getXpdrClient(pcelink.getSourceTP().getValue()));
}
allPceLinks.put(linkId, pcelink);
source.addOutgoingLink(pcelink);
switch (pceOtnLink.getlinkType()) {
case OTNLINK:
- if (dest.getXpdrClient(pceOtnLink.getDestTP().toString()) != null) {
- pceOtnLink.setClient(dest.getXpdrClient(pceOtnLink.getDestTP().toString()));
+ if (dest.getXpdrClient(pceOtnLink.getDestTP().getValue()) != null) {
+ pceOtnLink.setClient(dest.getXpdrClient(pceOtnLink.getDestTP().getValue()));
}
allPceLinks.put(linkId, pceOtnLink);
package org.opendaylight.transportpce.pce.networkanalyzer;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.Collection;
import java.util.Iterator;
import org.opendaylight.yang.gen.v1.http.transportpce.topology.rev210511.OtnLinkType;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NodeId;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.LinkId;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.TpId;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.Link;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
private final OpenroadmLinkType linkType;
private final NodeId sourceId;
private final NodeId destId;
- private transient Object sourceTP;
- private transient Object destTP;
+ private final TpId sourceTP;
+ private final TpId destTP;
private final String sourceNetworkSupNodeId;
private final String destNetworkSupNodeId;
private final String sourceCLLI;
return state;
}
- public Object getSourceTP() {
+ public TpId getSourceTP() {
return sourceTP;
}
- public Object getDestTP() {
+ public TpId getDestTP() {
return destTP;
}
public String toString() {
return "PceLink type=" + linkType + " ID=" + linkId.getValue() + " latency=" + latency;
}
-
- private void writeObject(ObjectOutputStream out) throws IOException {
- out.defaultWriteObject();
- out.writeObject(this.sourceTP);
- out.writeObject(this.destTP);
- }
-
- private void readObject(ObjectInputStream in) throws IOException,ClassNotFoundException {
- in.defaultReadObject();
- this.sourceTP = in.readObject();
- this.destTP = in.readObject();
- }
}
private static LinkBuilder createLinkBuilder(
String srcNode, String destNode, String srcTp, String destTp, Link1Builder link1Builder) {
SourceBuilder ietfSrcLinkBldr =
- new SourceBuilder().setSourceNode(new NodeId(srcNode)).setSourceTp(srcTp);
+ new SourceBuilder().setSourceNode(new NodeId(srcNode)).setSourceTp(new TpId(srcTp));
//create destination link
DestinationBuilder ietfDestLinkBldr =
new DestinationBuilder().setDestNode(new NodeId(destNode))
- .setDestTp(destTp);
+ .setDestTp(new TpId(destTp));
LinkId linkId = new LinkId(String.format(LINK_ID_FORMAT, srcNode, srcTp, destNode, destTp));
//For setting up attributes for openRoadm augment
NormalizedNodeResult result = new NormalizedNodeResult();
try (NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
JsonParserStream jsonParser = JsonParserStream.create(streamWriter,
- JSONCodecFactorySupplier.RFC7951.getShared(schemaCtx), schemaCtx);) {
+ JSONCodecFactorySupplier.RFC7951.getShared(schemaCtx));) {
jsonParser.parse(reader);
YangInstanceIdentifier yangId = YangInstanceIdentifier.of(pathQname);
if (bindingDOMCodecServices.fromNormalizedNode(yangId, result.getResult()) != null) {
public static LinkBuilder createLinkBuilder(
String srcNode, String destNode, String srcTp, String destTp, Link1Builder link1Builder) {
SourceBuilder ietfSrcLinkBldr =
- new SourceBuilder().setSourceNode(new NodeId(srcNode)).setSourceTp(srcTp);
+ new SourceBuilder().setSourceNode(new NodeId(srcNode)).setSourceTp(new TpId(srcTp));
//create destination link
DestinationBuilder ietfDestLinkBldr =
- new DestinationBuilder().setDestNode(new NodeId(destNode)).setDestTp(destTp);
+ new DestinationBuilder().setDestNode(new NodeId(destNode)).setDestTp(new TpId(destTp));
LinkId linkId = new LinkId(String.format(LINK_ID_FORMAT, srcNode, srcTp, destNode, destTp));
LinkId oppositeLinkId = new LinkId("OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1");
.setSource(
new SourceBuilder()
.setSourceNode(new NodeId("OpenROADM-3-2-DEG1"))
- .setSourceTp("DEG1-TTP-TX").build())
+ .setSourceTp(new TpId("DEG1-TTP-TX")).build())
.setDestination(
new DestinationBuilder()
.setDestNode(new NodeId("OpenROADM-3-1-DEG1"))
- .setDestTp("DEG1-TTP-RX").build())
+ .setDestTp(new TpId("DEG1-TTP-RX")).build())
.addAugmentation(aug11)
.addAugmentation(aug111)
.build();
import org.opendaylight.yangtools.yang.binding.DataObject;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
DataObjectConverter dataObjectConverter = XMLDataObjectConverter.createWithDataStoreUtil(dataStoreContext);
InputStream resourceAsStream = PceTestUtils.class.getClassLoader().getResourceAsStream(topologyDataPath);
- Optional<NormalizedNode<? extends YangInstanceIdentifier.PathArgument, ?>> normalizedNode
+ Optional<NormalizedNode> normalizedNode
= dataObjectConverter.transformIntoNormalizedNode(resourceAsStream);
- DataContainerChild<? extends YangInstanceIdentifier.PathArgument, ?> next
- = ((ContainerNode) normalizedNode.get()).getValue().iterator().next();
- MapEntryNode mapNode = ((MapNode) next).getValue().iterator().next();
+ DataContainerChild next
+ = ((ContainerNode) normalizedNode.get()).body().iterator().next();
+ MapEntryNode mapNode = ((MapNode) next).body().iterator().next();
Optional<DataObject> dataObject = dataObjectConverter.getDataObject(mapNode, Network.QNAME);
InstanceIdentifier<Network> nwInstanceIdentifier = InstanceIdentifier.builder(Networks.class)
.child(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)))
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.LinkId;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Network1;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Network1Builder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.TpId;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.Link;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.LinkBuilder;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.link.DestinationBuilder;
// create the roadm-to-roadm link to be measured
Link roadm2roadmLink = new LinkBuilder().setLinkId(new LinkId("ROADM-A1-to-ROADM-C1"))
.setSource(new SourceBuilder().setSourceNode(ietfNodeA.getNodeId())
- .setSourceTp("DEG2-TTP-TXRX").build())
- .setDestination(
- new DestinationBuilder().setDestNode(ietfNodeC.getNodeId()).setDestTp("DEG1-TTP-TXRX").build())
+ .setSourceTp(new TpId("DEG2-TTP-TXRX")).build())
+ .setDestination(new DestinationBuilder().setDestNode(ietfNodeC.getNodeId())
+ .setDestTp(new TpId("DEG1-TTP-TXRX")).build())
.addAugmentation(aug11)
.addAugmentation(aug12)
.addAugmentation(aug21)
<parent>
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>odlparent</artifactId>
- <version>8.1.3</version>
+ <version>9.0.5</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>7.0.9</version>
+ <version>8.0.4</version>
<relativePath/>
</parent>
circuitPackName = port.getCircuitPackName();
//Get port name
- portName = port.getPortName().toString();
+ portName = port.getPortName();
AToZBuilder a2zBldr = new AToZBuilder();
circuitPackName = port.getCircuitPackName();
//Get port name
- portName = port.getPortName().toString();
+ portName = port.getPortName();
ZToABuilder z2aBldr = new ZToABuilder();
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>7.0.9</version>
+ <version>8.0.4</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>7.0.9</version>
+ <version>8.0.4</version>
<relativePath/>
</parent>
<version>4.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.mdsal</groupId>
- <artifactId>mdsal-artifacts</artifactId>
- <version>7.0.9</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
.ietf.network.topology.rev180226.networks.network.Link oppositeLink) {
String prefix = link.getLinkId().getValue().split("-")[0];
String sourceNode = link.getSource().getSourceNode().getValue();
- String sourceTp = link.getSource().getSourceTp().toString();
+ String sourceTp = link.getSource().getSourceTp().getValue();
String destNode = link.getDestination().getDestNode().getValue();
- String destTp = link.getDestination().getDestTp().toString();
+ String destTp = link.getDestination().getDestTp().getValue();
LOG.info("prefix = {}, sourceNode = {}, sourceTp = {}, destNode = {}, destTp = {}",
prefix, sourceNode, sourceTp, destNode, destTp);
Map<NodeEdgePointKey, NodeEdgePoint> nepList = new HashMap<>();
private Link createTapiOmsLink(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang
.ietf.network.topology.rev180226.networks.network.Link link) {
String sourceNode = getIdBasedOnModelVersion(link.getSource().getSourceNode().getValue());
- String sourceTp = link.getSource().getSourceTp().toString();
+ String sourceTp = link.getSource().getSourceTp().getValue();
String destNode = getIdBasedOnModelVersion(link.getDestination().getDestNode().getValue());
- String destTp = link.getDestination().getDestTp().toString();
+ String destTp = link.getDestination().getDestTp().getValue();
Map<NodeEdgePointKey, NodeEdgePoint> nepList = new HashMap<>();
Uuid sourceUuidNode = new Uuid(UUID.nameUUIDFromBytes((String.join("+", sourceNode,
PHTNC_MEDIA)).getBytes(Charset.forName("UTF-8"))).toString());
String sourceNode = (link.getSource().getSourceNode().getValue().contains("ROADM"))
? getIdBasedOnModelVersion(link.getSource().getSourceNode().getValue())
: link.getSource().getSourceNode().getValue();
- String sourceTp = link.getSource().getSourceTp().toString();
+ String sourceTp = link.getSource().getSourceTp().getValue();
String destNode = (link.getDestination().getDestNode().getValue().contains("ROADM"))
? getIdBasedOnModelVersion(link.getDestination().getDestNode().getValue())
: link.getDestination().getDestNode().getValue();
- String destTp = link.getDestination().getDestTp().toString();
+ String destTp = link.getDestination().getDestTp().getValue();
Map<NodeEdgePointKey, NodeEdgePoint> nepList = new HashMap<>();
Uuid sourceUuidNode = (sourceNode.contains("ROADM")) ? new Uuid(UUID.nameUUIDFromBytes((
String.join("+", sourceNode, PHTNC_MEDIA)).getBytes(Charset.forName("UTF-8"))).toString())
.ietf.network.topology.rev180226.networks.network.Link oppositeLink) {
String prefix = link.getLinkId().getValue().split("-")[0];
String sourceNode = link.getSource().getSourceNode().getValue();
- String sourceTp = link.getSource().getSourceTp().toString();
+ String sourceTp = link.getSource().getSourceTp().getValue();
String destNode = link.getDestination().getDestNode().getValue();
- String destTp = link.getDestination().getDestTp().toString();
+ String destTp = link.getDestination().getDestTp().getValue();
Map<NodeEdgePointKey, NodeEdgePoint> nepList = new HashMap<>();
Uuid sourceUuidTp;
Uuid sourceUuidNode;
switch (networkPortDirection) {
case "bidirectional":
count += xpdOut.stream().filter(lk -> lk.getSource().getSourceNode().getValue().equals(nodeIdTopo)
- && lk.getSource().getSourceTp().equals(networkLcp)).count();
+ && lk.getSource().getSourceTp().getValue().equals(networkLcp)).count();
count += xpdIn.stream().filter(lk -> lk.getDestination().getDestNode().getValue().equals(nodeIdTopo)
- && lk.getDestination().getDestTp().equals(networkLcp)).count();
+ && lk.getDestination().getDestTp().getValue().equals(networkLcp)).count();
return (count == 2);
case "tx":
case "rx":
String partnerLcp = mapping.getPartnerLcp();
if (mapping.getPortQual().equals("tx")) {
count += xpdOut.stream().filter(lk -> lk.getSource().getSourceNode().getValue().equals(nodeIdTopo)
- && lk.getSource().getSourceTp().equals(networkLcp)).count();
+ && lk.getSource().getSourceTp().getValue().equals(networkLcp)).count();
count += xpdIn.stream().filter(lk -> lk.getDestination().getDestNode().getValue().equals(nodeIdTopo)
- && lk.getDestination().getDestTp().equals(partnerLcp)).count();
+ && lk.getDestination().getDestTp().getValue().equals(partnerLcp)).count();
}
if (mapping.getPortQual().equals("rx")) {
count += xpdIn.stream().filter(lk -> lk.getDestination().getDestNode().getValue().equals(nodeIdTopo)
- && lk.getDestination().getDestTp().equals(networkLcp)).count();
+ && lk.getDestination().getDestTp().getValue().equals(networkLcp)).count();
count += xpdOut.stream().filter(lk -> lk.getSource().getSourceNode().getValue().equals(nodeIdTopo)
- && lk.getSource().getSourceTp().equals(partnerLcp)).count();
+ && lk.getSource().getSourceTp().getValue().equals(partnerLcp)).count();
}
return (count == 2);
default:
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>7.0.9</version>
+ <version>8.0.4</version>
<relativePath/>
</parent>
<parent>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>binding-parent</artifactId>
- <version>7.0.9</version>
+ <version>8.0.4</version>
<relativePath />
</parent>
<dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>netconf-artifacts</artifactId>
- <version>1.13.4</version>
+ <version>2.0.3</version>
<scope>import</scope>
<type>pom</type>
</dependency>
</dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
- <artifactId>mdsal-binding-generator-impl</artifactId>
+ <artifactId>mdsal-binding-generator</artifactId>
</dependency>
<!-- Aluminium bump: undocumented new dependencies -->
<dependency>
import org.opendaylight.transportpce.test.converter.XMLDataObjectConverter;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodes;
import org.slf4j.Logger;
private static void insertDataIntoDS(XMLDataObjectConverter xmlConverter, InputStream xmlDataInputStream,
QName dataQName, DOMDataBroker domDataBroker) {
- Optional<NormalizedNode<? extends PathArgument, ?>> initialDataNormalizedNodes =
+ Optional<NormalizedNode> initialDataNormalizedNodes =
xmlConverter.transformIntoNormalizedNode(xmlDataInputStream);
Preconditions.checkArgument(initialDataNormalizedNodes.isPresent(),
"Initial data could not be converted to normalized nodes");
YangInstanceIdentifier initialDataIi = YangInstanceIdentifier.of(dataQName);
LOG.debug("Searching for {} inside {}", initialDataIi, initialDataNormalizedNodes.get());
- Optional<NormalizedNode<?, ?>> dataNormalizedNodes =
+ Optional<NormalizedNode> dataNormalizedNodes =
NormalizedNodes.findNode(initialDataNormalizedNodes.get(), initialDataIi);
Preconditions.checkArgument(dataNormalizedNodes.isPresent());
LOG.info("Initial data was successfully stored into ds");
@Override
@SuppressWarnings("unchecked")
public <T extends DataObject> Optional<T> getDataObject(
- @Nonnull NormalizedNode<?, ?> normalizedNode,
+ @Nonnull NormalizedNode normalizedNode,
@Nonnull QName rootNode) {
//Preconditions.checkNotNull(normalizedNode);
if (normalizedNode instanceof ContainerNode) {
YangInstanceIdentifier.PathArgument directChildIdentifier =
YangInstanceIdentifier.of(rootNode).getLastPathArgument();
- Optional<NormalizedNode<?, ?>> directChild =
+ Optional<NormalizedNode> directChild =
NormalizedNodes.getDirectChild(normalizedNode, directChildIdentifier);
if (!directChild.isPresent()) {
throw new IllegalStateException(String.format("Could not get the direct child of %s", rootNode));
@Override
@SuppressWarnings("unchecked")
public <T extends DataObject> Optional<T> getDataObjectFromRpc(
- @Nonnull NormalizedNode<?, ?> normalizedNode,
+ @Nonnull NormalizedNode normalizedNode,
@Nonnull SchemaPath rpcSchemaPath) {
if (! (normalizedNode instanceof ContainerNode)) {
}
@Override
- public <T extends DataObject> Optional<NormalizedNode<?, ?>> toNormalizedNodes(@Nonnull T object,
+ public <T extends DataObject> Optional<NormalizedNode> toNormalizedNodes(@Nonnull T object,
Class<T> dataObjectClass) {
- Entry<YangInstanceIdentifier, NormalizedNode<?, ?>> normalizedNode =
+ Entry<YangInstanceIdentifier, NormalizedNode> normalizedNode =
codecRegistry.toNormalizedNode(InstanceIdentifier.create(dataObjectClass), object);
return Optional.ofNullable(normalizedNode.getValue());
}
@Override
public <T extends DataObject> ConvertType<T> dataContainer() {
return (object, objectClass) -> {
- NormalizedNode<?, ?> value =
+ NormalizedNode value =
getCodecRegistry().toNormalizedNode(InstanceIdentifier.create(objectClass), object).getValue();
return Optional.ofNullable(value);
};
import org.opendaylight.yangtools.yang.binding.DataObject;
import org.opendaylight.yangtools.yang.binding.Notification;
import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.model.api.SchemaNode;
import org.opendaylight.yangtools.yang.model.api.SchemaPath;
public interface DataObjectConverter {
<T extends DataObject> Optional<T> getDataObject(
- @Nonnull NormalizedNode<? extends YangInstanceIdentifier.PathArgument, ?> normalizedNode,
+ @Nonnull NormalizedNode normalizedNode,
@Nonnull QName rootNode);
<T extends DataObject> Optional<T> getDataObjectFromRpc(
- @Nonnull NormalizedNode<? extends YangInstanceIdentifier.PathArgument, ?> normalizedNode,
+ @Nonnull NormalizedNode normalizedNode,
@Nonnull SchemaPath rpcSchemaPath);
- Optional<NormalizedNode<? extends YangInstanceIdentifier.PathArgument, ?>> transformIntoNormalizedNode(
+ Optional<NormalizedNode> transformIntoNormalizedNode(
@Nonnull InputStream inputStream);
- Optional<NormalizedNode<? extends YangInstanceIdentifier.PathArgument, ?>> transformIntoNormalizedNode(
+ Optional<NormalizedNode> transformIntoNormalizedNode(
@Nonnull Reader inputReader, SchemaNode parentSchema);
- Optional<NormalizedNode<? extends YangInstanceIdentifier.PathArgument, ?>> transformIntoNormalizedNode(
+ Optional<NormalizedNode> transformIntoNormalizedNode(
@Nonnull Reader inputReader);
<T extends DataObject> Writer writerFromDataObject(@Nonnull DataObject object, Class<T> dataObjectClass,
<T extends DataObject> Writer writerFromRpcDataObject(@Nonnull DataObject object, Class<T> dataObjectClass,
ConvertType<T> convertType, QName rpcOutputQName, String rpcName);
- <T extends DataObject> Optional<NormalizedNode<?, ?>> toNormalizedNodes(@Nonnull T object,
+ <T extends DataObject> Optional<NormalizedNode> toNormalizedNodes(@Nonnull T object,
Class<T> dataObjectClass);
public interface ConvertType<T> {
- Optional<NormalizedNode<?, ?>> toNormalizedNodes(T object, Class<T> clazz);
+ Optional<NormalizedNode> toNormalizedNodes(T object, Class<T> clazz);
}
/**
import org.opendaylight.transportpce.test.DataStoreContext;
import org.opendaylight.yangtools.yang.binding.DataObject;
import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWriter;
import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult;
import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
import org.opendaylight.yangtools.yang.model.api.SchemaNode;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
* @return {@link Optional} instance of {@link NormalizedNode}.
*/
@Override
- public Optional<NormalizedNode<? extends YangInstanceIdentifier.PathArgument, ?>> transformIntoNormalizedNode(
+ public Optional<NormalizedNode> transformIntoNormalizedNode(
@Nonnull InputStream inputStream) {
JsonReader reader = new JsonReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
return parseInputJSON(reader);
}
@Override
- public Optional<NormalizedNode<? extends YangInstanceIdentifier.PathArgument, ?>> transformIntoNormalizedNode(
+ public Optional<NormalizedNode> transformIntoNormalizedNode(
@Nonnull Reader inputReader, SchemaNode parentSchema) {
throw new UnsupportedOperationException("Not Implemented yet");
}
@Override
- public Optional<NormalizedNode<? extends YangInstanceIdentifier.PathArgument, ?>> transformIntoNormalizedNode(
+ public Optional<NormalizedNode> transformIntoNormalizedNode(
@Nonnull Reader inputReader) {
JsonReader reader = new JsonReader(inputReader);
return parseInputJSON(reader);
JSONCodecFactorySupplier.DRAFT_LHOTKA_NETMOD_YANG_JSON_02.createLazy(getSchemaContext());
NormalizedNodeStreamWriter create =
JSONNormalizedNodeStreamWriter.createExclusiveWriter(jsonCodecFactory,
- (org.opendaylight.yangtools.yang.model.api.DataNodeContainer)null, null, jsonWriter);
+ (SchemaPath)null, null, jsonWriter);
try (NormalizedNodeWriter normalizedNodeWriter = NormalizedNodeWriter.forStreamWriter(create);) {
normalizedNodeWriter
* @param reader of the given JSON
*
*/
- private Optional<NormalizedNode<? extends YangInstanceIdentifier.PathArgument, ?>> parseInputJSON(
+ private Optional<NormalizedNode> parseInputJSON(
JsonReader reader) {
NormalizedNodeResult result = new NormalizedNodeResult();
try (NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
JsonParserStream jsonParser = JsonParserStream.create(streamWriter,
- JSONCodecFactorySupplier.RFC7951.getShared(getSchemaContext()),
- getSchemaContext())) {
+ JSONCodecFactorySupplier.RFC7951.getShared(getSchemaContext()))) {
jsonParser.parse(reader);
} catch (IOException e) {
LOG.warn("An error occured during parsing Json input stream", e);
import org.opendaylight.transportpce.test.DataStoreContext;
import org.opendaylight.yangtools.yang.binding.DataObject;
import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWriter;
import org.opendaylight.yangtools.yang.data.codec.xml.XMLStreamNormalizedNodeStreamWriter;
-import org.opendaylight.yangtools.yang.data.codec.xml.XmlCodecFactory;
import org.opendaylight.yangtools.yang.data.codec.xml.XmlParserStream;
import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNormalizedNodeStreamWriter;
import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult;
import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
+import org.opendaylight.yangtools.yang.model.api.EffectiveStatementInference;
import org.opendaylight.yangtools.yang.model.api.SchemaNode;
import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.SAXException;
* @return {@link Optional} instance of {@link NormalizedNode}.
*/
@Override
- public Optional<NormalizedNode<? extends YangInstanceIdentifier.PathArgument, ?>> transformIntoNormalizedNode(
+ public Optional<NormalizedNode> transformIntoNormalizedNode(
@Nonnull InputStream inputStream) {
try {
XMLStreamReader reader = this.xmlInputFactory.createXMLStreamReader(inputStream);
}
}
- public Optional<NormalizedNode<? extends YangInstanceIdentifier.PathArgument, ?>> transformIntoNormalizedNode(
+ public Optional<NormalizedNode> transformIntoNormalizedNode(
@Nonnull Reader inputReader, SchemaNode parentSchema) {
try {
XMLStreamReader reader = this.xmlInputFactory.createXMLStreamReader(inputReader);
* @return {@link Optional} instance of {@link NormalizedNode}.
*/
@Override
- public Optional<NormalizedNode<? extends YangInstanceIdentifier.PathArgument, ?>> transformIntoNormalizedNode(
+ public Optional<NormalizedNode> transformIntoNormalizedNode(
@Nonnull Reader inputReader) {
try {
XMLStreamReader reader = this.xmlInputFactory.createXMLStreamReader(inputReader);
xmlStreamWriter.writeStartElement(XMLConstants.DEFAULT_NS_PREFIX,
rpcOutputQName.getLocalName(), rpcOutputQName.getNamespace().toString());
xmlStreamWriter.writeDefaultNamespace(rpcOutputQName.getNamespace().toString());
- NormalizedNode<?, ?> rpcOutputNormalizedNode = convertType.toNormalizedNodes(dataObjectClass.cast(object),
+ NormalizedNode rpcOutputNormalizedNode = convertType.toNormalizedNodes(dataObjectClass.cast(object),
dataObjectClass).get();
- for (final NormalizedNode<?, ?> child : ((ContainerNode)rpcOutputNormalizedNode).getValue()) {
+ for (final NormalizedNode child : ((ContainerNode)rpcOutputNormalizedNode).body()) {
normalizedNodeWriter.write(child);
}
normalizedNodeWriter.flush();
return writer;
}
- private Optional<NormalizedNode<? extends YangInstanceIdentifier.PathArgument, ?>> parseInputXML(
+ private Optional<NormalizedNode> parseInputXML(
XMLStreamReader reader) {
return parseInputXML(reader, getSchemaContext());
}
- private Optional<NormalizedNode<? extends YangInstanceIdentifier.PathArgument, ?>> parseInputXML(
- XMLStreamReader reader, SchemaNode parentSchemaNode) {
+ private Optional<NormalizedNode> parseInputXML(XMLStreamReader reader, SchemaNode parentSchemaNode) {
NormalizedNodeResult result = new NormalizedNodeResult();
+ EffectiveStatementInference schema = SchemaInferenceStack.ofSchemaPath(getSchemaContext(),
+ parentSchemaNode.getPath()).toInference();
try (NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
- XmlParserStream xmlParser = XmlParserStream
- .create(streamWriter, XmlCodecFactory.create(getSchemaContext()), parentSchemaNode)) {
+ XmlParserStream xmlParser = XmlParserStream
+ .create(streamWriter, schema)) {
+// XmlParserStream xmlParser = XmlParserStream
+// .create(streamWriter, XmlCodecFactory.create(getSchemaContext()), parentSchemaNode)) {
xmlParser.parse(reader);
} catch (XMLStreamException | URISyntaxException | IOException | SAXException e) {
LOG.warn("An error occured during parsing XML input stream", e);
if (topoFile.exists()) {
String fileName = topoFile.getName();
try (InputStream targetStream = new FileInputStream(topoFile)) {
- Optional<NormalizedNode<?, ?>> transformIntoNormalizedNode = XMLDataObjectConverter
+ Optional<NormalizedNode> transformIntoNormalizedNode = XMLDataObjectConverter
.createWithDataStoreUtil(dataStoreContextUtil).transformIntoNormalizedNode(targetStream);
if (!transformIntoNormalizedNode.isPresent()) {
throw new IllegalStateException(String.format(
if (portmappingFile.exists()) {
String fileName = portmappingFile.getName();
try (InputStream targetStream = new FileInputStream(portmappingFile)) {
- Optional<NormalizedNode<?, ?>> transformIntoNormalizedNode = null;
+ Optional<NormalizedNode> transformIntoNormalizedNode = null;
transformIntoNormalizedNode = XMLDataObjectConverter.createWithDataStoreUtil(dataStoreContextUtil)
.transformIntoNormalizedNode(targetStream);
if (!transformIntoNormalizedNode.isPresent()) {
response = test_utils.portmapping_request("XPDR-A2/mapping/XPDR2-CLIENT1")
self.assertEqual(response.status_code, requests.codes.ok)
res = response.json()
- self.assertIn(
- {'supported-interface-capability':
- ['org-openroadm-port-types:if-100GE-ODU4',
- 'org-openroadm-port-types:if-OCH-OTU4-ODU4'],
- 'supporting-port': 'C1',
- 'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT',
- 'logical-connection-point': 'XPDR2-CLIENT1',
- 'port-direction': 'bidirectional',
- 'port-qual': 'switch-client',
- 'lcp-hash-val': 'AK+Cna4EclRH',
- 'port-admin-state': 'InService',
- 'port-oper-state': 'InService',
- "mpdr-restrictions": {
+ self.assertIn('org-openroadm-port-types:if-100GE-ODU4',
+ res['mapping'][0]['supported-interface-capability'])
+ self.assertIn('org-openroadm-port-types:if-OCH-OTU4-ODU4',
+ res['mapping'][0]['supported-interface-capability'])
+ self.assertEqual('C1', res['mapping'][0]['supporting-port'])
+ self.assertEqual('1/2/1/1-PLUG-CLIENT', res['mapping'][0]['supporting-circuit-pack-name'])
+ self.assertEqual('XPDR2-CLIENT1', res['mapping'][0]['logical-connection-point'])
+ self.assertEqual('bidirectional', res['mapping'][0]['port-direction'])
+ self.assertEqual('switch-client', res['mapping'][0]['port-qual'])
+ self.assertEqual('AK+Cna4EclRH', res['mapping'][0]['lcp-hash-val'])
+ self.assertEqual('InService', res['mapping'][0]['port-admin-state'])
+ self.assertEqual('InService', res['mapping'][0]['port-oper-state'])
+ self.assertEqual({
"min-trib-slot": "1.1",
"max-trib-slot": "1.20"
- }},
- res['mapping'])
+ }, res['mapping'][0]['mpdr-restrictions'])
# Added test to check mc-capability-profile for a transponder
def test_08_check_mccapprofile(self):
[testenv]
passenv = USE_LIGHTY http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
-setenv =
- USE_LIGHTY=True
+#setenv =
+# USE_LIGHTY=True
usedevelop = true
basepython = python3
deps =
depends = buildcontroller
whitelist_externals = launch_tests.sh
passenv = LAUNCHER USE_LIGHTY
-setenv =
- USE_LIGHTY=True
+#setenv =
+# USE_LIGHTY=True
commands =
./launch_tests.sh pce {posargs:}
whitelist_externals = launch_tests.sh
passenv = LAUNCHER USE_LIGHTY
setenv =
- USE_LIGHTY=True
+# USE_LIGHTY=True
USE_ODL_ALT_WEBSOCKET_PORT=8186
USE_ODL_ALT_AKKA_PORT=2551
USE_ODL_ALT_AKKA_MGT_PORT=8559
whitelist_externals = launch_tests.sh
passenv = LAUNCHER USE_LIGHTY
setenv =
- USE_LIGHTY=True
+# USE_LIGHTY=True
USE_ODL_ALT_WEBSOCKET_PORT=8187
USE_ODL_ALT_AKKA_PORT=2552
USE_ODL_ALT_AKKA_MGT_PORT=8560
whitelist_externals = launch_tests.sh
passenv = LAUNCHER USE_LIGHTY
setenv =
- USE_LIGHTY=True
+# USE_LIGHTY=True
USE_ODL_ALT_WEBSOCKET_PORT=8188
USE_ODL_ALT_AKKA_PORT=2553
USE_ODL_ALT_AKKA_MGT_PORT=8561
whitelist_externals = launch_tests.sh
passenv = LAUNCHER USE_LIGHTY
setenv =
- USE_LIGHTY=True
+# USE_LIGHTY=True
USE_ODL_ALT_WEBSOCKET_PORT=8186
USE_ODL_ALT_AKKA_PORT=2551
USE_ODL_ALT_AKKA_MGT_PORT=8559
Code Review / transportpce.git / commitdiff