import java.util.concurrent.ExecutionException;
import java.util.stream.Collectors;
import org.junit.Assert;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.transportpce.binding.converter.XMLDataObjectConverter;
-import org.opendaylight.transportpce.binding.converter.api.DataObjectConverter;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.WriteTransaction;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.transportpce.common.DataStoreContext;
import org.opendaylight.transportpce.common.NetworkUtils;
-import org.opendaylight.transportpce.test.common.DataStoreContext;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev171017.PathComputationRequestOutput;
+import org.opendaylight.transportpce.common.converter.XMLDataObjectConverter;
+import org.opendaylight.transportpce.common.converter.api.DataObjectConverter;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.PathComputationRequestOutput;
import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.path.description.atoz.direction.AToZ;
import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.pce.resource.resource.resource.Node;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.Network;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.NetworkId;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.NetworkKey;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NetworkId;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.Networks;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.NetworkKey;
import org.opendaylight.yangtools.yang.binding.DataObject;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
= ((ContainerNode) normalizedNode.get()).getValue().iterator().next();
MapEntryNode mapNode = ((MapNode) next).getValue().iterator().next();
Optional<DataObject> dataObject = dataObjectConverter.getDataObject(mapNode, Network.QNAME);
- InstanceIdentifier<Network> nwInstanceIdentifier = InstanceIdentifier
- .builder(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)))
- .build();
+ InstanceIdentifier<Network> nwInstanceIdentifier = InstanceIdentifier.builder(Networks.class)
+ .child(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)))
+ .build();
WriteTransaction dataWriteTransaction = dataBroker.newWriteOnlyTransaction();
dataWriteTransaction.put(LogicalDatastoreType.CONFIGURATION, nwInstanceIdentifier, (Network) dataObject.get());
- dataWriteTransaction.submit().get();
+ dataWriteTransaction.commit().get();
}
public static void checkConfigurationResponse(PathComputationRequestOutput output,
Assert.assertEquals(atozSize, ztoaSize);
Long actualAToZWavel = output.getResponseParameters().getPathDescription().getAToZDirection()
- .getAToZWavelengthNumber();
+ .getAToZWavelengthNumber().toJava();
Long expectedAToZWavel = expectedOutput.getResponseParameters().getPathDescription().getAToZDirection()
- .getAToZWavelengthNumber();
+ .getAToZWavelengthNumber().toJava();
Assert.assertEquals(actualAToZWavel, expectedAToZWavel);
Long actualZtoAWavel = output.getResponseParameters().getPathDescription().getZToADirection()
- .getZToAWavelengthNumber();
+ .getZToAWavelengthNumber().toJava();
Long expectedZtoAWavel = expectedOutput.getResponseParameters().getPathDescription().getZToADirection()
- .getZToAWavelengthNumber();
+ .getZToAWavelengthNumber().toJava();
Assert.assertEquals(actualZtoAWavel, expectedZtoAWavel);
- Long actualAToZRate = output.getResponseParameters().getPathDescription().getAToZDirection().getRate();
+ Long actualAToZRate = output.getResponseParameters().getPathDescription().getAToZDirection().getRate().toJava();
Long expectedAToZRate = expectedOutput.getResponseParameters().getPathDescription().getAToZDirection()
- .getRate();
+ .getRate().toJava();
Assert.assertEquals(expectedAToZRate, actualAToZRate);
- Long actualZToARate = output.getResponseParameters().getPathDescription().getZToADirection().getRate();
+ Long actualZToARate = output.getResponseParameters().getPathDescription().getZToADirection().getRate().toJava();
Long expectedZToARate = expectedOutput.getResponseParameters().getPathDescription().getZToADirection()
- .getRate();
+ .getRate().toJava();
Assert.assertEquals(actualZToARate, expectedZToARate);
}