Bump upstreams to SNAPSHOTs

[netconf.git] / netconf / sal-netconf-connector / src / test / java / org / opendaylight / netconf / sal / connect / netconf / listener / NetconfDeviceCommunicatorTest.java

diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicatorTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicatorTest.java
index cd3dae30af1c73e93c33ab03595bb9689f74ac7f..bc71edb422b38a1123918f164215976f343959db 100644 (file)
--- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicatorTest.java
+++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/listener/NetconfDeviceCommunicatorTest.java
@@ -66,6 +66,9 @@ import org.opendaylight.netconf.sal.connect.api.RemoteDevice;
 import org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil;
 import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId;
 import org.opendaylight.yangtools.util.xml.UntrustedXML;
+import org.opendaylight.yangtools.yang.common.ErrorSeverity;
+import org.opendaylight.yangtools.yang.common.ErrorTag;
+import org.opendaylight.yangtools.yang.common.ErrorType;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.common.RpcResult;
@@ -167,8 +170,8 @@ public class NetconfDeviceCommunicatorTest {
 
         communicator.onSessionDown(mockSession, new Exception("mock ex"));
 
-        verifyErrorRpcResult(resultFuture1.get(), RpcError.ErrorType.TRANSPORT, "operation-failed");
-        verifyErrorRpcResult(resultFuture2.get(), RpcError.ErrorType.TRANSPORT, "operation-failed");
+        verifyErrorRpcResult(resultFuture1.get(), ErrorType.TRANSPORT, ErrorTag.OPERATION_FAILED);
+        verifyErrorRpcResult(resultFuture2.get(), ErrorType.TRANSPORT, ErrorTag.OPERATION_FAILED);
 
         verify(mockDevice).onRemoteSessionDown();
 
@@ -191,8 +194,7 @@ public class NetconfDeviceCommunicatorTest {
         NetconfTerminationReason reason = new NetconfTerminationReason(reasonText);
         communicator.onSessionTerminated(mockSession, reason);
 
-        RpcError rpcError = verifyErrorRpcResult(resultFuture.get(), RpcError.ErrorType.TRANSPORT,
-                "operation-failed");
+        RpcError rpcError = verifyErrorRpcResult(resultFuture.get(), ErrorType.TRANSPORT, ErrorTag.OPERATION_FAILED);
         assertEquals("RpcError message", reasonText, rpcError.getMessage());
 
         verify(mockDevice).onRemoteSessionDown();
@@ -249,7 +251,7 @@ public class NetconfDeviceCommunicatorTest {
         // Should have an immediate result
         RpcResult<NetconfMessage> rpcResult = resultFuture.get(3, TimeUnit.MILLISECONDS);
 
-        verifyErrorRpcResult(rpcResult, RpcError.ErrorType.TRANSPORT, "operation-failed");
+        verifyErrorRpcResult(rpcResult, ErrorType.TRANSPORT, ErrorTag.OPERATION_FAILED);
     }
 
     private static NetconfMessage createSuccessResponseMessage(final String messageID)
@@ -295,7 +297,7 @@ public class NetconfDeviceCommunicatorTest {
         // Should have an immediate result
         RpcResult<NetconfMessage> rpcResult = resultFuture.get(3, TimeUnit.MILLISECONDS);
 
-        RpcError rpcError = verifyErrorRpcResult(rpcResult, RpcError.ErrorType.TRANSPORT, "operation-failed");
+        RpcError rpcError = verifyErrorRpcResult(rpcResult, ErrorType.TRANSPORT, ErrorTag.OPERATION_FAILED);
         assertEquals("RpcError message contains \"mock error\"", true,
                 rpcError.getMessage().contains("mock error"));
     }
@@ -347,8 +349,7 @@ public class NetconfDeviceCommunicatorTest {
 
         communicator.onMessage(mockSession, createErrorResponseMessage(messageID));
 
-        RpcError rpcError = verifyErrorRpcResult(resultFuture.get(), RpcError.ErrorType.RPC,
-                "missing-attribute");
+        RpcError rpcError = verifyErrorRpcResult(resultFuture.get(), ErrorType.RPC, ErrorTag.MISSING_ATTRIBUTE);
         assertEquals("RpcError message", "Missing attribute", rpcError.getMessage());
 
         String errorInfo = rpcError.getInfo();
@@ -366,8 +367,7 @@ public class NetconfDeviceCommunicatorTest {
 
         communicator.onMessage(mockSession, createMultiErrorResponseMessage(messageID));
 
-        RpcError rpcError = verifyErrorRpcResult(resultFuture.get(), RpcError.ErrorType.PROTOCOL,
-                "operation-failed");
+        RpcError rpcError = verifyErrorRpcResult(resultFuture.get(), ErrorType.PROTOCOL, ErrorTag.OPERATION_FAILED);
 
         String errorInfo = rpcError.getInfo();
         assertNotNull("RpcError info is null", errorInfo);
@@ -444,8 +444,7 @@ public class NetconfDeviceCommunicatorTest {
 
         communicator.onMessage(mockSession, createSuccessResponseMessage(UUID.randomUUID().toString()));
 
-        RpcError rpcError = verifyErrorRpcResult(resultFuture.get(), RpcError.ErrorType.PROTOCOL,
-                "bad-attribute");
+        RpcError rpcError = verifyErrorRpcResult(resultFuture.get(), ErrorType.PROTOCOL, ErrorTag.BAD_ATTRIBUTE);
         assertFalse("RpcError message non-empty", Strings.isNullOrEmpty(rpcError.getMessage()));
 
         String errorInfo = rpcError.getInfo();
@@ -539,13 +538,13 @@ public class NetconfDeviceCommunicatorTest {
     }
 
     private static RpcError verifyErrorRpcResult(final RpcResult<NetconfMessage> rpcResult,
-                                                 final RpcError.ErrorType expErrorType, final String expErrorTag) {
+                                                 final ErrorType expErrorType, final ErrorTag expErrorTag) {
         assertNotNull("RpcResult is null", rpcResult);
         assertFalse("isSuccessful", rpcResult.isSuccessful());
         assertNotNull("RpcResult errors is null", rpcResult.getErrors());
         assertEquals("Errors size", 1, rpcResult.getErrors().size());
         RpcError rpcError = rpcResult.getErrors().iterator().next();
-        assertEquals("getErrorSeverity", RpcError.ErrorSeverity.ERROR, rpcError.getSeverity());
+        assertEquals("getErrorSeverity", ErrorSeverity.ERROR, rpcError.getSeverity());
         assertEquals("getErrorType", expErrorType, rpcError.getErrorType());
         assertEquals("getErrorTag", expErrorTag, rpcError.getTag());