| commit | 4906fabe8d10550c982bb9bdf85bbeca06d14810 | [log] [tgz] |
|---|---|---|
| author | alshabib <alshabibi.ali@gmail.com> | Mon Sep 29 23:58:12 2014 -0700 |
| committer | alshabib <alshabibi.ali@gmail.com> | Mon Sep 29 23:58:12 2014 -0700 |
| tree | 4f4ea75a503eb4c70d4a5fa64ece7ea71554b308 | |
| parent | cccd6b95a971fc713e59fe6d5229b96ea84e27eb [diff] |
initial mobility support Change-Id: Idf42bd2f769b3c687c4acc18241e19970c6cd7e2
diff --git a/providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/FlowModBuilder.java b/providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/FlowModBuilder.java index 2822f02..efe436f 100644 --- a/providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/FlowModBuilder.java +++ b/providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/FlowModBuilder.java
@@ -93,7 +93,7 @@ OFFlowMod fm = factory.buildFlowDelete() .setCookie(U64.of(cookie.value())) .setBufferId(OFBufferId.NO_BUFFER) - .setActions(actions) + //.setActions(actions) .setMatch(match) .setFlags(Collections.singleton(OFFlowModFlags.SEND_FLOW_REM)) .setPriority(priority) @@ -104,6 +104,9 @@ private List<OFAction> buildActions() { List<OFAction> acts = new LinkedList<>(); + if (treatment == null) { + return acts; + } for (Instruction i : treatment.instructions()) { switch (i.type()) { case DROP:
diff --git a/providers/openflow/packet/src/main/java/org/onlab/onos/provider/of/packet/impl/OpenFlowPacketProvider.java b/providers/openflow/packet/src/main/java/org/onlab/onos/provider/of/packet/impl/OpenFlowPacketProvider.java index cb7f1f9..41cb586 100644 --- a/providers/openflow/packet/src/main/java/org/onlab/onos/provider/of/packet/impl/OpenFlowPacketProvider.java +++ b/providers/openflow/packet/src/main/java/org/onlab/onos/provider/of/packet/impl/OpenFlowPacketProvider.java
@@ -106,10 +106,6 @@ for (Instruction inst : packet.treatment().instructions()) { if (inst.type().equals(Instruction.Type.OUTPUT)) { p = portDesc(((OutputInstruction) inst).port()); - /*if (!sw.getPorts().contains(p)) { - log.warn("Tried to write out non-existent port {}", p.getPortNo()); - continue; - }*/ OFPacketOut po = packetOut(sw, eth, p.getPortNo()); sw.sendMsg(po); }