import java.io.IOException;
import java.io.Reader;
import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Map;
import java.util.concurrent.ExecutionException;
import org.glassfish.grizzly.http.server.HttpServer;
import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory;
import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev200629.path.description.atoz.direction.AToZ;
import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev200629.path.description.atoz.direction.AToZBuilder;
import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev200629.path.description.atoz.direction.AToZKey;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev200629.path.description.ztoa.direction.ZToA;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev200629.path.description.ztoa.direction.ZToABuilder;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev200629.path.description.ztoa.direction.ZToAKey;
import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev200629.pce.resource.Resource;
import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev200629.pce.resource.ResourceBuilder;
import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev200629.pce.resource.resource.resource.TerminationPoint;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.NetworkKey;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.Uint32;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
public class GnpyUtilitiesImplTest extends AbstractTest {
private static final Logger LOG = LoggerFactory.getLogger(GnpyUtilitiesImplTest.class);
networkReader = new JsonReader(gnpyNetwork);
Networks networks = (Networks) JsonUtil.getInstance().getDataObjectFromJson(networkReader,
QName.create("urn:ietf:params:xml:ns:yang:ietf-network", "2018-02-26", "networks"));
- saveOpenRoadmNetwork(networks.getNetwork().get(0), NetworkUtils.UNDERLAY_NETWORK_ID);
+ saveOpenRoadmNetwork(networks.getNetwork().values().iterator().next(), NetworkUtils.UNDERLAY_NETWORK_ID);
// load openroadm-topology
Reader gnpyTopo = new FileReader("src/test/resources/gnpy/gnpy_topology.json");
topoReader = new JsonReader(gnpyTopo);
networks = (Networks) JsonUtil.getInstance().getDataObjectFromJson(topoReader,
QName.create("urn:ietf:params:xml:ns:yang:ietf-network", "2018-02-26", "networks"));
- saveOpenRoadmNetwork(networks.getNetwork().get(0), NetworkUtils.OVERLAY_NETWORK_ID);
+ saveOpenRoadmNetwork(networks.getNetwork().values().iterator().next(), NetworkUtils.OVERLAY_NETWORK_ID);
} catch (FileNotFoundException | InterruptedException | ExecutionException e) {
LOG.error("Cannot init test ", e);
fail("Cannot init test ");
@Test
public void askNewPathFromGnpyNullResultTest() throws Exception {
gnpyUtilitiesImpl = new GnpyUtilitiesImpl(networkTransaction,
- PceTestData.getGnpyPCERequest("XPONDER-1", "XPONDER-2"));
+ PceTestData.getGnpyPCERequest("XPONDER-1", "XPONDER-2"),
+ JsonUtil.getInstance().getBindingDOMCodecServices());
assertNull("No hard constraints should be available", gnpyUtilitiesImpl.askNewPathFromGnpy(null));
}
@Test
public void askNewPathFromGnpyTest() throws Exception {
gnpyUtilitiesImpl = new GnpyUtilitiesImpl(networkTransaction,
- PceTestData.getGnpyPCERequest("XPONDER-3", "XPONDER-4"));
+ PceTestData.getGnpyPCERequest("XPONDER-3", "XPONDER-4"),
+ JsonUtil.getInstance().getBindingDOMCodecServices());
PceConstraintsCalc constraints = new PceConstraintsCalc(PceTestData.getPCE_simpletopology_test1_request(),
networkTransaction);
PceConstraints pceHardConstraints = constraints.getPceHardConstraints();
ZToADirectionBuilder ztoADirectionBldr = buildZtoA();
gnpyUtilitiesImpl = new GnpyUtilitiesImpl(networkTransaction,
- PceTestData.getGnpyPCERequest("XPONDER-1", "XPONDER-2"));
+ PceTestData.getGnpyPCERequest("XPONDER-1", "XPONDER-2"),
+ JsonUtil.getInstance().getBindingDOMCodecServices());
PceConstraintsCalc constraints = new PceConstraintsCalc(PceTestData.getPCE_simpletopology_test1_request(),
networkTransaction);
PceConstraints pceHardConstraints = constraints.getPceHardConstraints();
}
private AToZDirectionBuilder buildAtZ() {
- List<AToZ> atozList = new ArrayList<>();
AToZKey clientKey = new AToZKey("key");
TerminationPoint stp = new TerminationPointBuilder()
.setTpId("tpName").setTpNodeId("xname")
.build();
Resource clientResource = new ResourceBuilder().setResource(stp).build();
AToZ firstResource = new AToZBuilder().setId("tpName").withKey(clientKey).setResource(clientResource).build();
- atozList.add(firstResource);
return new AToZDirectionBuilder()
- .setRate(100L)
- .setAToZ(atozList)
- .setAToZWavelengthNumber(Long.valueOf(0));
+ .setRate(Uint32.valueOf(100))
+ .setAToZ(Map.of(firstResource.key(),firstResource))
+ .setAToZWavelengthNumber(Uint32.valueOf(0));
}
private ZToADirectionBuilder buildZtoA() {
+ ZToAKey clientKey = new ZToAKey("key");
+ TerminationPoint stp = new TerminationPointBuilder()
+ .setTpId("tpName").setTpNodeId("xname")
+ .build();
+ Resource clientResource = new ResourceBuilder().setResource(stp).build();
+ ZToA firstResource = new ZToABuilder().setId("tpName").withKey(clientKey).setResource(clientResource).build();
return new ZToADirectionBuilder()
- .setRate(100L)
- .setZToA(new ArrayList())
- .setZToAWavelengthNumber(Long.valueOf(0));
+ .setRate(Uint32.valueOf(100))
+ .setZToA(Map.of(firstResource.key(),firstResource))
+ .setZToAWavelengthNumber(Uint32.valueOf(0));
}
}