Reverting to previous iteration mode, fixing case of modifying existing tags and adding extra checks
- Reverting iteration through meta instructions to earlier mode
Assuming instructions appear in the order they were added
- Saving explicitly provided VlanId to new variable modifiedVlan:
modifiedVlan is the value to be used when modifying existing tag
assignedVlan is the value to be pushed to untagged packets
pushedVlan is the value to be pushed to tagged packets (i.e. when pushVlan == true)
- Extra checks added for the following cases:
Do not allow to pop tag after modifying existing tag
Do not allow to modify a tag after pushing a new tag
Do not allow including multiple modify VLAN operations
Change-Id: I92801e3845a2ca1e88181698cb0ba3c22224acf4
diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/SpringOpenTTPDell.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/SpringOpenTTPDell.java
index 8043e24..e3afc0b 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/SpringOpenTTPDell.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/SpringOpenTTPDell.java
@@ -205,7 +205,8 @@
@Override
protected List<FlowRule> processVlanIdFilter(VlanIdCriterion vlanIdCriterion,
FilteringObjective filt,
- VlanId assignedVlan,
+ VlanId assignedVlan, VlanId modifiedVlan, VlanId pushedVlan,
+ boolean popVlan, boolean pushVlan,
ApplicationId applicationId) {
log.debug("For now not adding any VLAN rules "
+ "into Dell switches as it is ignoring");