Fix Junit failures in master in ACL & SFC

The junits were broken after the recent commit in yangtools
https://git.opendaylight.org/gerrit/#/c/48672/

Change-Id: Ib37cb57de2c59d558f89b9723f685071fee9ff3b
Signed-off-by: Faseela K <faseela.k@ericsson.com>

diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdentifiedInterfaceWithAclBuilder.xtend b/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdentifiedInterfaceWithAclBuilder.xtend
index d43f474534cbab0c90328c5c602f65b2f4e4e8b6..c3b292011817fb34f14f0b1dea9e165367f92c89 100644 (file)
--- a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdentifiedInterfaceWithAclBuilder.xtend
+++ b/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdentifiedInterfaceWithAclBuilder.xtend
@@ -9,7 +9,9 @@ package org.opendaylight.netvirt.aclservice.tests
 
 import java.util.List
 import javax.annotation.concurrent.NotThreadSafe
+
 import org.opendaylight.netvirt.aclservice.tests.infra.DataTreeIdentifierDataObjectPairBuilder
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.L2vlan
 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.InterfaceBuilder
@@ -50,6 +52,7 @@ class IdentifiedInterfaceWithAclBuilder implements DataTreeIdentifierDataObjectP
                 allowedAddressPairs = ifAllowedAddressPairs
             ])
             name = interfaceName
+            type = L2vlan
         ]
     }
 

diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/StateInterfaceBuilderHelper.xtend b/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/StateInterfaceBuilderHelper.xtend
index 554911932c8388cd4a3a1b0e0bc67747ddcafba7..85e17f740c0f7809cff0378bac2c0ea3af5265b1 100644 (file)
--- a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/StateInterfaceBuilderHelper.xtend
+++ b/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/StateInterfaceBuilderHelper.xtend
@@ -10,9 +10,13 @@ package org.opendaylight.netvirt.aclservice.tests
 import org.opendaylight.controller.md.sal.binding.api.DataBroker
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesState
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface.AdminStatus;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface.OperStatus
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.InterfaceBuilder
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.InterfaceKey
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state._interface.Statistics;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state._interface.StatisticsBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.PhysAddress
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier
 
@@ -33,7 +37,11 @@ class StateInterfaceBuilderHelper {
             lowerLayerIf = #[ "openflow:123:456" ]
             ifIndex = 987
             operStatus = OperStatus.Up
+            adminStatus = AdminStatus.Up
             type = L2vlan
+            statistics = new StatisticsBuilder() >> [
+                discontinuityTime = DateAndTime.getDefaultInstance("8330-42-22T79:08:74Z")
+            ]
         ]
         MDSALUtil.syncWrite(dataBroker, OPERATIONAL, id, stateInterface);
     }

diff --git a/vpnservice/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/SfcProviderTest.java b/vpnservice/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/SfcProviderTest.java
index 4f3a254fa9eb5960929c9a42a5ba77a78dc6a9b4..b633f22272cfeaa61377c2725ec3827754d73d7c 100644 (file)
--- a/vpnservice/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/SfcProviderTest.java
+++ b/vpnservice/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/SfcProviderTest.java
@@ -24,6 +24,8 @@ import org.opendaylight.genius.mdsalutil.MDSALUtil;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.RspName;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SfDataPlaneLocatorName;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SfName;
+import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SfcName;
+import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SftTypeName;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.rsp.rev140701.RenderedServicePaths;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.rsp.rev140701.rendered.service.paths.RenderedServicePath;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.rsp.rev140701.rendered.service.paths.RenderedServicePathBuilder;
@@ -47,6 +49,7 @@ public class SfcProviderTest extends ConstantSchemaAbstractDataBrokerTest {
     private static final String SF_NAME = "SF1";
     private static final String SF_DPL_NAME = "SF_DPL";
     private static final String LOGICAL_IF_NAME = "eccb57ae-5a2e-467f-823e-45d7bb2a6a9a";
+    private static final Long PATH_ID = Long.valueOf(1);
 
     private SfcProvider sfcProvider;
 
@@ -116,7 +119,7 @@ public class SfcProviderTest extends ConstantSchemaAbstractDataBrokerTest {
 
     private RenderedServicePathBuilder createRsp(RspName rspName) {
         RenderedServicePathBuilder rspBuilder = new RenderedServicePathBuilder();
-        rspBuilder.setName(rspName);
+        rspBuilder.setName(rspName).setServiceChainName(SfcName.getDefaultInstance(SFC_NAME)).setPathId(PATH_ID);
 
         return rspBuilder;
     }
@@ -137,7 +140,7 @@ public class SfcProviderTest extends ConstantSchemaAbstractDataBrokerTest {
             rspBuilder.setRenderedServicePathHop(hops);
         }
 
-        ServiceFunctionBuilder sfBuilder = new ServiceFunctionBuilder();
+        ServiceFunctionBuilder sfBuilder = new ServiceFunctionBuilder().setType(SftTypeName.getDefaultInstance("NAT"));
         SfDataPlaneLocatorBuilder sfDplBuilder = new SfDataPlaneLocatorBuilder();
         if (createLogicalSfDpl) {
             LogicalInterfaceBuilder liBuilder = new LogicalInterfaceBuilder();