| commit | dd0568b367fcd3f5af0b5a4e8ac5c54130777bd9 | [log] [tgz] |
|---|---|---|
| author | Daniele Moro <daniele@opennetworking.org> | Fri Nov 01 14:01:46 2019 -0700 |
| committer | Carmelo Cascone <carmelo@opennetworking.org> | Wed Nov 06 01:21:29 2019 +0000 |
| tree | ce4d926ced3289101d3f802c5d44ffd74a60c09d | |
| parent | f4d1bc6eec291aad27298fd57c5b042cf5707158 [diff] [blame] |
Small fixes and improvements on fabric.p4 - setting s_tag and c_tag for BNG as early as possible in the pipeline - ingress_port_vlan was matching on inner_vlan_tag but that field could be not present Change-Id: Id4d51159a314d45cec370471ed244a51fd74338b
diff --git a/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricPipelinerTest.java b/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricPipelinerTest.java index 850e21f..31db010 100644 --- a/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricPipelinerTest.java +++ b/pipelines/fabric/impl/src/test/java/org/onosproject/pipelines/fabric/impl/behaviour/pipeliner/FabricPipelinerTest.java
@@ -61,6 +61,7 @@ this.capabilitiesHashed = createNiceMock(FabricCapabilities.class); this.capabilitiesSimple = createNiceMock(FabricCapabilities.class); expect(capabilitiesHashed.hasHashedTable()).andReturn(true).anyTimes(); + expect(capabilitiesHashed.supportDoubleVlanTerm()).andReturn(true).anyTimes(); expect(capabilitiesSimple.hasHashedTable()).andReturn(false).anyTimes(); expect(capabilitiesSimple.supportDoubleVlanTerm()).andReturn(true).anyTimes(); replay(capabilitiesHashed);