From 3af5cb9926238ba0fa802e0e067451a8e19f1c6a Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Tue, 17 May 2016 08:41:24 +0200 Subject: 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 Signed-off-by: Maros Marsalek --- .../v3po/translate/v3po/interfaces/VhostUserCustomizer.java | 5 ----- .../v3po/translate/v3po/interfaces/VlanTagRewriteCustomizer.java | 4 ---- .../v3po/translate/v3po/interfaces/VxlanCustomizer.java | 4 ---- .../v3po/translate/v3po/vpp/BridgeDomainCustomizer.java | 7 ------- .../v3po/translate/v3po/interfaces/VhostUserCustomizerTest.java | 9 --------- .../translate/v3po/interfaces/VlanTagRewriteCustomizerTest.java | 9 --------- .../v3po/translate/v3po/interfaces/VxlanCustomizerTest.java | 7 ------- 7 files changed, 45 deletions(-) (limited to 'v3po/v3po2vpp') diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/VhostUserCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/VhostUserCustomizer.java index 5f7d626e8..aef45c821 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/VhostUserCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/VhostUserCustomizer.java @@ -112,11 +112,6 @@ public class VhostUserCustomizer extends AbstractInterfaceTypeCustomizer { public void updateCurrentAttributes(@Nonnull final InstanceIdentifier id, @Nonnull final Vxlan dataBefore, @Nonnull final Vxlan dataAfter, @Nonnull final WriteContext writeContext) throws WriteFailedException.UpdateFailedException { - if (dataBefore.equals(dataAfter)) { - LOG.debug("dataBefore equals dataAfter, update will not be performed"); - return; - } throw new WriteFailedException.UpdateFailedException(id, dataBefore, dataAfter, new UnsupportedOperationException("Vxlan tunnel update is not supported")); } diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/vpp/BridgeDomainCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/vpp/BridgeDomainCustomizer.java index 6e94461a6..db1e61578 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/vpp/BridgeDomainCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/vpp/BridgeDomainCustomizer.java @@ -142,13 +142,6 @@ public class BridgeDomainCustomizer LOG.debug("updateCurrentAttributes: id={}, dataBefore={}, dataAfter={}, ctx={}", id, dataBefore, dataAfter, ctx); - // FIXME can be removed after updating mdsal-binding-dom-codec to 0.8.2-Beryllium-SR2 - // and restoring equality check in AbstractCompositeWriter - if (dataBefore.equals(dataAfter)) { - LOG.debug("dataBefore equals dataAfter, update will not be performed"); - return; - } - final String bdName = checkNotNull(dataAfter.getName()); checkArgument(bdName.equals(dataBefore.getName()), "BridgeDomain name changed. It should be deleted and then created."); 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; @@ -229,14 +228,6 @@ public class VhostUserCustomizerTest { verifyModifyVhostUserIfWasInvoked(vhostUserAfter, IFACE_ID); } - @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"); 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; @@ -173,14 +172,6 @@ public class VlanTagRewriteCustomizerTest { fail("WriteFailedException.CreateFailedException was expected"); } - @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; 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; @@ -186,12 +185,6 @@ public class VxlanCustomizerTest { fail("WriteFailedException.UpdateFailedException was expected"); } - @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(); -- cgit 1.2.3-korg