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 <robert.varga@pantheon.tech>

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 a9cb3eb4f773321d2180581ae2ceeb1280b7fab1..dd2961193d88b3c81c341f151e5a2ef01966dfbe 100644 (file)
--- 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 (file)
index e8f2ec3..0000000
--- 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 (file)
index 0000000..b4205a3
--- /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 9609dde637035e50bac99e12767bcffaaf4ee4dd..8b48cb2dc6ea574c8d6d1065310ebe4a2f346e31 100644 (file)
--- 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 11725a7454345e004751fbc75a5efbc1bd503c1f..c7ebc5f53b0b8cae849d0ff2a04a8da2cfca9201 100644 (file)
--- 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 8072acb2091f5deb060928cabded482718a91753..932eaae0f965ea0e41d9ace5288da5ad79fded70 100644 (file)
--- a/netconf/tools/netconf-testtool/README.adoc
+++ b/netconf/tools/netconf-testtool/README.adoc
@@ -26,11 +26,11 @@ Set<String> 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 a26a8b589790b37eeea01f7578316bb3773c9a34..4d9c40e70298d7a35b4dc7ba9c4ccdeac53760da 100644 (file)
--- 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<YangResource> 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 30c1efbc1e0c1d1a5e2ca84c773673dcefa6f48d..65bb85bc8e06359d6089c5847560213ec57fffcd 100644 (file)
--- 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
+}