From: Gilles Thouenon Date: Wed, 1 Mar 2023 07:35:50 +0000 (+0100) Subject: Use QNAME constant X-Git-Tag: 7.0.0~10 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=commitdiff_plain;h=8c9ebbcf59bcf5528dc7a8251a7c85f0581b44c7 Use QNAME constant Use QNAME constant instead of creating manually the qualified name of a YANG container during de/serialization processes. JIRA: TRNSPRTPCE-730 Signed-off-by: Gilles Thouenon Change-Id: I150f1a1969d9b4c17f6a653068d28d0dd8f29e18 --- diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopologyTest.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopologyTest.java index 3718002d2..a6218ce42 100644 --- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopologyTest.java +++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmOtnTopologyTest.java @@ -70,7 +70,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.top 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.node.TerminationPoint; -import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Uint16; import org.opendaylight.yangtools.yang.common.Uint32; import org.slf4j.Logger; @@ -86,8 +85,8 @@ public class OpenRoadmOtnTopologyTest { public OpenRoadmOtnTopologyTest() { try (Reader reader = new FileReader("src/test/resources/portMapping.json", StandardCharsets.UTF_8); JsonReader portMappingReader = new JsonReader(reader)) { - Network portMapping = (Network) JsonUtil.getInstance().getDataObjectFromJson(portMappingReader, - QName.create("http://org/opendaylight/transportpce/portmapping", "2022-03-16", "network")); + Network portMapping = (Network) JsonUtil.getInstance() + .getDataObjectFromJson(portMappingReader, Network.QNAME); for (Nodes nodes : portMapping.nonnullNodes().values()) { if (nodes.getNodeId().equals("XPDR-A1")) { this.portMappingTpdr = nodes; diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/gnpy/GnpyUtilitiesImplTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/gnpy/GnpyUtilitiesImplTest.java index cc78a78f8..e74ffc6db 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/gnpy/GnpyUtilitiesImplTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/gnpy/GnpyUtilitiesImplTest.java @@ -57,7 +57,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev 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.InstanceIdentifier; -import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Uint32; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -81,15 +80,13 @@ public class GnpyUtilitiesImplTest extends AbstractTest { StandardCharsets.UTF_8); 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")); + Networks networks = (Networks) JsonUtil.getInstance().getDataObjectFromJson(networkReader, Networks.QNAME); saveOpenRoadmNetwork(networks.getNetwork().values().iterator().next(), NetworkUtils.UNDERLAY_NETWORK_ID); // load openroadm-topology Reader gnpyTopo = new FileReader("src/test/resources/gnpy/gnpy_topology.json", StandardCharsets.UTF_8); topoReader = new JsonReader(gnpyTopo); - networks = (Networks) JsonUtil.getInstance().getDataObjectFromJson(topoReader, - QName.create("urn:ietf:params:xml:ns:yang:ietf-network", "2018-02-26", "networks")); + networks = (Networks) JsonUtil.getInstance().getDataObjectFromJson(topoReader, Networks.QNAME); saveOpenRoadmNetwork(networks.getNetwork().values().iterator().next(), NetworkUtils.OVERLAY_NETWORK_ID); } catch (FileNotFoundException | InterruptedException | ExecutionException e) { LOG.error("Cannot init test ", e); diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphTest.java index 8398e2782..67678bdbd 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/graph/PceGraphTest.java @@ -96,7 +96,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.top import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPointBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPointKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Uint32; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -197,18 +196,13 @@ public class PceGraphTest extends AbstractTest { // load openroadm-network Reader gnpyNetwork = new FileReader("src/test/resources/gnpy/gnpy_network.json", StandardCharsets.UTF_8); 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")); + Networks networks = (Networks) JsonUtil.getInstance().getDataObjectFromJson(networkReader, Networks.QNAME); saveOpenRoadmNetwork(networks.getNetwork().values().iterator().next(), NetworkUtils.UNDERLAY_NETWORK_ID); // load openroadm-topology - Reader gnpyTopo = - new FileReader("src/test/resources/topologyData/or-base-topology.json", StandardCharsets.UTF_8); + Reader gnpyTopo = new FileReader("src/test/resources/topologyData/or-base-topology.json", + StandardCharsets.UTF_8); topoReader = new JsonReader(gnpyTopo); - networks = (Networks) JsonUtil - .getInstance() - .getDataObjectFromJson( - topoReader, - QName.create("urn:ietf:params:xml:ns:yang:ietf-network", "2018-02-26", "networks")); + networks = (Networks) JsonUtil.getInstance().getDataObjectFromJson(topoReader, Networks.QNAME); saveOpenRoadmNetwork(networks.getNetwork().values().iterator().next(), NetworkUtils.OVERLAY_NETWORK_ID); } catch (IOException | InterruptedException | ExecutionException e) { LOG.error("Cannot init test ", e); diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestUtils.java b/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestUtils.java index e0574c29b..2ea213686 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestUtils.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestUtils.java @@ -19,7 +19,6 @@ import java.util.Map; import java.util.Optional; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; -import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import org.junit.Assert; import org.opendaylight.mdsal.binding.api.DataBroker; @@ -39,7 +38,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev 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.common.QName; 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; @@ -88,13 +86,10 @@ public final class PceTestUtils { JsonReader topoReader = new JsonReader(gnpyTopo); ) { - Networks networks = (Networks) JsonUtil.getInstance().getDataObjectFromJson(networkReader, - QName.create("urn:ietf:params:xml:ns:yang:ietf-network", "2018-02-26", "networks")); - @NonNull + Networks networks = (Networks) JsonUtil.getInstance().getDataObjectFromJson(networkReader, Networks.QNAME); List networkMap = new ArrayList<>(networks.nonnullNetwork().values()); saveOpenRoadmNetwork(networkMap.get(0), NetworkUtils.UNDERLAY_NETWORK_ID, dataBroker); - networks = (Networks) JsonUtil.getInstance().getDataObjectFromJson(topoReader, - QName.create("urn:ietf:params:xml:ns:yang:ietf-network", "2018-02-26", "networks")); + networks = (Networks) JsonUtil.getInstance().getDataObjectFromJson(topoReader, Networks.QNAME); saveOpenRoadmNetwork(networkMap.get(0), NetworkUtils.UNDERLAY_NETWORK_ID, dataBroker); } catch (IOException | ExecutionException | InterruptedException e) { LOG.error("Cannot init test ", e); diff --git a/test-common/src/main/java/org/opendaylight/transportpce/test/converter/AbstractDataObjectConverter.java b/test-common/src/main/java/org/opendaylight/transportpce/test/converter/AbstractDataObjectConverter.java index a0085e7a0..5fb457a5e 100644 --- a/test-common/src/main/java/org/opendaylight/transportpce/test/converter/AbstractDataObjectConverter.java +++ b/test-common/src/main/java/org/opendaylight/transportpce/test/converter/AbstractDataObjectConverter.java @@ -104,9 +104,8 @@ public abstract class AbstractDataObjectConverter implements DataObjectConverter normalizedNode.getClass().getSimpleName()); return Optional.empty(); } - T rpcDataObject = (T) codecRegistry.fromNormalizedNodeRpcData( - Absolute.of(QName.create(schemaContext.getClass().getSimpleName())), - (ContainerNode) normalizedNode); + T rpcDataObject = (T) codecRegistry + .fromNormalizedNodeRpcData(Absolute.of(EffectiveModelContext.NAME), (ContainerNode) normalizedNode); return Optional.ofNullable(rpcDataObject); }