flowruleprovider builds flowmods
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/instructions/L2ModificationInstruction.java b/core/api/src/main/java/org/onlab/onos/net/flow/instructions/L2ModificationInstruction.java
index 9019efb..78eaaa9 100644
--- a/core/api/src/main/java/org/onlab/onos/net/flow/instructions/L2ModificationInstruction.java
+++ b/core/api/src/main/java/org/onlab/onos/net/flow/instructions/L2ModificationInstruction.java
@@ -1,7 +1,7 @@
package org.onlab.onos.net.flow.instructions;
-import org.onlab.packet.MACAddress;
-import org.onlab.packet.VLANID;
+import org.onlab.packet.MacAddress;
+import org.onlab.packet.VlanId;
/**
* Abstraction of a single traffic treatment step.
@@ -50,9 +50,10 @@
public static final class ModEtherInstruction extends L2ModificationInstruction {
private final L2SubType subtype;
- private final MACAddress mac;
+ private final MacAddress mac;
- public ModEtherInstruction(L2SubType subType, MACAddress addr) {
+ public ModEtherInstruction(L2SubType subType, MacAddress addr) {
+
this.subtype = subType;
this.mac = addr;
}
@@ -62,7 +63,7 @@
return this.subtype;
}
- public MACAddress mac() {
+ public MacAddress mac() {
return this.mac;
}
@@ -73,9 +74,9 @@
*/
public static final class ModVlanIdInstruction extends L2ModificationInstruction {
- public final VLANID vlanId;
+ public final VlanId vlanId;
- public ModVlanIdInstruction(VLANID vlanId) {
+ public ModVlanIdInstruction(VlanId vlanId) {
this.vlanId = vlanId;
}
@@ -84,7 +85,7 @@
return L2SubType.VLAN_ID;
}
- public VLANID vlanId() {
+ public VlanId vlanId() {
return this.vlanId;
}