HONEYCOMB-63: bump ODL dependencies to BE-SR2

+ Remove dedicated reads to netconf-state in operational
datatree. Use regular reader from now on

Change-Id: I3d7245cd6cb5d9cf057aea600fddceb49cf18039
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>

3 files changed, 0 insertions, 25 deletions

diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/VhostUserCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/VhostUserCustomizerTest.java
index 1015f24c0..a14718124 100644
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/VhostUserCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/VhostUserCustomizerTest.java
@@ -26,7 +26,6 @@ import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;
@@ -230,14 +229,6 @@ public class VhostUserCustomizerTest {
     }
 
     @Test
-    public void testUpdateCurrentAttributesNoUpdate() throws Exception {
-        final VhostUser vhostUserBefore = generateVhostUser(VhostUserRole.Server, "socketName");
-        final VhostUser vhostUserAfter = generateVhostUser(VhostUserRole.Server, "socketName");
-        customizer.updateCurrentAttributes(ID, vhostUserBefore, vhostUserAfter, writeContext);
-        verify(api, never()).modifyVhostUserIf(any(ModifyVhostUserIf.class));
-    }
-
-    @Test
     public void testUpdateCurrentAttributesFailed() throws Exception {
         final VhostUser vhostUserBefore = generateVhostUser(VhostUserRole.Client, "socketName0");
         final VhostUser vhostUserAfter = generateVhostUser(VhostUserRole.Server, "socketName1");
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/VlanTagRewriteCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/VlanTagRewriteCustomizerTest.java
index 639257914..6b9f52cc9 100644
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/VlanTagRewriteCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/VlanTagRewriteCustomizerTest.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.MockitoAnnotations.initMocks;
 
@@ -174,14 +173,6 @@ public class VlanTagRewriteCustomizerTest {
     }
 
     @Test
-    public void testUpdateNoChange() throws Exception {
-        final VlanTagRewrite before = generateVlanTagRewrite(6);
-        final VlanTagRewrite after = generateVlanTagRewrite(6);
-        customizer.updateCurrentAttributes(null, before, after, writeContext);
-        verify(api, never()).l2InterfaceVlanTagRewrite(any());
-    }
-
-    @Test
     public void testUpdate() throws Exception {
         final int vtrOpAfter = 5;
         final VlanTagRewrite before = generateVlanTagRewrite(6);
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/VxlanCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/VxlanCustomizerTest.java
index a5103b178..1ddb48089 100644
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/VxlanCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/VxlanCustomizerTest.java
@@ -25,7 +25,6 @@ import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -187,12 +186,6 @@ public class VxlanCustomizerTest {
     }
 
     @Test
-    public void testUpdateCurrentAttributesNoUpdate() throws Exception {
-        customizer.updateCurrentAttributes(id, generateVxlan(), generateVxlan(), writeContext);
-        verify(api, never()).vxlanAddDelTunnel(any(VxlanAddDelTunnel.class));
-    }
-
-    @Test
     public void testDeleteCurrentAttributes() throws Exception {
         final Vxlan vxlan = generateVxlan();