1 files changed, 21 insertions, 39 deletions

diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ProxyArpCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ProxyArpCustomizerTest.java
index f1451fd9d..2e6d17b90 100644
--- a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ProxyArpCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/ProxyArpCustomizerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Copyright (c) 2017 Cisco and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,25 +17,23 @@
 package io.fd.hc2vpp.v3po.interfaces;
 
 import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import io.fd.hc2vpp.common.test.write.WriterCustomizerTest;
 import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
 import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.v3po.interfaces.ip.v4.ProxyArpCustomizer;
 import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.vpp.jvpp.core.dto.ProxyArpAddDel;
-import io.fd.vpp.jvpp.core.dto.ProxyArpAddDelReply;
 import io.fd.vpp.jvpp.core.dto.ProxyArpIntfcEnableDisable;
 import io.fd.vpp.jvpp.core.dto.ProxyArpIntfcEnableDisableReply;
 import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.VppInterfaceAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.interfaces._interface.ProxyArp;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.interfaces._interface.ProxyArpBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.proxy.arp.rev170315.ProxyArpInterfaceAugmentation;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.proxy.arp.rev170315.interfaces._interface.ProxyArp;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 public class ProxyArpCustomizerTest extends WriterCustomizerTest implements ByteDataTranslator {
@@ -43,60 +41,49 @@ public class ProxyArpCustomizerTest extends WriterCustomizerTest implements Byte
     private static final int IF_INDEX = 42;
     private static final String IFACE_CTX_NAME = "ifc-test-instance";
 
+    private static final InstanceIdentifier<ProxyArp>
+        IID = InstanceIdentifier.create(Interfaces.class).child(Interface.class, new InterfaceKey(IF_NAME))
+        .augmentation(ProxyArpInterfaceAugmentation.class).child(ProxyArp.class);
+
     private ProxyArpCustomizer customizer;
+    private ProxyArp data;
 
     @Override
     public void setUpTest() throws Exception {
+        data = mock(ProxyArp.class);
         customizer = new ProxyArpCustomizer(api, new NamingContext("ifacePrefix", IFACE_CTX_NAME));
         defineMapping(mappingContext, IF_NAME, IF_INDEX, IFACE_CTX_NAME);
-        when(api.proxyArpIntfcEnableDisable(any())).thenReturn(future(new ProxyArpIntfcEnableDisableReply()));
     }
 
     @Test
     public void testWrite() throws WriteFailedException {
-        when(api.proxyArpAddDel(any())).thenReturn(future(new ProxyArpAddDelReply()));
-        customizer.writeCurrentAttributes(getProxyArpId(IF_NAME), proxyArp(), writeContext);
-        verify(api).proxyArpAddDel(expectedAddDelRequest(true));
+        when(api.proxyArpIntfcEnableDisable(any())).thenReturn(future(new ProxyArpIntfcEnableDisableReply()));
+        customizer.writeCurrentAttributes(IID, data, writeContext);
         verify(api).proxyArpIntfcEnableDisable(expectedEnableRequest(true));
     }
 
     @Test(expected = WriteFailedException.class)
     public void testWriteFailed() throws WriteFailedException {
-        when(api.proxyArpAddDel(any())).thenReturn(failedFuture());
-        customizer.writeCurrentAttributes(getProxyArpId(IF_NAME), proxyArp(), writeContext);
+        when(api.proxyArpIntfcEnableDisable(any())).thenReturn(failedFuture());
+        customizer.writeCurrentAttributes(IID, data, writeContext);
     }
 
     @Test(expected = WriteFailedException.UpdateFailedException.class)
-    public void testUpdate() throws WriteFailedException.UpdateFailedException {
-        customizer.updateCurrentAttributes(getProxyArpId(IF_NAME), proxyArp(), proxyArp(), writeContext);
+    public void testUpdate() throws WriteFailedException {
+        customizer.updateCurrentAttributes(IID, data, data, writeContext);
     }
 
     @Test
     public void testDelete() throws WriteFailedException {
-        when(api.proxyArpAddDel(any())).thenReturn(future(new ProxyArpAddDelReply()));
-        customizer.deleteCurrentAttributes(getProxyArpId(IF_NAME), proxyArp(), writeContext);
-        verify(api).proxyArpAddDel(expectedAddDelRequest(false));
+        when(api.proxyArpIntfcEnableDisable(any())).thenReturn(future(new ProxyArpIntfcEnableDisableReply()));
+        customizer.deleteCurrentAttributes(IID, data, writeContext);
         verify(api).proxyArpIntfcEnableDisable(expectedEnableRequest(false));
     }
 
     @Test(expected = WriteFailedException.DeleteFailedException.class)
     public void testDeleteFailed() throws WriteFailedException {
-        when(api.proxyArpAddDel(any())).thenReturn(failedFuture());
-        customizer.deleteCurrentAttributes(getProxyArpId(IF_NAME), proxyArp(), writeContext);
-    }
-
-    private ProxyArp proxyArp() {
-        return new ProxyArpBuilder().setVrfId(123L).setHighAddr(new Ipv4AddressNoZone("10.1.1.2"))
-            .setLowAddr(new Ipv4AddressNoZone("10.1.1.1")).build();
-    }
-
-    private ProxyArpAddDel expectedAddDelRequest(final boolean isAdd) {
-        final ProxyArpAddDel request = new ProxyArpAddDel();
-        request.isAdd = booleanToByte(isAdd);
-        request.vrfId = 123;
-        request.lowAddress = new byte[]{10,1,1,1};
-        request.hiAddress = new byte[]{10,1,1,2};
-        return request;
+        when(api.proxyArpIntfcEnableDisable(any())).thenReturn(failedFuture());
+        customizer.deleteCurrentAttributes(IID, data, writeContext);
     }
 
     private ProxyArpIntfcEnableDisable expectedEnableRequest(final boolean enable) {
@@ -105,9 +92,4 @@ public class ProxyArpCustomizerTest extends WriterCustomizerTest implements Byte
         request.enableDisable = booleanToByte(enable);
         return request;
     }
-
-    private InstanceIdentifier<ProxyArp> getProxyArpId(final String eth0) {
-        return InstanceIdentifier.create(Interfaces.class).child(Interface.class, new InterfaceKey(eth0)).augmentation(
-            VppInterfaceAugmentation.class).child(ProxyArp.class);
-    }
 }