HONEYCOMB-432: adapt hc2vpp to ODL Oxygen SR1 bump

Requires https://gerrit.fd.io/r/#/c/12239/

Change-Id: Ideb4c0503b31b33aefa35a7840ee0d73d2912509
Signed-off-by: Marek Gradzki <[email protected]>

diff --git a/acl/acl-impl/src/test/resources/reference/acl-references.json b/acl/acl-impl/src/test/resources/reference/acl-references.json
index d60eeca..63c9e20 100644 (file)
--- a/acl/acl-impl/src/test/resources/reference/acl-references.json
+++ b/acl/acl-impl/src/test/resources/reference/acl-references.json
@@ -7,7 +7,7 @@
           "ingress": {
             "vpp-acls": [
               {
-                "type": "vpp-acl",
+                "type": "vpp-acl:vpp-acl",
                 "name": "acl1"
               }
             ]
@@ -20,7 +20,7 @@
           "egress": {
             "vpp-acls": [
               {
-                "type": "vpp-acl",
+                "type": "vpp-acl:vpp-acl",
                 "name": "acl1"
               }
             ]
@@ -28,7 +28,7 @@
           "ingress": {
             "vpp-acls": [
               {
-                "type": "vpp-acl",
+                "type": "vpp-acl:vpp-acl",
                 "name": "acl2"
               }
             ]
@@ -41,13 +41,13 @@
           "ingress": {
             "vpp-acls": [
               {
-                "type": "vpp-acl",
+                "type": "vpp-acl:vpp-acl",
                 "name": "acl1"
               }
             ],
             "vpp-macip-acl": {
               "name": "acl4",
-              "type": "vpp-macip-acl"
+              "type": "vpp-acl:vpp-macip-acl"
             }
           }
         }

diff --git a/ioam/api/pom.xml b/ioam/api/pom.xml
index fc3938b..d3b4aa1 100644 (file)
--- a/ioam/api/pom.xml
+++ b/ioam/api/pom.xml
@@ -34,5 +34,9 @@
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-interfaces</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>ietf-inet-types-2013-07-15</artifactId>
+    </dependency>
   </dependencies>
 </project>

diff --git a/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamExportWriterCustomizerTest.java b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamExportWriterCustomizerTest.java
index b2dfaf3..d54e46a 100644 (file)
--- a/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamExportWriterCustomizerTest.java
+++ b/ioam/impl/src/test/java/io/fd/hc2vpp/vppioam/impl/config/IoamExportWriterCustomizerTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
 import org.mockito.Mock;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.export.rev170206.IoamExport;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.ioam.sb.export.rev170206.IoamExportBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Address;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;