From 407182c683615bbdf6df4a6fa9f10a8f5deaa22d Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 1 Jan 2023 23:34:05 +0100 Subject: [PATCH] Move netconf-node-{optional,topology}.yang This is the final bit of making sal-netconf-connector independent of netconf-topology.yang JIRA: NETCONF-913 Change-Id: If94b2623bba3d5576e27075eecc3ca5772626eaf Signed-off-by: Robert Varga --- netconf/netconf-console/pom.xml | 4 ++++ netconf/netconf-topology/pom.xml | 8 ++++++++ .../src/main/yang/netconf-node-optional.yang | 0 .../src/main/yang/netconf-node-topology.yang | 0 netconf/sal-netconf-connector/pom.xml | 8 -------- netconf/tools/netconf-test-perf/pom.xml | 10 +++++++--- .../test/endtoend/NcmountServiceImpl.java | 12 ++---------- netconf/tools/netconf-testtool/pom.xml | 4 ++++ 8 files changed, 25 insertions(+), 21 deletions(-) rename netconf/{sal-netconf-connector => netconf-topology}/src/main/yang/netconf-node-optional.yang (100%) rename netconf/{sal-netconf-connector => netconf-topology}/src/main/yang/netconf-node-topology.yang (100%) diff --git a/netconf/netconf-console/pom.xml b/netconf/netconf-console/pom.xml index 6213f8ab5b..910c5c1e10 100644 --- a/netconf/netconf-console/pom.xml +++ b/netconf/netconf-console/pom.xml @@ -26,6 +26,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.apache.karaf.shell.console provided + + org.opendaylight.netconf + netconf-topology + org.opendaylight.netconf sal-netconf-connector diff --git a/netconf/netconf-topology/pom.xml b/netconf/netconf-topology/pom.xml index f731127404..b77e2b28d9 100644 --- a/netconf/netconf-topology/pom.xml +++ b/netconf/netconf-topology/pom.xml @@ -23,6 +23,14 @@ org.opendaylight.controller threadpool-config-api + + org.opendaylight.mdsal.model + ietf-topology + + + org.opendaylight.mdsal.model + yang-ext + org.opendaylight.netconf sal-netconf-connector diff --git a/netconf/sal-netconf-connector/src/main/yang/netconf-node-optional.yang b/netconf/netconf-topology/src/main/yang/netconf-node-optional.yang similarity index 100% rename from netconf/sal-netconf-connector/src/main/yang/netconf-node-optional.yang rename to netconf/netconf-topology/src/main/yang/netconf-node-optional.yang diff --git a/netconf/sal-netconf-connector/src/main/yang/netconf-node-topology.yang b/netconf/netconf-topology/src/main/yang/netconf-node-topology.yang similarity index 100% rename from netconf/sal-netconf-connector/src/main/yang/netconf-node-topology.yang rename to netconf/netconf-topology/src/main/yang/netconf-node-topology.yang diff --git a/netconf/sal-netconf-connector/pom.xml b/netconf/sal-netconf-connector/pom.xml index 6955e0be3c..c382558993 100644 --- a/netconf/sal-netconf-connector/pom.xml +++ b/netconf/sal-netconf-connector/pom.xml @@ -55,10 +55,6 @@ org.opendaylight.mdsal mdsal-dom-spi - - org.opendaylight.mdsal.model - ietf-topology - org.opendaylight.yangtools yang-data-impl @@ -91,10 +87,6 @@ org.opendaylight.mdsal.binding.model.ietf rfc6991-ietf-inet-types - - org.opendaylight.mdsal.model - yang-ext - ${project.groupId} netconf-util diff --git a/netconf/tools/netconf-test-perf/pom.xml b/netconf/tools/netconf-test-perf/pom.xml index 9f37323bf5..2433b58db1 100644 --- a/netconf/tools/netconf-test-perf/pom.xml +++ b/netconf/tools/netconf-test-perf/pom.xml @@ -17,11 +17,15 @@ org.opendaylight.mdsal - mdsal-dom-api + mdsal-binding-api org.opendaylight.mdsal - mdsal-dom-spi + mdsal-common-api + + + org.opendaylight.mdsal + mdsal-dom-api org.opendaylight.mdsal @@ -60,7 +64,7 @@ org.opendaylight.netconf - sal-netconf-connector + netconf-topology diff --git a/netconf/tools/netconf-test-perf/src/main/java/org/opendaylight/test/endtoend/NcmountServiceImpl.java b/netconf/tools/netconf-test-perf/src/main/java/org/opendaylight/test/endtoend/NcmountServiceImpl.java index c6aa850a1b..b80d75b5cd 100644 --- a/netconf/tools/netconf-test-perf/src/main/java/org/opendaylight/test/endtoend/NcmountServiceImpl.java +++ b/netconf/tools/netconf-test-perf/src/main/java/org/opendaylight/test/endtoend/NcmountServiceImpl.java @@ -18,6 +18,7 @@ import org.opendaylight.mdsal.binding.api.MountPoint; import org.opendaylight.mdsal.binding.api.MountPointService; import org.opendaylight.mdsal.binding.api.WriteTransaction; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; +import org.opendaylight.netconf.topology.spi.NetconfNodeUtils; import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.cisco.ios.xr.ip._static.cfg.rev130722.RouterStatic; import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.cisco.ios.xr.ip._static.cfg.rev130722.address.family.AddressFamilyBuilder; import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.cisco.ios.xr.ip._static.cfg.rev130722.address.family.address.family.Vrfipv4Builder; @@ -35,7 +36,6 @@ import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.cisco.ios.xr.ip._stat import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.cisco.ios.xr.ip._static.cfg.rev130722.vrf.unicast.VrfUnicastBuilder; import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.cisco.xr.types.rev150119.CiscoIosXrString; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.network.topology.topology.topology.types.TopologyNetconf; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ncmount.rev150105.ListNodesInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ncmount.rev150105.ListNodesOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ncmount.rev150105.NcmountService; @@ -44,11 +44,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ncmount. import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ncmount.rev150105.WriteRoutesInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ncmount.rev150105.WriteRoutesOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ncmount.rev150105.WriteRoutesOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId; -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId; -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology; -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyKey; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; @@ -58,10 +54,6 @@ import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; public class NcmountServiceImpl implements NcmountService { - private static final InstanceIdentifier NETCONF_TOPO_IID = - InstanceIdentifier.create(NetworkTopology.class) - .child(Topology.class, new TopologyKey(new TopologyId(TopologyNetconf.QNAME.getLocalName()))); - private final MountPointService mountPointService; public NcmountServiceImpl(final MountPointService mountPointService) { @@ -71,7 +63,7 @@ public class NcmountServiceImpl implements NcmountService { @Override public ListenableFuture> writeRoutes(final WriteRoutesInput input) { final Optional optMountPoint = mountPointService.getMountPoint( - NETCONF_TOPO_IID.child(Node.class, new NodeKey(new NodeId(input.getMountName())))); + NetconfNodeUtils.DEFAULT_TOPOLOGY_IID.child(Node.class, new NodeKey(new NodeId(input.getMountName())))); if (optMountPoint.isEmpty()) { return RpcResultBuilder.failed() .withError(ErrorType.TRANSPORT, "Mount point not present") diff --git a/netconf/tools/netconf-testtool/pom.xml b/netconf/tools/netconf-testtool/pom.xml index 3b8f1f9748..12893ee6d2 100644 --- a/netconf/tools/netconf-testtool/pom.xml +++ b/netconf/tools/netconf-testtool/pom.xml @@ -57,6 +57,10 @@ ${project.groupId} netconf-auth + + org.opendaylight.netconf + netconf-topology + ${project.groupId} sal-netconf-connector -- 2.36.6