Migrate more capabilities to XmlNetconfConstants

We have multiple constants still lurking in NetconfMessageTransformUtil, migrate them to XmlNetconfConstants so they are widely available. JIRA: NETCONF-1006 Change-Id: Ic6c5f8d161e7533e2f9537901cc841615b7aaabd Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
opendaylight · May 3, 2023 · 44e2ed5 · 44e2ed5
1 parent 31a1462
commit 44e2ed5
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 17 deletions.
diff --git a/...java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfSessionPreferences.java b/...java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfSessionPreferences.java
@@ -151,15 +151,16 @@ public String toString() {
     }
 
     public boolean isRollbackSupported() {
-        return containsNonModuleCapability(NetconfMessageTransformUtil.NETCONF_ROLLBACK_ON_ERROR_URI.toString());
+        return containsNonModuleCapability(
+            XmlNetconfConstants.URN_IETF_PARAMS_NETCONF_CAPABILITY_ROLLBACK_ON_ERROR_1_0);
     }
 
     public boolean isCandidateSupported() {
         return containsNonModuleCapability(XmlNetconfConstants.URN_IETF_PARAMS_NETCONF_CAPABILITY_CANDIDATE_1_0);
     }
 
     public boolean isRunningWritable() {
-        return containsNonModuleCapability(NetconfMessageTransformUtil.NETCONF_RUNNING_WRITABLE_URI.toString());
+        return containsNonModuleCapability(XmlNetconfConstants.URN_IETF_PARAMS_NETCONF_CAPABILITY_WRITABLE_RUNNING_1_0);
     }
 
     public boolean isNotificationsSupported() {
@@ -170,8 +171,8 @@ public boolean isNotificationsSupported() {
 
     public boolean isMonitoringSupported() {
         return containsModuleCapability(NetconfMessageTransformUtil.IETF_NETCONF_MONITORING)
-                || containsPartialNonModuleCapability(
-                        NetconfMessageTransformUtil.IETF_NETCONF_MONITORING.getNamespace().toString());
+            || containsPartialNonModuleCapability(
+                NetconfMessageTransformUtil.IETF_NETCONF_MONITORING.getNamespace().toString());
     }
 
     /**

diff --git a/...mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOps.java b/...mdsal/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOps.java
@@ -35,7 +35,6 @@
 import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.NETCONF_UNLOCK_QNAME;
 import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.NETCONF_VALIDATE_NODEID;
 import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.NETCONF_VALIDATE_QNAME;
-import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.ROLLBACK_ON_ERROR_OPTION;
 import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.toFilterStructure;
 
 import com.google.common.collect.Iterables;
@@ -77,7 +76,7 @@ public final class NetconfBaseOps {
     private static final NodeIdentifier CONFIG_SOURCE_NODEID = NodeIdentifier.create(ConfigSource.QNAME);
     private static final NodeIdentifier CONFIG_TARGET_NODEID = NodeIdentifier.create(ConfigTarget.QNAME);
     private static final LeafNode<String> NETCONF_ERROR_OPTION_ROLLBACK =
-        ImmutableNodes.leafNode(NETCONF_ERROR_OPTION_NODEID, ROLLBACK_ON_ERROR_OPTION);
+        ImmutableNodes.leafNode(NETCONF_ERROR_OPTION_NODEID, "rollback-on-error");
 
     private final NetconfRpcService rpc;
     private final MountPointContext mountContext;

diff --git a/...n/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java b/...n/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java
@@ -185,12 +185,6 @@ private NetconfMessageTransformUtil() {
     public static final URI NETCONF_ACTION_NAMESPACE = URI.create("urn:ietf:params:xml:ns:yang:1");
     public static final String NETCONF_ACTION = "action";
 
-    public static final URI NETCONF_ROLLBACK_ON_ERROR_URI = URI
-            .create("urn:ietf:params:netconf:capability:rollback-on-error:1.0");
-    public static final String ROLLBACK_ON_ERROR_OPTION = "rollback-on-error";
-
-    public static final URI NETCONF_RUNNING_WRITABLE_URI = URI
-            .create("urn:ietf:params:netconf:capability:writable-running:1.0");
 
     public static final @NonNull QName NETCONF_LOCK_QNAME = QName.create(NETCONF_QNAME, "lock").intern();
     public static final @NonNull NodeIdentifier NETCONF_LOCK_NODEID = NodeIdentifier.create(NETCONF_LOCK_QNAME);

diff --git a/.../org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicatorTest.java b/.../org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicatorTest.java
@@ -142,7 +142,7 @@ private ListenableFuture<RpcResult<NetconfMessage>> sendRequest(final String mes
     public void testOnSessionUp() {
         final var testCapability = "urn:opendaylight:params:xml:ns:test?module=test-module&revision=2014-06-02";
         final var serverCapabilities = Set.of(
-            NetconfMessageTransformUtil.NETCONF_ROLLBACK_ON_ERROR_URI.toString(),
+            XmlNetconfConstants.URN_IETF_PARAMS_NETCONF_CAPABILITY_ROLLBACK_ON_ERROR_1_0,
             NetconfMessageTransformUtil.IETF_NETCONF_MONITORING.getNamespace().toString(),
             testCapability);
         doReturn(serverCapabilities).when(spySession).getServerCapabilities();
@@ -157,7 +157,7 @@ public void testOnSessionUp() {
 
         NetconfSessionPreferences actualCapabilites = netconfSessionPreferences.getValue();
         assertTrue(actualCapabilites.containsNonModuleCapability(
-                NetconfMessageTransformUtil.NETCONF_ROLLBACK_ON_ERROR_URI.toString()));
+                "urn:ietf:params:netconf:capability:rollback-on-error:1.0"));
         assertFalse(actualCapabilites.containsNonModuleCapability(testCapability));
         assertEquals(Set.of(QName.create("urn:opendaylight:params:xml:ns:test", "2014-06-02", "test-module")),
                 actualCapabilites.moduleBasedCaps().keySet());

diff --git a/...st/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceDataBrokerTest.java b/...st/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceDataBrokerTest.java
@@ -43,7 +43,6 @@
 import org.opendaylight.netconf.sal.connect.netconf.sal.tx.WriteCandidateRunningTx;
 import org.opendaylight.netconf.sal.connect.netconf.sal.tx.WriteCandidateTx;
 import org.opendaylight.netconf.sal.connect.netconf.sal.tx.WriteRunningTx;
-import org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.IetfNetconfService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconf.monitoring.rev220718.NetconfTcp;
 import org.opendaylight.yangtools.rfc8528.data.util.EmptyMountPointContext;
@@ -91,7 +90,7 @@ public void testNewReadWriteTransaction() {
     @Test
     public void testWritableRunningCandidateWriteTransaction() {
         testWriteTransaction(WriteCandidateRunningTx.class,
-            NetconfMessageTransformUtil.NETCONF_RUNNING_WRITABLE_URI.toString(),
+            XmlNetconfConstants.URN_IETF_PARAMS_NETCONF_CAPABILITY_WRITABLE_RUNNING_1_0,
             XmlNetconfConstants.URN_IETF_PARAMS_NETCONF_CAPABILITY_CANDIDATE_1_0);
     }
 
@@ -103,7 +102,8 @@ public void testCandidateWriteTransaction() {
 
     @Test
     public void testRunningWriteTransaction() {
-        testWriteTransaction(WriteRunningTx.class, NetconfMessageTransformUtil.NETCONF_RUNNING_WRITABLE_URI.toString());
+        testWriteTransaction(WriteRunningTx.class,
+            XmlNetconfConstants.URN_IETF_PARAMS_NETCONF_CAPABILITY_WRITABLE_RUNNING_1_0);
     }
 
     @Test

diff --git a/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/XmlNetconfConstants.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/xml/XmlNetconfConstants.java
@@ -40,6 +40,10 @@ private XmlNetconfConstants() {
     public static final String URN_IETF_PARAMS_XML_NS_NETCONF_EXI_1_0 = "urn:ietf:params:xml:ns:netconf:exi:1.0";
     public static final String URN_IETF_PARAMS_NETCONF_CAPABILITY_NOTIFICATION_1_0 =
             "urn:ietf:params:netconf:capability:notification:1.0";
+    public static final String URN_IETF_PARAMS_NETCONF_CAPABILITY_ROLLBACK_ON_ERROR_1_0 =
+            "urn:ietf:params:netconf:capability:rollback-on-error:1.0";
+    public static final String URN_IETF_PARAMS_NETCONF_CAPABILITY_WRITABLE_RUNNING_1_0 =
+            "urn:ietf:params:netconf:capability:writable-running:1.0";
 
     public static final String URN_IETF_PARAMS_NETCONF_CAPABILITY_EXI_1_0 =
             "urn:ietf:params:netconf:capability:exi:1.0";