From: Robert Varga Date: Sun, 17 Jul 2022 22:26:43 +0000 (+0200) Subject: Clean up ietf-netconf-monitoring-extension X-Git-Tag: v4.0.0~13 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=netconf.git;a=commitdiff_plain;h=798a05a2d099fd66040bf3b10635afaec9b3b7d4 Clean up ietf-netconf-monitoring-extension Use a proper OpenDaylight namespace in both module name and namespace. JIRA: NETCONF-891 Change-Id: I5853e33134fc6c0dcea3b4635d36f7c85c9de35e Signed-off-by: Robert Varga --- diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSession.java b/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSession.java index a9cb3eb4f7..dd2961193d 100644 --- a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSession.java +++ b/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSession.java @@ -33,8 +33,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types. import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.extension.rev131210.NetconfTcp; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.extension.rev131210.Session1Builder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.NetconfSsh; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.Transport; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.sessions.Session; @@ -42,6 +40,8 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.mon import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.sessions.SessionKey; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.ZeroBasedCounter32; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconf.monitoring.rev220718.NetconfTcp; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconf.monitoring.rev220718.Session1Builder; import org.opendaylight.yangtools.yang.common.Uint32; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/netconf/netconf-impl/src/main/yang/ietf-netconf-monitoring-extension.yang b/netconf/netconf-impl/src/main/yang/ietf-netconf-monitoring-extension.yang deleted file mode 100644 index e8f2ec324b..0000000000 --- a/netconf/netconf-impl/src/main/yang/ietf-netconf-monitoring-extension.yang +++ /dev/null @@ -1,31 +0,0 @@ -module ietf-netconf-monitoring-extension { - - yang-version 1; - - namespace - "urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring-extension"; - - prefix ncme; - - import ietf-netconf-monitoring { - prefix ncm; - } - - revision "2013-12-10" { - description "Initial revision."; - - } - - identity netconf-tcp { - base ncm:transport; - description - "NETCONF over TCP."; - } - - augment "/ncm:netconf-state/ncm:sessions/ncm:session" { - leaf session-identifier { - type string; - } - } - -} \ No newline at end of file diff --git a/netconf/netconf-impl/src/main/yang/odl-netconf-monitoring.yang b/netconf/netconf-impl/src/main/yang/odl-netconf-monitoring.yang new file mode 100644 index 0000000000..b4205a3d6b --- /dev/null +++ b/netconf/netconf-impl/src/main/yang/odl-netconf-monitoring.yang @@ -0,0 +1,23 @@ +module odl-netconf-monitoring { + namespace "urn:opendaylight:params:xml:ns:yang:netconf:monitoring"; + prefix "odlncm"; + + import ietf-netconf-monitoring { + prefix ncm; + } + + revision "2022-07-18" { + description "Initial revision."; + } + + identity netconf-tcp { + base ncm:transport; + description "NETCONF over plain TCP/IP."; + } + + augment "/ncm:netconf-state/ncm:sessions/ncm:session" { + leaf session-identifier { + type string; + } + } +} diff --git a/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionTest.java b/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionTest.java index 9609dde637..8b48cb2dc6 100644 --- a/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionTest.java +++ b/netconf/netconf-impl/src/test/java/org/opendaylight/netconf/impl/NetconfServerSessionTest.java @@ -34,9 +34,9 @@ import org.opendaylight.netconf.nettyutil.handler.NetconfMessageToXMLEncoder; import org.opendaylight.netconf.nettyutil.handler.NetconfXMLToMessageDecoder; import org.opendaylight.netconf.nettyutil.handler.exi.EXIParameters; import org.opendaylight.netconf.notifications.NetconfNotification; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.extension.rev131210.NetconfTcp; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.NetconfSsh; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.sessions.Session; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconf.monitoring.rev220718.NetconfTcp; import org.w3c.dom.Document; @RunWith(MockitoJUnitRunner.StrictStubs.class) diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceDataBrokerTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceDataBrokerTest.java index 11725a7454..c7ebc5f53b 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceDataBrokerTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceDataBrokerTest.java @@ -46,7 +46,7 @@ import org.opendaylight.netconf.sal.connect.netconf.sal.tx.WriteRunningTx; import org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil; import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.IetfNetconfService; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.extension.rev131210.NetconfTcp; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconf.monitoring.rev220718.NetconfTcp; import org.opendaylight.yangtools.rfc8528.data.util.EmptyMountPointContext; import org.opendaylight.yangtools.util.concurrent.FluentFutures; import org.opendaylight.yangtools.yang.common.QName; diff --git a/netconf/tools/netconf-testtool/README.adoc b/netconf/tools/netconf-testtool/README.adoc index 8072acb209..932eaae0f9 100644 --- a/netconf/tools/netconf-testtool/README.adoc +++ b/netconf/tools/netconf-testtool/README.adoc @@ -26,11 +26,11 @@ Set models = ImmutableSet.of( "models/ietf-inet-types@2013-07-15.yang", "models/ietf-netconf@2011-06-01.yang", "models/ietf-netconf-monitoring@2010-10-04.yang", - "models/ietf-netconf-monitoring-extension@2013-12-10.yang", "models/ietf-yang-library@2016-06-21.yang", "models/ietf-yang-types@2013-07-15.yang", "models/nc-notifications@2008-07-14.yang", "models/notifications@2008-07-14.yang", + "models/odl-netconf-monitoring@2022-07-18.yang", ... ); ---- diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/config/Configuration.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/config/Configuration.java index a26a8b5897..4d9c40e702 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/config/Configuration.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/config/Configuration.java @@ -39,8 +39,8 @@ public class Configuration { public static final Set DEFAULT_YANG_RESOURCES = ImmutableSet.of( new YangResource("ietf-netconf-monitoring", "2010-10-04", "/META-INF/yang/ietf-netconf-monitoring@2010-10-04.yang"), - new YangResource("ietf-netconf-monitoring-extension", "2013-12-10", - "/META-INF/yang/ietf-netconf-monitoring-extension@2013-12-10.yang"), + new YangResource("odl-netconf-monitoring", "2022-07-18", + "/META-INF/yang/odl-netconf-monitoring@2022-07-18.yang"), new YangResource("ietf-yang-types", "2013-07-15", "/META-INF/yang/ietf-yang-types@2013-07-15.yang"), new YangResource("ietf-inet-types", "2013-07-15", diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/monitoring/MonitoringSession.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/monitoring/MonitoringSession.java index 30c1efbc1e..65bb85bc8e 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/monitoring/MonitoringSession.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/monitoring/MonitoringSession.java @@ -12,8 +12,8 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlTransient; import org.opendaylight.mdsal.binding.spec.naming.BindingMapping; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.extension.rev131210.Session1; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.sessions.Session; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconf.monitoring.rev220718.Session1; import org.opendaylight.yangtools.yang.common.QName; final class MonitoringSession { @@ -98,4 +98,4 @@ final class MonitoringSession { public String getUsername() { return managementSession.getUsername(); } -} \ No newline at end of file +}