HONEYCOMB-104: add Ipv4 support to sub-interfaces

* updates vpp-vlan.yang with Ipv4 and Ipv6 support
  based on ietf-ip rev. 2014-06-16
* adds Ipv4 support for sub-interfaces

Ipv6 support for interfaces and sub-interfaces will
be addded in the future (HONEYCOMB-102)

Change-Id: I0bf10fe3ff1c543685f651d8b6fb06bbeee3db92
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>

2 files changed, 5 insertions, 5 deletions

diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/ip/AddressCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/ip/Ipv4AddressCustomizerTest.java
index 3ad12e01c..cea7a2a23 100644
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/ip/AddressCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfaces/ip/Ipv4AddressCustomizerTest.java
@@ -61,7 +61,7 @@ import org.openvpp.jvpp.dto.SwInterfaceAddDelAddress;
 import org.openvpp.jvpp.dto.SwInterfaceAddDelAddressReply;
 import org.openvpp.jvpp.future.FutureJVpp;
 
-public class AddressCustomizerTest {
+public class Ipv4AddressCustomizerTest {
 
     private static final String IFC_CTX_NAME = "ifc-test-instance";
     private static final String IFACE_NAME = "eth0";
@@ -75,7 +75,7 @@ public class AddressCustomizerTest {
     private FutureJVpp api;
 
     private NamingContext interfaceContext;
-    private AddressCustomizer customizer;
+    private Ipv4AddressCustomizer customizer;
 
     @Before
     public void setUp() throws Exception {
@@ -83,7 +83,7 @@ public class AddressCustomizerTest {
         doReturn(mappingContext).when(writeContext).getMappingContext();
         interfaceContext = new NamingContext("generatedlIfaceName", IFC_CTX_NAME);
 
-        customizer = new AddressCustomizer(api, interfaceContext);
+        customizer = new Ipv4AddressCustomizer(api, interfaceContext);
     }
 
     private static InstanceIdentifier<Address> getAddressId(final String ifaceName) {
diff --git a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/ip/Ipv4AddressCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/ip/Ipv4AddressCustomizerTest.java
index 584464645..be67771de 100644
--- a/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/ip/Ipv4AddressCustomizerTest.java
+++ b/v3po/v3po2vpp/src/test/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/ip/Ipv4AddressCustomizerTest.java
@@ -126,7 +126,7 @@ public class Ipv4AddressCustomizerTest extends ListReaderCustomizerTest<Address,
         IpAddressDetailsReplyDump reply = new IpAddressDetailsReplyDump();
         reply.ipAddressDetails = ImmutableList.of(detail1, detail2, detail3);
 
-        cache.put(Ipv4AddressCustomizer.class.getName() + IFACE_NAME, reply);
+        cache.put(Ipv4ReadUtils.CACHE_KEY + IFACE_NAME, reply);
         when(ctx.getModificationCache()).thenReturn(cache);
 
         final AddressBuilder builder = new AddressBuilder();
@@ -231,7 +231,7 @@ public class Ipv4AddressCustomizerTest extends ListReaderCustomizerTest<Address,
         IpAddressDetailsReplyDump reply = new IpAddressDetailsReplyDump();
         reply.ipAddressDetails = ImmutableList.of(detail1, detail2, detail3);
 
-        cache.put(Ipv4AddressCustomizer.class.getName() + IFACE_NAME, reply);
+        cache.put(Ipv4ReadUtils.CACHE_KEY + IFACE_NAME, reply);
         when(ctx.getModificationCache()).thenReturn(cache);
 
         final InstanceIdentifier<Address> id = getId("192.168.2.1", IFACE_NAME);