Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 1 | package net.onrc.onos.ofcontroller.flowmanager; |
| 2 | |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 3 | import java.util.ArrayList; |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 4 | import java.util.Collection; |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 5 | import java.util.HashMap; |
| 6 | import java.util.Iterator; |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 7 | import java.util.LinkedList; |
| 8 | import java.util.List; |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 9 | import java.util.Map; |
Pavlin Radoslavov | 5321980 | 2013-12-06 11:02:04 -0800 | [diff] [blame] | 10 | import java.util.SortedMap; |
| 11 | import java.util.TreeMap; |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 12 | import java.util.concurrent.BlockingQueue; |
| 13 | import java.util.concurrent.LinkedBlockingQueue; |
| 14 | |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 15 | import net.floodlightcontroller.core.IOFSwitch; |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 16 | import net.onrc.onos.datagrid.IDatagridService; |
Naoki Shiota | 0abe38d | 2014-01-07 15:31:22 -0800 | [diff] [blame] | 17 | import net.onrc.onos.graph.GraphDBOperation; |
Pavlin Radoslavov | a23e541 | 2013-10-27 19:56:40 -0700 | [diff] [blame] | 18 | import net.onrc.onos.ofcontroller.topology.Topology; |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 19 | import net.onrc.onos.ofcontroller.topology.TopologyElement; |
Pavlin Radoslavov | 3ecd41e | 2013-10-29 14:29:30 -0700 | [diff] [blame] | 20 | import net.onrc.onos.ofcontroller.topology.TopologyManager; |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 21 | import net.onrc.onos.ofcontroller.util.DataPath; |
Pavlin Radoslavov | 3a7cc90 | 2014-01-09 02:32:08 -0800 | [diff] [blame] | 22 | import net.onrc.onos.ofcontroller.util.Dpid; |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 23 | import net.onrc.onos.ofcontroller.util.EventEntry; |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 24 | import net.onrc.onos.ofcontroller.util.FlowEntry; |
| 25 | import net.onrc.onos.ofcontroller.util.FlowEntryAction; |
| 26 | import net.onrc.onos.ofcontroller.util.FlowEntryActions; |
Pavlin Radoslavov | 1c24f22 | 2013-10-30 13:56:46 -0700 | [diff] [blame] | 27 | import net.onrc.onos.ofcontroller.util.FlowEntryId; |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 28 | import net.onrc.onos.ofcontroller.util.FlowEntryMatch; |
| 29 | import net.onrc.onos.ofcontroller.util.FlowEntrySwitchState; |
| 30 | import net.onrc.onos.ofcontroller.util.FlowEntryUserState; |
Pavlin Radoslavov | 1c24f22 | 2013-10-30 13:56:46 -0700 | [diff] [blame] | 31 | import net.onrc.onos.ofcontroller.util.FlowId; |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 32 | import net.onrc.onos.ofcontroller.util.FlowPath; |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 33 | import net.onrc.onos.ofcontroller.util.FlowPathUserState; |
Pavlin Radoslavov | 3a7cc90 | 2014-01-09 02:32:08 -0800 | [diff] [blame] | 34 | import net.onrc.onos.ofcontroller.util.Port; |
Pavlin Radoslavov | 5321980 | 2013-12-06 11:02:04 -0800 | [diff] [blame] | 35 | import net.onrc.onos.ofcontroller.util.serializers.KryoFactory; |
| 36 | |
| 37 | import com.esotericsoftware.kryo2.Kryo; |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 38 | |
| 39 | import org.slf4j.Logger; |
| 40 | import org.slf4j.LoggerFactory; |
| 41 | |
| 42 | /** |
Yuta HIGUCHI | e1038fb | 2013-10-30 15:35:18 -0700 | [diff] [blame] | 43 | * Class for FlowPath Maintenance. |
| 44 | * This class listens for FlowEvents to: |
| 45 | * - Maintain a local cache of the Network Topology. |
| 46 | * - Detect FlowPaths impacted by Topology change. |
| 47 | * - Recompute impacted FlowPath using cached Topology. |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 48 | */ |
Pavlin Radoslavov | 9a85902 | 2013-10-30 10:08:24 -0700 | [diff] [blame] | 49 | class FlowEventHandler extends Thread implements IFlowEventHandlerService { |
Pavlin Radoslavov | 8252fee | 2014-01-07 17:24:29 -0800 | [diff] [blame] | 50 | |
Pavlin Radoslavov | db1f91c | 2014-01-08 16:04:17 -0800 | [diff] [blame] | 51 | private boolean enableOnrc2014MeasurementsFlows = true; |
| 52 | private boolean enableOnrc2014MeasurementsTopology = true; |
Pavlin Radoslavov | 8252fee | 2014-01-07 17:24:29 -0800 | [diff] [blame] | 53 | |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 54 | /** The logger. */ |
Pavlin Radoslavov | 9a85902 | 2013-10-30 10:08:24 -0700 | [diff] [blame] | 55 | private final static Logger log = LoggerFactory.getLogger(FlowEventHandler.class); |
Naoki Shiota | 0abe38d | 2014-01-07 15:31:22 -0800 | [diff] [blame] | 56 | |
Naoki Shiota | 0abe38d | 2014-01-07 15:31:22 -0800 | [diff] [blame] | 57 | private GraphDBOperation dbHandler; |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 58 | private FlowManager flowManager; // The Flow Manager to use |
| 59 | private IDatagridService datagridService; // The Datagrid Service to use |
Pavlin Radoslavov | a23e541 | 2013-10-27 19:56:40 -0700 | [diff] [blame] | 60 | private Topology topology; // The network topology |
Pavlin Radoslavov | 5321980 | 2013-12-06 11:02:04 -0800 | [diff] [blame] | 61 | private KryoFactory kryoFactory = new KryoFactory(); |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 62 | |
| 63 | // The queue with Flow Path and Topology Element updates |
| 64 | private BlockingQueue<EventEntry<?>> networkEvents = |
| 65 | new LinkedBlockingQueue<EventEntry<?>>(); |
| 66 | |
Pavlin Radoslavov | b750684 | 2013-10-29 17:46:54 -0700 | [diff] [blame] | 67 | // The pending Topology, FlowPath, and FlowEntry events |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 68 | private List<EventEntry<TopologyElement>> topologyEvents = |
| 69 | new LinkedList<EventEntry<TopologyElement>>(); |
| 70 | private List<EventEntry<FlowPath>> flowPathEvents = |
| 71 | new LinkedList<EventEntry<FlowPath>>(); |
Pavlin Radoslavov | b750684 | 2013-10-29 17:46:54 -0700 | [diff] [blame] | 72 | private List<EventEntry<FlowEntry>> flowEntryEvents = |
| 73 | new LinkedList<EventEntry<FlowEntry>>(); |
Pavlin Radoslavov | 2004fa0 | 2014-01-07 14:46:42 -0800 | [diff] [blame] | 74 | private List<EventEntry<FlowId>> flowIdEvents = |
| 75 | new LinkedList<EventEntry<FlowId>>(); |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 76 | |
Pavlin Radoslavov | 2fca8d1 | 2013-12-04 09:39:06 -0800 | [diff] [blame] | 77 | // All internally computed Flow Paths |
| 78 | private Map<Long, FlowPath> allFlowPaths = new HashMap<Long, FlowPath>(); |
| 79 | |
| 80 | // The Flow Entries received as notifications with unmatched Flow Paths |
| 81 | private Map<Long, FlowEntry> unmatchedFlowEntryAdd = |
| 82 | new HashMap<Long, FlowEntry>(); |
| 83 | |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 84 | // |
| 85 | // Transient state for processing the Flow Paths: |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 86 | // - The Flow Paths that should be recomputed |
| 87 | // - The Flow Paths with modified Flow Entries |
Pavlin Radoslavov | 7208e9a | 2013-12-11 14:31:07 -0800 | [diff] [blame] | 88 | // - The Flow Paths that we should check if installed in all switches |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 89 | // |
Pavlin Radoslavov | 2fca8d1 | 2013-12-04 09:39:06 -0800 | [diff] [blame] | 90 | private Map<Long, FlowPath> shouldRecomputeFlowPaths = |
| 91 | new HashMap<Long, FlowPath>(); |
| 92 | private Map<Long, FlowPath> modifiedFlowPaths = |
| 93 | new HashMap<Long, FlowPath>(); |
Pavlin Radoslavov | 7208e9a | 2013-12-11 14:31:07 -0800 | [diff] [blame] | 94 | private Map<Long, FlowPath> checkIfInstalledFlowPaths = |
| 95 | new HashMap<Long, FlowPath>(); |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 96 | |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 97 | /** |
| 98 | * Constructor for a given Flow Manager and Datagrid Service. |
| 99 | * |
| 100 | * @param flowManager the Flow Manager to use. |
| 101 | * @param datagridService the Datagrid Service to use. |
| 102 | */ |
Pavlin Radoslavov | 9a85902 | 2013-10-30 10:08:24 -0700 | [diff] [blame] | 103 | FlowEventHandler(FlowManager flowManager, |
Pavlin Radoslavov | 8252fee | 2014-01-07 17:24:29 -0800 | [diff] [blame] | 104 | IDatagridService datagridService) { |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 105 | this.flowManager = flowManager; |
| 106 | this.datagridService = datagridService; |
Pavlin Radoslavov | a23e541 | 2013-10-27 19:56:40 -0700 | [diff] [blame] | 107 | this.topology = new Topology(); |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 108 | } |
| 109 | |
| 110 | /** |
Pavlin Radoslavov | ed0f4a8 | 2013-11-04 16:38:36 -0800 | [diff] [blame] | 111 | * Get the network topology. |
| 112 | * |
| 113 | * @return the network topology. |
| 114 | */ |
| 115 | protected Topology getTopology() { return this.topology; } |
| 116 | |
| 117 | /** |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 118 | * Startup processing. |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 119 | */ |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 120 | private void startup() { |
Pavlin Radoslavov | 8252fee | 2014-01-07 17:24:29 -0800 | [diff] [blame] | 121 | this.dbHandler = new GraphDBOperation(""); |
| 122 | |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 123 | // |
| 124 | // Obtain the initial Topology state |
| 125 | // |
| 126 | Collection<TopologyElement> topologyElements = |
| 127 | datagridService.getAllTopologyElements(); |
| 128 | for (TopologyElement topologyElement : topologyElements) { |
| 129 | EventEntry<TopologyElement> eventEntry = |
| 130 | new EventEntry<TopologyElement>(EventEntry.Type.ENTRY_ADD, topologyElement); |
| 131 | topologyEvents.add(eventEntry); |
| 132 | } |
| 133 | // |
| 134 | // Obtain the initial Flow Path state |
| 135 | // |
| 136 | Collection<FlowPath> flowPaths = datagridService.getAllFlows(); |
| 137 | for (FlowPath flowPath : flowPaths) { |
| 138 | EventEntry<FlowPath> eventEntry = |
| 139 | new EventEntry<FlowPath>(EventEntry.Type.ENTRY_ADD, flowPath); |
| 140 | flowPathEvents.add(eventEntry); |
| 141 | } |
Pavlin Radoslavov | b750684 | 2013-10-29 17:46:54 -0700 | [diff] [blame] | 142 | // |
| 143 | // Obtain the initial FlowEntry state |
| 144 | // |
| 145 | Collection<FlowEntry> flowEntries = datagridService.getAllFlowEntries(); |
| 146 | for (FlowEntry flowEntry : flowEntries) { |
| 147 | EventEntry<FlowEntry> eventEntry = |
| 148 | new EventEntry<FlowEntry>(EventEntry.Type.ENTRY_ADD, flowEntry); |
| 149 | flowEntryEvents.add(eventEntry); |
| 150 | } |
| 151 | |
Pavlin Radoslavov | 2004fa0 | 2014-01-07 14:46:42 -0800 | [diff] [blame] | 152 | // |
| 153 | // Obtain the initial FlowId state |
| 154 | // |
| 155 | Collection<FlowId> flowIds = datagridService.getAllFlowIds(); |
| 156 | for (FlowId flowId : flowIds) { |
| 157 | EventEntry<FlowId> eventEntry = |
| 158 | new EventEntry<FlowId>(EventEntry.Type.ENTRY_ADD, flowId); |
| 159 | flowIdEvents.add(eventEntry); |
| 160 | } |
| 161 | |
Pavlin Radoslavov | fb94edc | 2013-11-04 16:29:40 -0800 | [diff] [blame] | 162 | // Process the initial events (if any) |
Pavlin Radoslavov | 5321980 | 2013-12-06 11:02:04 -0800 | [diff] [blame] | 163 | synchronized (allFlowPaths) { |
| 164 | processEvents(); |
| 165 | } |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 166 | } |
| 167 | |
| 168 | /** |
| 169 | * Run the thread. |
| 170 | */ |
Pavlin Radoslavov | 4839f6d | 2013-12-11 12:49:45 -0800 | [diff] [blame] | 171 | @Override |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 172 | public void run() { |
Yuta HIGUCHI | 61509a4 | 2013-12-17 10:41:04 -0800 | [diff] [blame] | 173 | this.setName("FlowEventHandler " + this.getId()); |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 174 | startup(); |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 175 | |
| 176 | // |
| 177 | // The main loop |
| 178 | // |
| 179 | Collection<EventEntry<?>> collection = new LinkedList<EventEntry<?>>(); |
| 180 | try { |
| 181 | while (true) { |
| 182 | EventEntry<?> eventEntry = networkEvents.take(); |
| 183 | collection.add(eventEntry); |
| 184 | networkEvents.drainTo(collection); |
| 185 | |
Pavlin Radoslavov | ed4c7a9 | 2013-10-26 21:36:21 -0700 | [diff] [blame] | 186 | // |
| 187 | // Demultiplex all events: |
| 188 | // - EventEntry<TopologyElement> |
| 189 | // - EventEntry<FlowPath> |
Pavlin Radoslavov | b750684 | 2013-10-29 17:46:54 -0700 | [diff] [blame] | 190 | // - EventEntry<FlowEntry> |
Pavlin Radoslavov | 2004fa0 | 2014-01-07 14:46:42 -0800 | [diff] [blame] | 191 | // - EventEntry<FlowId> |
Pavlin Radoslavov | ed4c7a9 | 2013-10-26 21:36:21 -0700 | [diff] [blame] | 192 | // |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 193 | for (EventEntry<?> event : collection) { |
Pavlin Radoslavov | c8038a8 | 2013-12-02 17:43:20 -0800 | [diff] [blame] | 194 | // Topology event |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 195 | if (event.eventData() instanceof TopologyElement) { |
| 196 | EventEntry<TopologyElement> topologyEventEntry = |
| 197 | (EventEntry<TopologyElement>)event; |
Naoki Shiota | 0abe38d | 2014-01-07 15:31:22 -0800 | [diff] [blame] | 198 | |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 199 | topologyEvents.add(topologyEventEntry); |
Pavlin Radoslavov | c8038a8 | 2013-12-02 17:43:20 -0800 | [diff] [blame] | 200 | continue; |
| 201 | } |
| 202 | |
| 203 | // FlowPath event |
| 204 | if (event.eventData() instanceof FlowPath) { |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 205 | EventEntry<FlowPath> flowPathEventEntry = |
| 206 | (EventEntry<FlowPath>)event; |
| 207 | flowPathEvents.add(flowPathEventEntry); |
Pavlin Radoslavov | c8038a8 | 2013-12-02 17:43:20 -0800 | [diff] [blame] | 208 | continue; |
| 209 | } |
| 210 | |
| 211 | // FlowEntry event |
| 212 | if (event.eventData() instanceof FlowEntry) { |
Pavlin Radoslavov | b750684 | 2013-10-29 17:46:54 -0700 | [diff] [blame] | 213 | EventEntry<FlowEntry> flowEntryEventEntry = |
| 214 | (EventEntry<FlowEntry>)event; |
| 215 | flowEntryEvents.add(flowEntryEventEntry); |
Pavlin Radoslavov | c8038a8 | 2013-12-02 17:43:20 -0800 | [diff] [blame] | 216 | continue; |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 217 | } |
Pavlin Radoslavov | 2004fa0 | 2014-01-07 14:46:42 -0800 | [diff] [blame] | 218 | |
| 219 | // FlowId event |
| 220 | if (event.eventData() instanceof FlowId) { |
| 221 | EventEntry<FlowId> flowIdEventEntry = |
| 222 | (EventEntry<FlowId>)event; |
| 223 | flowIdEvents.add(flowIdEventEntry); |
| 224 | continue; |
| 225 | } |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 226 | } |
| 227 | collection.clear(); |
Pavlin Radoslavov | ed4c7a9 | 2013-10-26 21:36:21 -0700 | [diff] [blame] | 228 | |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 229 | // Process the events (if any) |
Pavlin Radoslavov | 5321980 | 2013-12-06 11:02:04 -0800 | [diff] [blame] | 230 | synchronized (allFlowPaths) { |
| 231 | processEvents(); |
| 232 | } |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 233 | } |
| 234 | } catch (Exception exception) { |
| 235 | log.debug("Exception processing Network Events: ", exception); |
| 236 | } |
| 237 | } |
Naoki Shiota | 0abe38d | 2014-01-07 15:31:22 -0800 | [diff] [blame] | 238 | |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 239 | /** |
| 240 | * Process the events (if any) |
| 241 | */ |
| 242 | private void processEvents() { |
Pavlin Radoslavov | afc4aa9 | 2013-12-04 12:44:23 -0800 | [diff] [blame] | 243 | Collection<FlowEntry> modifiedFlowEntries; |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 244 | |
Pavlin Radoslavov | 80bc3cf | 2014-01-08 11:17:30 -0800 | [diff] [blame] | 245 | if (enableOnrc2014MeasurementsFlows) { |
| 246 | |
| 247 | if (topologyEvents.isEmpty() && flowIdEvents.isEmpty()) { |
| 248 | return; // Nothing to do |
| 249 | } |
| 250 | |
| 251 | Map<Long, IOFSwitch> mySwitches = flowManager.getMySwitches(); |
| 252 | |
| 253 | // Fetch and prepare my flows |
| 254 | prepareMyFlows(mySwitches); |
| 255 | |
| 256 | // Fetch the topology |
| 257 | processTopologyEvents(); |
| 258 | |
| 259 | // Recompute all affected Flow Paths and keep only the modified |
| 260 | for (FlowPath flowPath : shouldRecomputeFlowPaths.values()) { |
| 261 | if (recomputeFlowPath(flowPath)) |
| 262 | modifiedFlowPaths.put(flowPath.flowId().value(), flowPath); |
| 263 | } |
| 264 | |
| 265 | // Assign the Flow Entry ID as needed |
| 266 | for (FlowPath flowPath : modifiedFlowPaths.values()) { |
| 267 | for (FlowEntry flowEntry : flowPath.flowEntries()) { |
| 268 | if (! flowEntry.isValidFlowEntryId()) { |
| 269 | long id = flowManager.getNextFlowEntryId(); |
| 270 | flowEntry.setFlowEntryId(new FlowEntryId(id)); |
| 271 | } |
| 272 | } |
| 273 | } |
| 274 | |
| 275 | // Extract my modified Flow Entries |
| 276 | modifiedFlowEntries = processFlowIdEvents(mySwitches); |
| 277 | |
| 278 | // |
| 279 | // Push the modified state to the Flow Manager |
| 280 | // |
| 281 | flowManager.pushModifiedFlowState(modifiedFlowPaths.values(), |
| 282 | modifiedFlowEntries); |
| 283 | |
| 284 | // Cleanup |
| 285 | topologyEvents.clear(); |
| 286 | flowIdEvents.clear(); |
| 287 | // |
| 288 | allFlowPaths.clear(); |
| 289 | shouldRecomputeFlowPaths.clear(); |
| 290 | modifiedFlowPaths.clear(); |
| 291 | |
| 292 | return; |
| 293 | } |
| 294 | |
Pavlin Radoslavov | b750684 | 2013-10-29 17:46:54 -0700 | [diff] [blame] | 295 | if (topologyEvents.isEmpty() && flowPathEvents.isEmpty() && |
Pavlin Radoslavov | 80bc3cf | 2014-01-08 11:17:30 -0800 | [diff] [blame] | 296 | flowEntryEvents.isEmpty()) { |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 297 | return; // Nothing to do |
Pavlin Radoslavov | b750684 | 2013-10-29 17:46:54 -0700 | [diff] [blame] | 298 | } |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 299 | |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 300 | processFlowPathEvents(); |
| 301 | processTopologyEvents(); |
Pavlin Radoslavov | 9bb4055 | 2013-12-18 21:08:30 -0800 | [diff] [blame] | 302 | processUnmatchedFlowEntryAdd(); |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 303 | processFlowEntryEvents(); |
| 304 | |
| 305 | // Recompute all affected Flow Paths and keep only the modified |
Pavlin Radoslavov | 2fca8d1 | 2013-12-04 09:39:06 -0800 | [diff] [blame] | 306 | for (FlowPath flowPath : shouldRecomputeFlowPaths.values()) { |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 307 | if (recomputeFlowPath(flowPath)) |
Pavlin Radoslavov | 2fca8d1 | 2013-12-04 09:39:06 -0800 | [diff] [blame] | 308 | modifiedFlowPaths.put(flowPath.flowId().value(), flowPath); |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 309 | } |
| 310 | |
Pavlin Radoslavov | 2fca8d1 | 2013-12-04 09:39:06 -0800 | [diff] [blame] | 311 | // Extract the modified Flow Entries |
Pavlin Radoslavov | afc4aa9 | 2013-12-04 12:44:23 -0800 | [diff] [blame] | 312 | modifiedFlowEntries = extractModifiedFlowEntries(modifiedFlowPaths.values()); |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 313 | |
| 314 | // Assign missing Flow Entry IDs |
| 315 | assignFlowEntryId(modifiedFlowEntries); |
| 316 | |
| 317 | // |
Pavlin Radoslavov | a0c1636 | 2013-12-04 13:18:08 -0800 | [diff] [blame] | 318 | // Push the modified state to the Flow Manager |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 319 | // |
Pavlin Radoslavov | a0c1636 | 2013-12-04 13:18:08 -0800 | [diff] [blame] | 320 | flowManager.pushModifiedFlowState(modifiedFlowPaths.values(), |
| 321 | modifiedFlowEntries); |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 322 | |
| 323 | // |
| 324 | // Remove Flow Entries that were deleted |
| 325 | // |
Pavlin Radoslavov | 2fca8d1 | 2013-12-04 09:39:06 -0800 | [diff] [blame] | 326 | for (FlowPath flowPath : modifiedFlowPaths.values()) |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 327 | flowPath.dataPath().removeDeletedFlowEntries(); |
| 328 | |
Pavlin Radoslavov | 7208e9a | 2013-12-11 14:31:07 -0800 | [diff] [blame] | 329 | // |
| 330 | // Check if Flow Paths have been installed into all switches, |
| 331 | // and generate the appropriate events. |
| 332 | // |
| 333 | checkInstalledFlowPaths(checkIfInstalledFlowPaths.values()); |
| 334 | |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 335 | // Cleanup |
| 336 | topologyEvents.clear(); |
| 337 | flowPathEvents.clear(); |
| 338 | flowEntryEvents.clear(); |
| 339 | // |
Pavlin Radoslavov | 2fca8d1 | 2013-12-04 09:39:06 -0800 | [diff] [blame] | 340 | shouldRecomputeFlowPaths.clear(); |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 341 | modifiedFlowPaths.clear(); |
Pavlin Radoslavov | 7208e9a | 2013-12-11 14:31:07 -0800 | [diff] [blame] | 342 | checkIfInstalledFlowPaths.clear(); |
| 343 | } |
| 344 | |
| 345 | /** |
| 346 | * Check if Flow Paths have been installed into all switches, |
| 347 | * and generate the appropriate events. |
| 348 | * |
| 349 | * @param flowPaths the flowPaths to process. |
| 350 | */ |
| 351 | private void checkInstalledFlowPaths(Collection<FlowPath> flowPaths) { |
| 352 | List<FlowPath> installedFlowPaths = new LinkedList<FlowPath>(); |
| 353 | |
| 354 | Kryo kryo = kryoFactory.newKryo(); |
| 355 | |
| 356 | for (FlowPath flowPath : flowPaths) { |
| 357 | boolean isInstalled = true; |
| 358 | |
| 359 | // |
| 360 | // Check whether all Flow Entries have been installed |
| 361 | // |
| 362 | for (FlowEntry flowEntry : flowPath.flowEntries()) { |
| 363 | if (flowEntry.flowEntrySwitchState() != |
| 364 | FlowEntrySwitchState.FE_SWITCH_UPDATED) { |
| 365 | isInstalled = false; |
| 366 | break; |
| 367 | } |
| 368 | } |
| 369 | |
| 370 | if (isInstalled) { |
| 371 | // Create a copy and add it to the list |
| 372 | FlowPath copyFlowPath = kryo.copy(flowPath); |
| 373 | installedFlowPaths.add(copyFlowPath); |
| 374 | } |
| 375 | } |
| 376 | kryoFactory.deleteKryo(kryo); |
| 377 | |
| 378 | // Generate an event for the installed Flow Path. |
| 379 | flowManager.notificationFlowPathsInstalled(installedFlowPaths); |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 380 | } |
| 381 | |
| 382 | /** |
| 383 | * Extract the modified Flow Entries. |
Pavlin Radoslavov | afc4aa9 | 2013-12-04 12:44:23 -0800 | [diff] [blame] | 384 | * |
| 385 | * @param modifiedFlowPaths the Flow Paths to process. |
| 386 | * @return a collection with the modified Flow Entries. |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 387 | */ |
Pavlin Radoslavov | afc4aa9 | 2013-12-04 12:44:23 -0800 | [diff] [blame] | 388 | private Collection<FlowEntry> extractModifiedFlowEntries( |
| 389 | Collection<FlowPath> modifiedFlowPaths) { |
| 390 | List<FlowEntry> modifiedFlowEntries = new LinkedList<FlowEntry>(); |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 391 | |
| 392 | // Extract only the modified Flow Entries |
Pavlin Radoslavov | afc4aa9 | 2013-12-04 12:44:23 -0800 | [diff] [blame] | 393 | for (FlowPath flowPath : modifiedFlowPaths) { |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 394 | for (FlowEntry flowEntry : flowPath.flowEntries()) { |
| 395 | if (flowEntry.flowEntrySwitchState() == |
| 396 | FlowEntrySwitchState.FE_SWITCH_NOT_UPDATED) { |
Pavlin Radoslavov | afc4aa9 | 2013-12-04 12:44:23 -0800 | [diff] [blame] | 397 | modifiedFlowEntries.add(flowEntry); |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 398 | } |
| 399 | } |
| 400 | } |
| 401 | return modifiedFlowEntries; |
| 402 | } |
| 403 | |
| 404 | /** |
| 405 | * Assign the Flow Entry ID as needed. |
Pavlin Radoslavov | afc4aa9 | 2013-12-04 12:44:23 -0800 | [diff] [blame] | 406 | * |
| 407 | * @param modifiedFlowEnries the collection of Flow Entries that need |
| 408 | * Flow Entry ID assigned. |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 409 | */ |
Pavlin Radoslavov | afc4aa9 | 2013-12-04 12:44:23 -0800 | [diff] [blame] | 410 | private void assignFlowEntryId(Collection<FlowEntry> modifiedFlowEntries) { |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 411 | if (modifiedFlowEntries.isEmpty()) |
| 412 | return; |
| 413 | |
| 414 | Map<Long, IOFSwitch> mySwitches = flowManager.getMySwitches(); |
| 415 | |
| 416 | // |
| 417 | // Assign the Flow Entry ID only for Flow Entries for my switches |
| 418 | // |
Pavlin Radoslavov | afc4aa9 | 2013-12-04 12:44:23 -0800 | [diff] [blame] | 419 | for (FlowEntry flowEntry : modifiedFlowEntries) { |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 420 | IOFSwitch mySwitch = mySwitches.get(flowEntry.dpid().value()); |
| 421 | if (mySwitch == null) |
| 422 | continue; |
| 423 | if (! flowEntry.isValidFlowEntryId()) { |
| 424 | long id = flowManager.getNextFlowEntryId(); |
| 425 | flowEntry.setFlowEntryId(new FlowEntryId(id)); |
| 426 | } |
| 427 | } |
| 428 | } |
| 429 | |
| 430 | /** |
Pavlin Radoslavov | 80bc3cf | 2014-01-08 11:17:30 -0800 | [diff] [blame] | 431 | * Prepare my flows. |
| 432 | * |
| 433 | * @param mySwitches the collection of my switches. |
Pavlin Radoslavov | 2004fa0 | 2014-01-07 14:46:42 -0800 | [diff] [blame] | 434 | */ |
Pavlin Radoslavov | 80bc3cf | 2014-01-08 11:17:30 -0800 | [diff] [blame] | 435 | private void prepareMyFlows(Map<Long, IOFSwitch> mySwitches) { |
Pavlin Radoslavov | 3a7cc90 | 2014-01-09 02:32:08 -0800 | [diff] [blame] | 436 | if (! topologyEvents.isEmpty()) { |
| 437 | // Fetch my flows from the database |
| 438 | ArrayList<FlowPath> myFlows = FlowDatabaseOperation.getAllMyFlows(dbHandler, mySwitches); |
| 439 | for (FlowPath flowPath : myFlows) { |
| 440 | allFlowPaths.put(flowPath.flowId().value(), flowPath); |
| 441 | |
| 442 | // |
| 443 | // TODO: Bug workaround / fix : |
| 444 | // method FlowDatabaseOperation.extractFlowEntry() doesn't |
| 445 | // fetch the inPort and outPort, hence we assign them here. |
| 446 | // |
| 447 | // Assign the inPort and outPort for the Flow Entries |
| 448 | for (FlowEntry flowEntry : flowPath.flowEntries()) { |
| 449 | // Set the inPort |
| 450 | do { |
| 451 | if (flowEntry.inPort() != null) |
| 452 | break; |
| 453 | if (flowEntry.flowEntryMatch() == null) |
| 454 | break; |
| 455 | Port inPort = new Port(flowEntry.flowEntryMatch().inPort().value()); |
| 456 | flowEntry.setInPort(inPort); |
| 457 | } while (false); |
| 458 | |
| 459 | // Set the outPort |
| 460 | do { |
| 461 | if (flowEntry.outPort() != null) |
| 462 | break; |
| 463 | for (FlowEntryAction fa : flowEntry.flowEntryActions().actions()) { |
| 464 | if (fa.actionOutput() != null) { |
| 465 | Port outPort = new Port(fa.actionOutput().port().value()); |
| 466 | flowEntry.setOutPort(outPort); |
| 467 | break; |
| 468 | } |
| 469 | } |
| 470 | } while (false); |
| 471 | } |
| 472 | } |
Pavlin Radoslavov | 80bc3cf | 2014-01-08 11:17:30 -0800 | [diff] [blame] | 473 | } |
Pavlin Radoslavov | db1f91c | 2014-01-08 16:04:17 -0800 | [diff] [blame] | 474 | |
| 475 | // |
| 476 | // Automatically add all Flow ID events (for the Flows this instance |
| 477 | // is responsible for) to the collection of Flows to recompute. |
| 478 | // |
| 479 | for (EventEntry<FlowId> eventEntry : flowIdEvents) { |
| 480 | FlowId flowId = eventEntry.eventData(); |
| 481 | FlowPath flowPath = allFlowPaths.get(flowId.value()); |
Pavlin Radoslavov | 3a7cc90 | 2014-01-09 02:32:08 -0800 | [diff] [blame] | 482 | if (flowPath == null) { |
| 483 | if (! topologyEvents.isEmpty()) |
| 484 | continue; // Optimization: Not my flow |
| 485 | Dpid dpid = FlowDatabaseOperation.getFlowSourceDpid(dbHandler, |
| 486 | flowId); |
| 487 | if ((dpid != null) && (mySwitches.get(dpid.value()) != null)) { |
| 488 | flowPath = FlowDatabaseOperation.getFlow(dbHandler, |
| 489 | flowId); |
| 490 | } |
| 491 | } |
Pavlin Radoslavov | db1f91c | 2014-01-08 16:04:17 -0800 | [diff] [blame] | 492 | if (flowPath != null) { |
| 493 | shouldRecomputeFlowPaths.put(flowPath.flowId().value(), |
| 494 | flowPath); |
| 495 | } |
| 496 | } |
Pavlin Radoslavov | 80bc3cf | 2014-01-08 11:17:30 -0800 | [diff] [blame] | 497 | } |
| 498 | |
| 499 | /** |
| 500 | * Process the Flow ID events. |
| 501 | * |
| 502 | * @param mySwitches the collection of my switches. |
| 503 | * @return a collection of modified Flow Entries this instance needs |
| 504 | * to push to its own switches. |
| 505 | */ |
| 506 | private Collection<FlowEntry> processFlowIdEvents(Map<Long, IOFSwitch> mySwitches) { |
| 507 | List<FlowEntry> modifiedFlowEntries = new LinkedList<FlowEntry>(); |
| 508 | |
Pavlin Radoslavov | 2004fa0 | 2014-01-07 14:46:42 -0800 | [diff] [blame] | 509 | // |
| 510 | // Process all Flow ID events and update the appropriate state |
| 511 | // |
| 512 | for (EventEntry<FlowId> eventEntry : flowIdEvents) { |
| 513 | FlowId flowId = eventEntry.eventData(); |
| 514 | |
| 515 | log.debug("Flow ID Event: {} {}", eventEntry.eventType(), flowId); |
| 516 | |
Pavlin Radoslavov | 80bc3cf | 2014-01-08 11:17:30 -0800 | [diff] [blame] | 517 | // |
| 518 | // Lookup the Flow ID in the Flows that were read from the |
| 519 | // database in in a previous step. If not found, read from |
| 520 | // the database. |
| 521 | // |
| 522 | FlowPath flowPath = allFlowPaths.get(flowId.value()); |
| 523 | if (flowPath == null) |
Pavlin Radoslavov | 3a7cc90 | 2014-01-09 02:32:08 -0800 | [diff] [blame] | 524 | flowPath = FlowDatabaseOperation.getFlow(dbHandler, flowId); |
Pavlin Radoslavov | 80bc3cf | 2014-01-08 11:17:30 -0800 | [diff] [blame] | 525 | if (flowPath == null) { |
| 526 | log.debug("Flow ID {} : Flow not found!", flowId); |
| 527 | continue; |
Pavlin Radoslavov | 2004fa0 | 2014-01-07 14:46:42 -0800 | [diff] [blame] | 528 | } |
| 529 | |
Pavlin Radoslavov | 80bc3cf | 2014-01-08 11:17:30 -0800 | [diff] [blame] | 530 | // Collect only my flow entries that are not updated. |
| 531 | for (FlowEntry flowEntry : flowPath.flowEntries()) { |
| 532 | if (flowEntry.flowEntrySwitchState() != |
| 533 | FlowEntrySwitchState.FE_SWITCH_NOT_UPDATED) { |
| 534 | continue; |
| 535 | } |
| 536 | IOFSwitch mySwitch = mySwitches.get(flowEntry.dpid().value()); |
| 537 | if (mySwitch == null) |
| 538 | continue; |
| 539 | modifiedFlowEntries.add(flowEntry); |
Pavlin Radoslavov | 2004fa0 | 2014-01-07 14:46:42 -0800 | [diff] [blame] | 540 | } |
| 541 | } |
Pavlin Radoslavov | 2004fa0 | 2014-01-07 14:46:42 -0800 | [diff] [blame] | 542 | |
Pavlin Radoslavov | 80bc3cf | 2014-01-08 11:17:30 -0800 | [diff] [blame] | 543 | return modifiedFlowEntries; |
| 544 | } |
Pavlin Radoslavov | 2004fa0 | 2014-01-07 14:46:42 -0800 | [diff] [blame] | 545 | |
| 546 | /** |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 547 | * Process the Flow Path events. |
| 548 | */ |
| 549 | private void processFlowPathEvents() { |
| 550 | // |
| 551 | // Process all Flow Path events and update the appropriate state |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 552 | // |
| 553 | for (EventEntry<FlowPath> eventEntry : flowPathEvents) { |
| 554 | FlowPath flowPath = eventEntry.eventData(); |
| 555 | |
Yuta HIGUCHI | 5302ddf | 2014-01-06 12:53:35 -0800 | [diff] [blame] | 556 | log.debug("Flow Event: {} {}", eventEntry.eventType(), flowPath); |
Pavlin Radoslavov | fb94edc | 2013-11-04 16:29:40 -0800 | [diff] [blame] | 557 | |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 558 | switch (eventEntry.eventType()) { |
| 559 | case ENTRY_ADD: { |
| 560 | // |
| 561 | // Add a new Flow Path |
| 562 | // |
| 563 | if (allFlowPaths.get(flowPath.flowId().value()) != null) { |
| 564 | // |
| 565 | // TODO: What to do if the Flow Path already exists? |
Pavlin Radoslavov | 2fca8d1 | 2013-12-04 09:39:06 -0800 | [diff] [blame] | 566 | // Fow now, we just re-add it. |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 567 | // |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 568 | } |
| 569 | |
| 570 | switch (flowPath.flowPathType()) { |
| 571 | case FP_TYPE_SHORTEST_PATH: |
| 572 | // |
| 573 | // Reset the Data Path, in case it was set already, because |
| 574 | // we are going to recompute it anyway. |
| 575 | // |
| 576 | flowPath.flowEntries().clear(); |
Pavlin Radoslavov | 2fca8d1 | 2013-12-04 09:39:06 -0800 | [diff] [blame] | 577 | shouldRecomputeFlowPaths.put(flowPath.flowId().value(), |
| 578 | flowPath); |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 579 | break; |
| 580 | case FP_TYPE_EXPLICIT_PATH: |
| 581 | // |
| 582 | // Mark all Flow Entries for installation in the switches. |
| 583 | // |
| 584 | for (FlowEntry flowEntry : flowPath.flowEntries()) { |
| 585 | flowEntry.setFlowEntrySwitchState(FlowEntrySwitchState.FE_SWITCH_NOT_UPDATED); |
| 586 | } |
Pavlin Radoslavov | 2fca8d1 | 2013-12-04 09:39:06 -0800 | [diff] [blame] | 587 | modifiedFlowPaths.put(flowPath.flowId().value(), flowPath); |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 588 | break; |
Pavlin Radoslavov | 4839f6d | 2013-12-11 12:49:45 -0800 | [diff] [blame] | 589 | case FP_TYPE_UNKNOWN: |
| 590 | log.error("FlowPath event with unknown type"); |
| 591 | break; |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 592 | } |
Pavlin Radoslavov | 2fca8d1 | 2013-12-04 09:39:06 -0800 | [diff] [blame] | 593 | allFlowPaths.put(flowPath.flowId().value(), flowPath); |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 594 | |
| 595 | break; |
| 596 | } |
| 597 | |
| 598 | case ENTRY_REMOVE: { |
| 599 | // |
| 600 | // Remove an existing Flow Path. |
| 601 | // |
| 602 | // Find the Flow Path, and mark the Flow and its Flow Entries |
| 603 | // for deletion. |
| 604 | // |
| 605 | FlowPath existingFlowPath = |
| 606 | allFlowPaths.get(flowPath.flowId().value()); |
| 607 | if (existingFlowPath == null) |
| 608 | continue; // Nothing to do |
| 609 | |
| 610 | existingFlowPath.setFlowPathUserState(FlowPathUserState.FP_USER_DELETE); |
| 611 | for (FlowEntry flowEntry : existingFlowPath.flowEntries()) { |
| 612 | flowEntry.setFlowEntryUserState(FlowEntryUserState.FE_USER_DELETE); |
| 613 | flowEntry.setFlowEntrySwitchState(FlowEntrySwitchState.FE_SWITCH_NOT_UPDATED); |
| 614 | } |
| 615 | |
Pavlin Radoslavov | 2fca8d1 | 2013-12-04 09:39:06 -0800 | [diff] [blame] | 616 | // Remove the Flow Path from the internal state |
| 617 | Long key = existingFlowPath.flowId().value(); |
| 618 | allFlowPaths.remove(key); |
| 619 | shouldRecomputeFlowPaths.remove(key); |
| 620 | modifiedFlowPaths.put(key, existingFlowPath); |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 621 | |
| 622 | break; |
| 623 | } |
| 624 | } |
| 625 | } |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 626 | } |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 627 | |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 628 | /** |
| 629 | * Process the Topology events. |
| 630 | */ |
| 631 | private void processTopologyEvents() { |
Pavlin Radoslavov | 80bc3cf | 2014-01-08 11:17:30 -0800 | [diff] [blame] | 632 | if (enableOnrc2014MeasurementsTopology) { |
| 633 | if (topologyEvents.isEmpty()) |
| 634 | return; |
| 635 | log.debug("[BEFORE] {}", topology.toString()); |
| 636 | topology.readFromDatabase(dbHandler); |
| 637 | log.debug("[AFTER] {}", topology.toString()); |
| 638 | shouldRecomputeFlowPaths.putAll(allFlowPaths); |
| 639 | return; |
| 640 | } |
| 641 | |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 642 | // |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 643 | // Process all Topology events and update the appropriate state |
Pavlin Radoslavov | a23e541 | 2013-10-27 19:56:40 -0700 | [diff] [blame] | 644 | // |
| 645 | boolean isTopologyModified = false; |
Pavlin Radoslavov | 80bc3cf | 2014-01-08 11:17:30 -0800 | [diff] [blame] | 646 | for (EventEntry<TopologyElement> eventEntry : topologyEvents) { |
| 647 | TopologyElement topologyElement = eventEntry.eventData(); |
Naoki Shiota | 0abe38d | 2014-01-07 15:31:22 -0800 | [diff] [blame] | 648 | |
Pavlin Radoslavov | 80bc3cf | 2014-01-08 11:17:30 -0800 | [diff] [blame] | 649 | log.debug("Topology Event: {} {}", eventEntry.eventType(), |
| 650 | topologyElement.toString()); |
Pavlin Radoslavov | fb94edc | 2013-11-04 16:29:40 -0800 | [diff] [blame] | 651 | |
Pavlin Radoslavov | 80bc3cf | 2014-01-08 11:17:30 -0800 | [diff] [blame] | 652 | switch (eventEntry.eventType()) { |
| 653 | case ENTRY_ADD: |
| 654 | isTopologyModified |= topology.addTopologyElement(topologyElement); |
| 655 | break; |
| 656 | case ENTRY_REMOVE: |
| 657 | isTopologyModified |= topology.removeTopologyElement(topologyElement); |
| 658 | break; |
| 659 | } |
Pavlin Radoslavov | a23e541 | 2013-10-27 19:56:40 -0700 | [diff] [blame] | 660 | } |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 661 | if (isTopologyModified) { |
| 662 | // TODO: For now, if the topology changes, we recompute all Flows |
Pavlin Radoslavov | 2fca8d1 | 2013-12-04 09:39:06 -0800 | [diff] [blame] | 663 | shouldRecomputeFlowPaths.putAll(allFlowPaths); |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 664 | } |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 665 | } |
Pavlin Radoslavov | a23e541 | 2013-10-27 19:56:40 -0700 | [diff] [blame] | 666 | |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 667 | /** |
Pavlin Radoslavov | 9bb4055 | 2013-12-18 21:08:30 -0800 | [diff] [blame] | 668 | * Process previously received Flow Entries with unmatched Flow Paths. |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 669 | */ |
Pavlin Radoslavov | 9bb4055 | 2013-12-18 21:08:30 -0800 | [diff] [blame] | 670 | private void processUnmatchedFlowEntryAdd() { |
Pavlin Radoslavov | 6311717 | 2013-11-07 02:18:37 -0800 | [diff] [blame] | 671 | FlowPath flowPath; |
Pavlin Radoslavov | 237fde7 | 2013-12-17 22:21:06 -0800 | [diff] [blame] | 672 | FlowEntry localFlowEntry; |
Pavlin Radoslavov | 6311717 | 2013-11-07 02:18:37 -0800 | [diff] [blame] | 673 | |
Pavlin Radoslavov | 3ecd41e | 2013-10-29 14:29:30 -0700 | [diff] [blame] | 674 | // |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 675 | // Update Flow Entries with previously unmatched Flow Entry updates |
Pavlin Radoslavov | 1c24f22 | 2013-10-30 13:56:46 -0700 | [diff] [blame] | 676 | // |
Pavlin Radoslavov | 6311717 | 2013-11-07 02:18:37 -0800 | [diff] [blame] | 677 | if (! unmatchedFlowEntryAdd.isEmpty()) { |
| 678 | Map<Long, FlowEntry> remainingUpdates = new HashMap<Long, FlowEntry>(); |
| 679 | for (FlowEntry flowEntry : unmatchedFlowEntryAdd.values()) { |
Pavlin Radoslavov | 9bb4055 | 2013-12-18 21:08:30 -0800 | [diff] [blame] | 680 | // log.debug("Processing Unmatched Flow Entry: {}", |
| 681 | // flowEntry.toString()); |
| 682 | |
Pavlin Radoslavov | 6311717 | 2013-11-07 02:18:37 -0800 | [diff] [blame] | 683 | flowPath = allFlowPaths.get(flowEntry.flowId().value()); |
Pavlin Radoslavov | 9bb4055 | 2013-12-18 21:08:30 -0800 | [diff] [blame] | 684 | if (flowPath == null) { |
Pavlin Radoslavov | 6311717 | 2013-11-07 02:18:37 -0800 | [diff] [blame] | 685 | remainingUpdates.put(flowEntry.flowEntryId().value(), |
| 686 | flowEntry); |
| 687 | continue; |
| 688 | } |
Pavlin Radoslavov | 237fde7 | 2013-12-17 22:21:06 -0800 | [diff] [blame] | 689 | localFlowEntry = findFlowEntryAdd(flowPath, flowEntry); |
| 690 | if (localFlowEntry == null) { |
Pavlin Radoslavov | 6311717 | 2013-11-07 02:18:37 -0800 | [diff] [blame] | 691 | remainingUpdates.put(flowEntry.flowEntryId().value(), |
| 692 | flowEntry); |
| 693 | continue; |
| 694 | } |
Pavlin Radoslavov | 237fde7 | 2013-12-17 22:21:06 -0800 | [diff] [blame] | 695 | if (updateFlowEntryAdd(flowPath, localFlowEntry, flowEntry)) { |
| 696 | modifiedFlowPaths.put(flowPath.flowId().value(), flowPath); |
| 697 | } |
Pavlin Radoslavov | 1c24f22 | 2013-10-30 13:56:46 -0700 | [diff] [blame] | 698 | } |
Pavlin Radoslavov | 6311717 | 2013-11-07 02:18:37 -0800 | [diff] [blame] | 699 | unmatchedFlowEntryAdd = remainingUpdates; |
Pavlin Radoslavov | 1c24f22 | 2013-10-30 13:56:46 -0700 | [diff] [blame] | 700 | } |
Pavlin Radoslavov | 9bb4055 | 2013-12-18 21:08:30 -0800 | [diff] [blame] | 701 | } |
| 702 | |
| 703 | /** |
| 704 | * Process the Flow Entry events. |
| 705 | */ |
| 706 | private void processFlowEntryEvents() { |
| 707 | FlowPath flowPath; |
| 708 | FlowEntry localFlowEntry; |
Pavlin Radoslavov | 1c24f22 | 2013-10-30 13:56:46 -0700 | [diff] [blame] | 709 | |
| 710 | // |
Pavlin Radoslavov | 9f33edb | 2013-11-06 18:24:37 -0800 | [diff] [blame] | 711 | // Process all Flow Entry events and update the appropriate state |
Pavlin Radoslavov | 1c24f22 | 2013-10-30 13:56:46 -0700 | [diff] [blame] | 712 | // |
| 713 | for (EventEntry<FlowEntry> eventEntry : flowEntryEvents) { |
| 714 | FlowEntry flowEntry = eventEntry.eventData(); |
Pavlin Radoslavov | 6311717 | 2013-11-07 02:18:37 -0800 | [diff] [blame] | 715 | |
| 716 | log.debug("Flow Entry Event: {} {}", eventEntry.eventType(), |
Yuta HIGUCHI | 5302ddf | 2014-01-06 12:53:35 -0800 | [diff] [blame] | 717 | flowEntry); |
Pavlin Radoslavov | 6311717 | 2013-11-07 02:18:37 -0800 | [diff] [blame] | 718 | |
| 719 | if ((! flowEntry.isValidFlowId()) || |
| 720 | (! flowEntry.isValidFlowEntryId())) { |
| 721 | continue; |
| 722 | } |
| 723 | |
Pavlin Radoslavov | 1c24f22 | 2013-10-30 13:56:46 -0700 | [diff] [blame] | 724 | switch (eventEntry.eventType()) { |
| 725 | case ENTRY_ADD: |
Pavlin Radoslavov | 6311717 | 2013-11-07 02:18:37 -0800 | [diff] [blame] | 726 | flowPath = allFlowPaths.get(flowEntry.flowId().value()); |
| 727 | if (flowPath == null) { |
| 728 | // Flow Path not found: keep the entry for later matching |
| 729 | unmatchedFlowEntryAdd.put(flowEntry.flowEntryId().value(), |
| 730 | flowEntry); |
| 731 | break; |
| 732 | } |
Pavlin Radoslavov | 237fde7 | 2013-12-17 22:21:06 -0800 | [diff] [blame] | 733 | localFlowEntry = findFlowEntryAdd(flowPath, flowEntry); |
| 734 | if (localFlowEntry == null) { |
Pavlin Radoslavov | 6311717 | 2013-11-07 02:18:37 -0800 | [diff] [blame] | 735 | // Flow Entry not found: keep the entry for later matching |
| 736 | unmatchedFlowEntryAdd.put(flowEntry.flowEntryId().value(), |
| 737 | flowEntry); |
| 738 | break; |
| 739 | } |
Pavlin Radoslavov | 237fde7 | 2013-12-17 22:21:06 -0800 | [diff] [blame] | 740 | if (updateFlowEntryAdd(flowPath, localFlowEntry, flowEntry)) { |
| 741 | // Add the updated Flow Path to the list of updated paths |
| 742 | modifiedFlowPaths.put(flowPath.flowId().value(), flowPath); |
| 743 | } |
Pavlin Radoslavov | 1c24f22 | 2013-10-30 13:56:46 -0700 | [diff] [blame] | 744 | break; |
Pavlin Radoslavov | 6311717 | 2013-11-07 02:18:37 -0800 | [diff] [blame] | 745 | |
Pavlin Radoslavov | 1c24f22 | 2013-10-30 13:56:46 -0700 | [diff] [blame] | 746 | case ENTRY_REMOVE: |
Pavlin Radoslavov | 6311717 | 2013-11-07 02:18:37 -0800 | [diff] [blame] | 747 | flowEntry.setFlowEntryUserState(FlowEntryUserState.FE_USER_DELETE); |
| 748 | if (unmatchedFlowEntryAdd.remove(flowEntry.flowEntryId().value()) != null) { |
Pavlin Radoslavov | 2fca8d1 | 2013-12-04 09:39:06 -0800 | [diff] [blame] | 749 | continue; // Removed previously unmatched entry |
Pavlin Radoslavov | 6311717 | 2013-11-07 02:18:37 -0800 | [diff] [blame] | 750 | } |
Pavlin Radoslavov | 2fca8d1 | 2013-12-04 09:39:06 -0800 | [diff] [blame] | 751 | |
Pavlin Radoslavov | 6311717 | 2013-11-07 02:18:37 -0800 | [diff] [blame] | 752 | flowPath = allFlowPaths.get(flowEntry.flowId().value()); |
| 753 | if (flowPath == null) { |
| 754 | // Flow Path not found: ignore the update |
| 755 | break; |
| 756 | } |
Pavlin Radoslavov | 237fde7 | 2013-12-17 22:21:06 -0800 | [diff] [blame] | 757 | localFlowEntry = findFlowEntryRemove(flowPath, flowEntry); |
| 758 | if (localFlowEntry == null) { |
Pavlin Radoslavov | 2fca8d1 | 2013-12-04 09:39:06 -0800 | [diff] [blame] | 759 | // Flow Entry not found: ignore it |
Pavlin Radoslavov | 6311717 | 2013-11-07 02:18:37 -0800 | [diff] [blame] | 760 | break; |
| 761 | } |
Pavlin Radoslavov | 237fde7 | 2013-12-17 22:21:06 -0800 | [diff] [blame] | 762 | if (updateFlowEntryRemove(flowPath, localFlowEntry, |
| 763 | flowEntry)) { |
| 764 | // Add the updated Flow Path to the list of updated paths |
| 765 | modifiedFlowPaths.put(flowPath.flowId().value(), flowPath); |
| 766 | } |
Pavlin Radoslavov | 1c24f22 | 2013-10-30 13:56:46 -0700 | [diff] [blame] | 767 | break; |
| 768 | } |
| 769 | } |
Pavlin Radoslavov | 1c24f22 | 2013-10-30 13:56:46 -0700 | [diff] [blame] | 770 | } |
| 771 | |
| 772 | /** |
Pavlin Radoslavov | 237fde7 | 2013-12-17 22:21:06 -0800 | [diff] [blame] | 773 | * Find a Flow Entry that should be updated because of an external |
| 774 | * ENTRY_ADD event. |
Pavlin Radoslavov | 1c24f22 | 2013-10-30 13:56:46 -0700 | [diff] [blame] | 775 | * |
Pavlin Radoslavov | 6311717 | 2013-11-07 02:18:37 -0800 | [diff] [blame] | 776 | * @param flowPath the FlowPath for the Flow Entry to update. |
Pavlin Radoslavov | 237fde7 | 2013-12-17 22:21:06 -0800 | [diff] [blame] | 777 | * @param newFlowEntry the FlowEntry with the new state. |
| 778 | * @return the Flow Entry that should be updated if found, otherwise null. |
Pavlin Radoslavov | 1c24f22 | 2013-10-30 13:56:46 -0700 | [diff] [blame] | 779 | */ |
Pavlin Radoslavov | 237fde7 | 2013-12-17 22:21:06 -0800 | [diff] [blame] | 780 | private FlowEntry findFlowEntryAdd(FlowPath flowPath, |
| 781 | FlowEntry newFlowEntry) { |
Pavlin Radoslavov | 1c24f22 | 2013-10-30 13:56:46 -0700 | [diff] [blame] | 782 | // |
Pavlin Radoslavov | 6311717 | 2013-11-07 02:18:37 -0800 | [diff] [blame] | 783 | // Iterate over all Flow Entries and find a match. |
Pavlin Radoslavov | 1c24f22 | 2013-10-30 13:56:46 -0700 | [diff] [blame] | 784 | // |
| 785 | for (FlowEntry localFlowEntry : flowPath.flowEntries()) { |
Pavlin Radoslavov | 6311717 | 2013-11-07 02:18:37 -0800 | [diff] [blame] | 786 | if (! TopologyManager.isSameFlowEntryDataPath(localFlowEntry, |
Pavlin Radoslavov | 237fde7 | 2013-12-17 22:21:06 -0800 | [diff] [blame] | 787 | newFlowEntry)) { |
Pavlin Radoslavov | 1c24f22 | 2013-10-30 13:56:46 -0700 | [diff] [blame] | 788 | continue; |
Pavlin Radoslavov | 6311717 | 2013-11-07 02:18:37 -0800 | [diff] [blame] | 789 | } |
Pavlin Radoslavov | 1c24f22 | 2013-10-30 13:56:46 -0700 | [diff] [blame] | 790 | |
| 791 | // |
| 792 | // Local Flow Entry match found |
| 793 | // |
| 794 | if (localFlowEntry.isValidFlowEntryId()) { |
| 795 | if (localFlowEntry.flowEntryId().value() != |
Pavlin Radoslavov | 237fde7 | 2013-12-17 22:21:06 -0800 | [diff] [blame] | 796 | newFlowEntry.flowEntryId().value()) { |
Pavlin Radoslavov | 1c24f22 | 2013-10-30 13:56:46 -0700 | [diff] [blame] | 797 | // |
| 798 | // Find a local Flow Entry, but the Flow Entry ID doesn't |
Pavlin Radoslavov | 6311717 | 2013-11-07 02:18:37 -0800 | [diff] [blame] | 799 | // match. Keep looking. |
Pavlin Radoslavov | 1c24f22 | 2013-10-30 13:56:46 -0700 | [diff] [blame] | 800 | // |
Pavlin Radoslavov | 6311717 | 2013-11-07 02:18:37 -0800 | [diff] [blame] | 801 | continue; |
Pavlin Radoslavov | 1c24f22 | 2013-10-30 13:56:46 -0700 | [diff] [blame] | 802 | } |
Pavlin Radoslavov | 1c24f22 | 2013-10-30 13:56:46 -0700 | [diff] [blame] | 803 | } |
Pavlin Radoslavov | 237fde7 | 2013-12-17 22:21:06 -0800 | [diff] [blame] | 804 | return localFlowEntry; |
| 805 | } |
Pavlin Radoslavov | 1c24f22 | 2013-10-30 13:56:46 -0700 | [diff] [blame] | 806 | |
Pavlin Radoslavov | 237fde7 | 2013-12-17 22:21:06 -0800 | [diff] [blame] | 807 | return null; // Entry not found |
| 808 | } |
| 809 | |
| 810 | /** |
| 811 | * Update a Flow Entry because of an external ENTRY_ADD event. |
| 812 | * |
| 813 | * @param flowPath the FlowPath for the Flow Entry to update. |
| 814 | * @param localFlowEntry the local Flow Entry to update. |
| 815 | * @param newFlowEntry the FlowEntry with the new state. |
| 816 | * @return true if the local Flow Entry was updated, otherwise false. |
| 817 | */ |
| 818 | private boolean updateFlowEntryAdd(FlowPath flowPath, |
| 819 | FlowEntry localFlowEntry, |
| 820 | FlowEntry newFlowEntry) { |
| 821 | boolean updated = false; |
| 822 | |
| 823 | if (localFlowEntry.flowEntryUserState() == |
| 824 | FlowEntryUserState.FE_USER_DELETE) { |
| 825 | // Don't add-back a Flow Entry that is already deleted |
| 826 | return false; |
| 827 | } |
| 828 | |
| 829 | if (! localFlowEntry.isValidFlowEntryId()) { |
| 830 | // Update the Flow Entry ID |
| 831 | FlowEntryId flowEntryId = |
| 832 | new FlowEntryId(newFlowEntry.flowEntryId().value()); |
| 833 | localFlowEntry.setFlowEntryId(flowEntryId); |
| 834 | updated = true; |
| 835 | } |
| 836 | |
| 837 | // |
| 838 | // Update the local Flow Entry, and keep state to check |
| 839 | // if the Flow Path has been installed. |
| 840 | // |
| 841 | if (localFlowEntry.flowEntryUserState() != |
| 842 | newFlowEntry.flowEntryUserState()) { |
| 843 | localFlowEntry.setFlowEntryUserState( |
| 844 | newFlowEntry.flowEntryUserState()); |
| 845 | updated = true; |
| 846 | } |
| 847 | if (localFlowEntry.flowEntrySwitchState() != |
| 848 | newFlowEntry.flowEntrySwitchState()) { |
| 849 | localFlowEntry.setFlowEntrySwitchState( |
| 850 | newFlowEntry.flowEntrySwitchState()); |
Pavlin Radoslavov | 7208e9a | 2013-12-11 14:31:07 -0800 | [diff] [blame] | 851 | checkIfInstalledFlowPaths.put(flowPath.flowId().value(), flowPath); |
Pavlin Radoslavov | 237fde7 | 2013-12-17 22:21:06 -0800 | [diff] [blame] | 852 | updated = true; |
| 853 | } |
| 854 | |
| 855 | return updated; |
| 856 | } |
| 857 | |
| 858 | /** |
| 859 | * Find a Flow Entry that should be updated because of an external |
| 860 | * ENTRY_REMOVE event. |
| 861 | * |
| 862 | * @param flowPath the FlowPath for the Flow Entry to update. |
| 863 | * @param newFlowEntry the FlowEntry with the new state. |
| 864 | * @return the Flow Entry that should be updated if found, otherwise null. |
| 865 | */ |
| 866 | private FlowEntry findFlowEntryRemove(FlowPath flowPath, |
| 867 | FlowEntry newFlowEntry) { |
| 868 | // |
| 869 | // Iterate over all Flow Entries and find a match based on |
| 870 | // the Flow Entry ID. |
| 871 | // |
| 872 | for (FlowEntry localFlowEntry : flowPath.flowEntries()) { |
| 873 | if (! localFlowEntry.isValidFlowEntryId()) |
| 874 | continue; |
| 875 | if (localFlowEntry.flowEntryId().value() != |
| 876 | newFlowEntry.flowEntryId().value()) { |
| 877 | continue; |
| 878 | } |
Pavlin Radoslavov | 6311717 | 2013-11-07 02:18:37 -0800 | [diff] [blame] | 879 | return localFlowEntry; |
Pavlin Radoslavov | 1c24f22 | 2013-10-30 13:56:46 -0700 | [diff] [blame] | 880 | } |
| 881 | |
Pavlin Radoslavov | 6311717 | 2013-11-07 02:18:37 -0800 | [diff] [blame] | 882 | return null; // Entry not found |
| 883 | } |
| 884 | |
| 885 | /** |
| 886 | * Update a Flow Entry because of an external ENTRY_REMOVE event. |
| 887 | * |
| 888 | * @param flowPath the FlowPath for the Flow Entry to update. |
Pavlin Radoslavov | 237fde7 | 2013-12-17 22:21:06 -0800 | [diff] [blame] | 889 | * @param localFlowEntry the local Flow Entry to update. |
| 890 | * @param newFlowEntry the FlowEntry with the new state. |
| 891 | * @return true if the local Flow Entry was updated, otherwise false. |
Pavlin Radoslavov | 6311717 | 2013-11-07 02:18:37 -0800 | [diff] [blame] | 892 | */ |
Pavlin Radoslavov | 237fde7 | 2013-12-17 22:21:06 -0800 | [diff] [blame] | 893 | private boolean updateFlowEntryRemove(FlowPath flowPath, |
| 894 | FlowEntry localFlowEntry, |
| 895 | FlowEntry newFlowEntry) { |
| 896 | boolean updated = false; |
| 897 | |
Pavlin Radoslavov | 6311717 | 2013-11-07 02:18:37 -0800 | [diff] [blame] | 898 | // |
Pavlin Radoslavov | 237fde7 | 2013-12-17 22:21:06 -0800 | [diff] [blame] | 899 | // Update the local Flow Entry. |
Pavlin Radoslavov | 6311717 | 2013-11-07 02:18:37 -0800 | [diff] [blame] | 900 | // |
Pavlin Radoslavov | 237fde7 | 2013-12-17 22:21:06 -0800 | [diff] [blame] | 901 | if (localFlowEntry.flowEntryUserState() != |
| 902 | newFlowEntry.flowEntryUserState()) { |
| 903 | localFlowEntry.setFlowEntryUserState( |
| 904 | newFlowEntry.flowEntryUserState()); |
| 905 | updated = true; |
| 906 | } |
| 907 | if (localFlowEntry.flowEntrySwitchState() != |
| 908 | newFlowEntry.flowEntrySwitchState()) { |
| 909 | localFlowEntry.setFlowEntrySwitchState( |
| 910 | newFlowEntry.flowEntrySwitchState()); |
| 911 | updated = true; |
Pavlin Radoslavov | 6311717 | 2013-11-07 02:18:37 -0800 | [diff] [blame] | 912 | } |
| 913 | |
Pavlin Radoslavov | 237fde7 | 2013-12-17 22:21:06 -0800 | [diff] [blame] | 914 | return updated; |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 915 | } |
| 916 | |
| 917 | /** |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 918 | * Recompute a Flow Path. |
| 919 | * |
| 920 | * @param flowPath the Flow Path to recompute. |
| 921 | * @return true if the recomputed Flow Path has changed, otherwise false. |
| 922 | */ |
| 923 | private boolean recomputeFlowPath(FlowPath flowPath) { |
| 924 | boolean hasChanged = false; |
| 925 | |
| 926 | // |
| 927 | // Test whether the Flow Path needs to be recomputed |
| 928 | // |
| 929 | switch (flowPath.flowPathType()) { |
Yuta HIGUCHI | e1038fb | 2013-10-30 15:35:18 -0700 | [diff] [blame] | 930 | case FP_TYPE_UNKNOWN: |
| 931 | return false; // Can't recompute on Unknown FlowType |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 932 | case FP_TYPE_SHORTEST_PATH: |
| 933 | break; |
| 934 | case FP_TYPE_EXPLICIT_PATH: |
| 935 | return false; // An explicit path never changes |
| 936 | } |
| 937 | |
| 938 | DataPath oldDataPath = flowPath.dataPath(); |
| 939 | |
Pavlin Radoslavov | 3ecd41e | 2013-10-29 14:29:30 -0700 | [diff] [blame] | 940 | // Compute the new path |
| 941 | DataPath newDataPath = TopologyManager.computeNetworkPath(topology, |
| 942 | flowPath); |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 943 | if (newDataPath == null) { |
| 944 | // We need the DataPath to compare the paths |
| 945 | newDataPath = new DataPath(); |
| 946 | } |
| 947 | newDataPath.applyFlowPathFlags(flowPath.flowPathFlags()); |
| 948 | |
| 949 | // |
Pavlin Radoslavov | 3ecd41e | 2013-10-29 14:29:30 -0700 | [diff] [blame] | 950 | // Test whether the new path is same |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 951 | // |
| 952 | if (oldDataPath.flowEntries().size() != |
| 953 | newDataPath.flowEntries().size()) { |
| 954 | hasChanged = true; |
| 955 | } else { |
| 956 | Iterator<FlowEntry> oldIter = oldDataPath.flowEntries().iterator(); |
| 957 | Iterator<FlowEntry> newIter = newDataPath.flowEntries().iterator(); |
| 958 | while (oldIter.hasNext() && newIter.hasNext()) { |
| 959 | FlowEntry oldFlowEntry = oldIter.next(); |
| 960 | FlowEntry newFlowEntry = newIter.next(); |
Pavlin Radoslavov | 3ecd41e | 2013-10-29 14:29:30 -0700 | [diff] [blame] | 961 | if (! TopologyManager.isSameFlowEntryDataPath(oldFlowEntry, |
| 962 | newFlowEntry)) { |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 963 | hasChanged = true; |
| 964 | break; |
| 965 | } |
| 966 | } |
| 967 | } |
| 968 | if (! hasChanged) |
| 969 | return hasChanged; |
| 970 | |
| 971 | // |
Pavlin Radoslavov | 3ecd41e | 2013-10-29 14:29:30 -0700 | [diff] [blame] | 972 | // Merge the changes in the path: |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 973 | // - If a Flow Entry for a switch is in the old data path, but not |
| 974 | // in the new data path, then mark it for deletion. |
| 975 | // - If a Flow Entry for a switch is in the new data path, but not |
| 976 | // in the old data path, then mark it for addition. |
| 977 | // - If a Flow Entry for a switch is in both the old and the new |
| 978 | // data path, but it has changed, e.g., the incoming and/or outgoing |
| 979 | // port(s), then mark the old Flow Entry for deletion, and mark |
| 980 | // the new Flow Entry for addition. |
| 981 | // - If a Flow Entry for a switch is in both the old and the new |
| 982 | // data path, and it hasn't changed, then just keep it. |
| 983 | // |
| 984 | // NOTE: We use the Switch DPID of each entry to match the entries |
| 985 | // |
| 986 | Map<Long, FlowEntry> oldFlowEntriesMap = new HashMap<Long, FlowEntry>(); |
| 987 | Map<Long, FlowEntry> newFlowEntriesMap = new HashMap<Long, FlowEntry>(); |
| 988 | ArrayList<FlowEntry> finalFlowEntries = new ArrayList<FlowEntry>(); |
| 989 | List<FlowEntry> deletedFlowEntries = new LinkedList<FlowEntry>(); |
| 990 | |
| 991 | // Prepare maps with the Flow Entries, so they are fast to lookup |
| 992 | for (FlowEntry flowEntry : oldDataPath.flowEntries()) |
| 993 | oldFlowEntriesMap.put(flowEntry.dpid().value(), flowEntry); |
| 994 | for (FlowEntry flowEntry : newDataPath.flowEntries()) |
| 995 | newFlowEntriesMap.put(flowEntry.dpid().value(), flowEntry); |
| 996 | |
| 997 | // |
| 998 | // Find the old Flow Entries that should be deleted |
| 999 | // |
| 1000 | for (FlowEntry oldFlowEntry : oldDataPath.flowEntries()) { |
| 1001 | FlowEntry newFlowEntry = |
| 1002 | newFlowEntriesMap.get(oldFlowEntry.dpid().value()); |
| 1003 | if (newFlowEntry == null) { |
Pavlin Radoslavov | fb94edc | 2013-11-04 16:29:40 -0800 | [diff] [blame] | 1004 | // The old Flow Entry should be deleted: not on the path |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 1005 | oldFlowEntry.setFlowEntryUserState(FlowEntryUserState.FE_USER_DELETE); |
| 1006 | oldFlowEntry.setFlowEntrySwitchState(FlowEntrySwitchState.FE_SWITCH_NOT_UPDATED); |
| 1007 | deletedFlowEntries.add(oldFlowEntry); |
| 1008 | } |
| 1009 | } |
| 1010 | |
| 1011 | // |
| 1012 | // Find the new Flow Entries that should be added or updated |
| 1013 | // |
| 1014 | int idx = 0; |
| 1015 | for (FlowEntry newFlowEntry : newDataPath.flowEntries()) { |
| 1016 | FlowEntry oldFlowEntry = |
| 1017 | oldFlowEntriesMap.get(newFlowEntry.dpid().value()); |
| 1018 | |
| 1019 | if ((oldFlowEntry != null) && |
Pavlin Radoslavov | 3ecd41e | 2013-10-29 14:29:30 -0700 | [diff] [blame] | 1020 | TopologyManager.isSameFlowEntryDataPath(oldFlowEntry, |
| 1021 | newFlowEntry)) { |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 1022 | // |
| 1023 | // Both Flow Entries are same |
| 1024 | // |
| 1025 | finalFlowEntries.add(oldFlowEntry); |
| 1026 | idx++; |
| 1027 | continue; |
| 1028 | } |
| 1029 | |
| 1030 | if (oldFlowEntry != null) { |
| 1031 | // |
Pavlin Radoslavov | fb94edc | 2013-11-04 16:29:40 -0800 | [diff] [blame] | 1032 | // The old Flow Entry should be deleted: path diverges |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 1033 | // |
| 1034 | oldFlowEntry.setFlowEntryUserState(FlowEntryUserState.FE_USER_DELETE); |
| 1035 | oldFlowEntry.setFlowEntrySwitchState(FlowEntrySwitchState.FE_SWITCH_NOT_UPDATED); |
| 1036 | deletedFlowEntries.add(oldFlowEntry); |
| 1037 | } |
| 1038 | |
| 1039 | // |
| 1040 | // Add the new Flow Entry |
| 1041 | // |
Pavlin Radoslavov | 1c24f22 | 2013-10-30 13:56:46 -0700 | [diff] [blame] | 1042 | // |
| 1043 | // NOTE: Assign only the Flow ID. |
| 1044 | // The Flow Entry ID is assigned later only for the Flow Entries |
| 1045 | // this instance is responsible for. |
| 1046 | // |
| 1047 | newFlowEntry.setFlowId(new FlowId(flowPath.flowId().value())); |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 1048 | |
Pavlin Radoslavov | a4df952 | 2013-12-03 11:03:04 -0800 | [diff] [blame] | 1049 | // |
Pavlin Radoslavov | 6fde217 | 2013-12-10 11:23:18 -0800 | [diff] [blame] | 1050 | // Copy the Flow timeouts |
| 1051 | // |
| 1052 | newFlowEntry.setIdleTimeout(flowPath.idleTimeout()); |
| 1053 | newFlowEntry.setHardTimeout(flowPath.hardTimeout()); |
| 1054 | |
| 1055 | // |
Pavlin Radoslavov | a4df952 | 2013-12-03 11:03:04 -0800 | [diff] [blame] | 1056 | // Allocate the FlowEntryMatch by copying the default one |
| 1057 | // from the FlowPath (if set). |
| 1058 | // |
| 1059 | FlowEntryMatch flowEntryMatch = null; |
| 1060 | if (flowPath.flowEntryMatch() != null) |
| 1061 | flowEntryMatch = new FlowEntryMatch(flowPath.flowEntryMatch()); |
| 1062 | else |
| 1063 | flowEntryMatch = new FlowEntryMatch(); |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 1064 | newFlowEntry.setFlowEntryMatch(flowEntryMatch); |
Pavlin Radoslavov | a4df952 | 2013-12-03 11:03:04 -0800 | [diff] [blame] | 1065 | |
| 1066 | // Set the incoming port matching |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 1067 | flowEntryMatch.enableInPort(newFlowEntry.inPort()); |
| 1068 | |
| 1069 | // |
| 1070 | // Set the actions: |
| 1071 | // If the first Flow Entry, copy the Flow Path actions to it. |
| 1072 | // |
| 1073 | FlowEntryActions flowEntryActions = newFlowEntry.flowEntryActions(); |
| 1074 | if ((idx == 0) && (flowPath.flowEntryActions() != null)) { |
| 1075 | FlowEntryActions flowActions = |
| 1076 | new FlowEntryActions(flowPath.flowEntryActions()); |
| 1077 | for (FlowEntryAction action : flowActions.actions()) |
| 1078 | flowEntryActions.addAction(action); |
| 1079 | } |
| 1080 | idx++; |
| 1081 | |
| 1082 | // |
| 1083 | // Add the outgoing port output action |
| 1084 | // |
| 1085 | FlowEntryAction flowEntryAction = new FlowEntryAction(); |
| 1086 | flowEntryAction.setActionOutput(newFlowEntry.outPort()); |
| 1087 | flowEntryActions.addAction(flowEntryAction); |
| 1088 | |
| 1089 | // |
| 1090 | // Set the state of the new Flow Entry |
| 1091 | // |
| 1092 | newFlowEntry.setFlowEntryUserState(FlowEntryUserState.FE_USER_ADD); |
| 1093 | newFlowEntry.setFlowEntrySwitchState(FlowEntrySwitchState.FE_SWITCH_NOT_UPDATED); |
| 1094 | finalFlowEntries.add(newFlowEntry); |
| 1095 | } |
| 1096 | |
| 1097 | // |
| 1098 | // Replace the old Flow Entries with the new Flow Entries. |
| 1099 | // Note that the Flow Entries that will be deleted are added at |
| 1100 | // the end. |
| 1101 | // |
Pavlin Radoslavov | fb94edc | 2013-11-04 16:29:40 -0800 | [diff] [blame] | 1102 | finalFlowEntries.addAll(deletedFlowEntries); |
Pavlin Radoslavov | fb06a9e | 2013-10-28 23:56:15 -0700 | [diff] [blame] | 1103 | flowPath.dataPath().setFlowEntries(finalFlowEntries); |
| 1104 | |
| 1105 | return hasChanged; |
| 1106 | } |
| 1107 | |
| 1108 | /** |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 1109 | * Receive a notification that a Flow is added. |
| 1110 | * |
Pavlin Radoslavov | b750684 | 2013-10-29 17:46:54 -0700 | [diff] [blame] | 1111 | * @param flowPath the Flow that is added. |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 1112 | */ |
| 1113 | @Override |
| 1114 | public void notificationRecvFlowAdded(FlowPath flowPath) { |
| 1115 | EventEntry<FlowPath> eventEntry = |
| 1116 | new EventEntry<FlowPath>(EventEntry.Type.ENTRY_ADD, flowPath); |
| 1117 | networkEvents.add(eventEntry); |
| 1118 | } |
| 1119 | |
| 1120 | /** |
| 1121 | * Receive a notification that a Flow is removed. |
| 1122 | * |
Pavlin Radoslavov | b750684 | 2013-10-29 17:46:54 -0700 | [diff] [blame] | 1123 | * @param flowPath the Flow that is removed. |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 1124 | */ |
| 1125 | @Override |
| 1126 | public void notificationRecvFlowRemoved(FlowPath flowPath) { |
| 1127 | EventEntry<FlowPath> eventEntry = |
| 1128 | new EventEntry<FlowPath>(EventEntry.Type.ENTRY_REMOVE, flowPath); |
| 1129 | networkEvents.add(eventEntry); |
| 1130 | } |
| 1131 | |
| 1132 | /** |
| 1133 | * Receive a notification that a Flow is updated. |
| 1134 | * |
Pavlin Radoslavov | b750684 | 2013-10-29 17:46:54 -0700 | [diff] [blame] | 1135 | * @param flowPath the Flow that is updated. |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 1136 | */ |
| 1137 | @Override |
| 1138 | public void notificationRecvFlowUpdated(FlowPath flowPath) { |
| 1139 | // NOTE: The ADD and UPDATE events are processed in same way |
| 1140 | EventEntry<FlowPath> eventEntry = |
| 1141 | new EventEntry<FlowPath>(EventEntry.Type.ENTRY_ADD, flowPath); |
| 1142 | networkEvents.add(eventEntry); |
| 1143 | } |
| 1144 | |
| 1145 | /** |
Pavlin Radoslavov | b750684 | 2013-10-29 17:46:54 -0700 | [diff] [blame] | 1146 | * Receive a notification that a FlowEntry is added. |
| 1147 | * |
| 1148 | * @param flowEntry the FlowEntry that is added. |
| 1149 | */ |
| 1150 | @Override |
| 1151 | public void notificationRecvFlowEntryAdded(FlowEntry flowEntry) { |
| 1152 | EventEntry<FlowEntry> eventEntry = |
| 1153 | new EventEntry<FlowEntry>(EventEntry.Type.ENTRY_ADD, flowEntry); |
| 1154 | networkEvents.add(eventEntry); |
| 1155 | } |
| 1156 | |
| 1157 | /** |
| 1158 | * Receive a notification that a FlowEntry is removed. |
| 1159 | * |
| 1160 | * @param flowEntry the FlowEntry that is removed. |
| 1161 | */ |
| 1162 | @Override |
| 1163 | public void notificationRecvFlowEntryRemoved(FlowEntry flowEntry) { |
| 1164 | EventEntry<FlowEntry> eventEntry = |
| 1165 | new EventEntry<FlowEntry>(EventEntry.Type.ENTRY_REMOVE, flowEntry); |
| 1166 | networkEvents.add(eventEntry); |
| 1167 | } |
| 1168 | |
| 1169 | /** |
| 1170 | * Receive a notification that a FlowEntry is updated. |
| 1171 | * |
| 1172 | * @param flowEntry the FlowEntry that is updated. |
| 1173 | */ |
| 1174 | @Override |
| 1175 | public void notificationRecvFlowEntryUpdated(FlowEntry flowEntry) { |
| 1176 | // NOTE: The ADD and UPDATE events are processed in same way |
| 1177 | EventEntry<FlowEntry> eventEntry = |
| 1178 | new EventEntry<FlowEntry>(EventEntry.Type.ENTRY_ADD, flowEntry); |
| 1179 | networkEvents.add(eventEntry); |
| 1180 | } |
| 1181 | |
| 1182 | /** |
Pavlin Radoslavov | 2004fa0 | 2014-01-07 14:46:42 -0800 | [diff] [blame] | 1183 | * Receive a notification that a FlowId is added. |
| 1184 | * |
| 1185 | * @param flowId the FlowId that is added. |
| 1186 | */ |
| 1187 | @Override |
| 1188 | public void notificationRecvFlowIdAdded(FlowId flowId) { |
| 1189 | EventEntry<FlowId> eventEntry = |
| 1190 | new EventEntry<FlowId>(EventEntry.Type.ENTRY_ADD, flowId); |
| 1191 | networkEvents.add(eventEntry); |
| 1192 | } |
| 1193 | |
| 1194 | /** |
| 1195 | * Receive a notification that a FlowId is removed. |
| 1196 | * |
| 1197 | * @param flowId the FlowId that is removed. |
| 1198 | */ |
| 1199 | @Override |
| 1200 | public void notificationRecvFlowIdRemoved(FlowId flowId) { |
| 1201 | EventEntry<FlowId> eventEntry = |
| 1202 | new EventEntry<FlowId>(EventEntry.Type.ENTRY_REMOVE, flowId); |
| 1203 | networkEvents.add(eventEntry); |
| 1204 | } |
| 1205 | |
| 1206 | /** |
| 1207 | * Receive a notification that a FlowId is updated. |
| 1208 | * |
| 1209 | * @param flowId the FlowId that is updated. |
| 1210 | */ |
| 1211 | @Override |
| 1212 | public void notificationRecvFlowIdUpdated(FlowId flowId) { |
| 1213 | // NOTE: The ADD and UPDATE events are processed in same way |
| 1214 | EventEntry<FlowId> eventEntry = |
| 1215 | new EventEntry<FlowId>(EventEntry.Type.ENTRY_ADD, flowId); |
| 1216 | networkEvents.add(eventEntry); |
| 1217 | } |
| 1218 | |
| 1219 | /** |
Pavlin Radoslavov | 909da3c | 2014-01-09 04:04:33 -0800 | [diff] [blame^] | 1220 | * Receive a notification that a FlowEntryId is added. |
| 1221 | * |
| 1222 | * @param flowEntryId the FlowEntryId that is added. |
| 1223 | * @param dpid the Switch Dpid for the corresponding Flow Entry. |
| 1224 | */ |
| 1225 | @Override |
| 1226 | public void notificationRecvFlowEntryIdAdded(FlowEntryId flowEntryId, |
| 1227 | Dpid dpid) { |
| 1228 | // TODO: Implement it! |
| 1229 | /* |
| 1230 | EventEntry<FlowEntryId> eventEntry = |
| 1231 | new EventEntry<FlowEntryId>(EventEntry.Type.ENTRY_ADD, flowEntryId); |
| 1232 | networkEvents.add(eventEntry); |
| 1233 | */ |
| 1234 | } |
| 1235 | |
| 1236 | /** |
| 1237 | * Receive a notification that a FlowEntryId is removed. |
| 1238 | * |
| 1239 | * @param flowEntryId the FlowEntryId that is removed. |
| 1240 | * @param dpid the Switch Dpid for the corresponding Flow Entry. |
| 1241 | */ |
| 1242 | @Override |
| 1243 | public void notificationRecvFlowEntryIdRemoved(FlowEntryId flowEntryId, |
| 1244 | Dpid dpid) { |
| 1245 | // TODO: Implement it! |
| 1246 | /* |
| 1247 | EventEntry<FlowEntryId> eventEntry = |
| 1248 | new EventEntry<FlowEntryId>(EventEntry.Type.ENTRY_REMOVE, flowEntryId); |
| 1249 | networkEvents.add(eventEntry); |
| 1250 | */ |
| 1251 | } |
| 1252 | |
| 1253 | /** |
| 1254 | * Receive a notification that a FlowEntryId is updated. |
| 1255 | * |
| 1256 | * @param flowEntryId the FlowEntryId that is updated. |
| 1257 | * @param dpid the Switch Dpid for the corresponding Flow Entry. |
| 1258 | */ |
| 1259 | @Override |
| 1260 | public void notificationRecvFlowEntryIdUpdated(FlowEntryId flowEntryId, |
| 1261 | Dpid dpid) { |
| 1262 | // TODO: Implement it! |
| 1263 | /* |
| 1264 | // NOTE: The ADD and UPDATE events are processed in same way |
| 1265 | EventEntry<FlowEntryId> eventEntry = |
| 1266 | new EventEntry<FlowEntryId>(EventEntry.Type.ENTRY_ADD, flowEntryId); |
| 1267 | networkEvents.add(eventEntry); |
| 1268 | */ |
| 1269 | } |
| 1270 | |
| 1271 | /** |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 1272 | * Receive a notification that a Topology Element is added. |
| 1273 | * |
| 1274 | * @param topologyElement the Topology Element that is added. |
| 1275 | */ |
| 1276 | @Override |
| 1277 | public void notificationRecvTopologyElementAdded(TopologyElement topologyElement) { |
| 1278 | EventEntry<TopologyElement> eventEntry = |
| 1279 | new EventEntry<TopologyElement>(EventEntry.Type.ENTRY_ADD, topologyElement); |
| 1280 | networkEvents.add(eventEntry); |
| 1281 | } |
| 1282 | |
| 1283 | /** |
| 1284 | * Receive a notification that a Topology Element is removed. |
| 1285 | * |
| 1286 | * @param topologyElement the Topology Element that is removed. |
| 1287 | */ |
| 1288 | @Override |
| 1289 | public void notificationRecvTopologyElementRemoved(TopologyElement topologyElement) { |
| 1290 | EventEntry<TopologyElement> eventEntry = |
| 1291 | new EventEntry<TopologyElement>(EventEntry.Type.ENTRY_REMOVE, topologyElement); |
| 1292 | networkEvents.add(eventEntry); |
| 1293 | } |
| 1294 | |
| 1295 | /** |
| 1296 | * Receive a notification that a Topology Element is updated. |
| 1297 | * |
| 1298 | * @param topologyElement the Topology Element that is updated. |
| 1299 | */ |
| 1300 | @Override |
| 1301 | public void notificationRecvTopologyElementUpdated(TopologyElement topologyElement) { |
| 1302 | // NOTE: The ADD and UPDATE events are processed in same way |
| 1303 | EventEntry<TopologyElement> eventEntry = |
| 1304 | new EventEntry<TopologyElement>(EventEntry.Type.ENTRY_ADD, topologyElement); |
| 1305 | networkEvents.add(eventEntry); |
| 1306 | } |
Pavlin Radoslavov | 5321980 | 2013-12-06 11:02:04 -0800 | [diff] [blame] | 1307 | |
| 1308 | /** |
| 1309 | * Get a sorted copy of all Flow Paths. |
| 1310 | * |
| 1311 | * @return a sorted copy of all Flow Paths. |
| 1312 | */ |
| 1313 | synchronized SortedMap<Long, FlowPath> getAllFlowPathsCopy() { |
| 1314 | SortedMap<Long, FlowPath> sortedFlowPaths = |
| 1315 | new TreeMap<Long, FlowPath>(); |
| 1316 | |
| 1317 | // |
| 1318 | // TODO: For now we use serialization/deserialization to create |
| 1319 | // a copy of each Flow Path. In the future, we should use proper |
| 1320 | // copy constructors. |
| 1321 | // |
| 1322 | Kryo kryo = kryoFactory.newKryo(); |
| 1323 | synchronized (allFlowPaths) { |
| 1324 | for (Map.Entry<Long, FlowPath> entry : allFlowPaths.entrySet()) { |
| 1325 | FlowPath origFlowPath = entry.getValue(); |
| 1326 | FlowPath copyFlowPath = kryo.copy(origFlowPath); |
| 1327 | sortedFlowPaths.put(entry.getKey(), copyFlowPath); |
| 1328 | } |
| 1329 | } |
| 1330 | kryoFactory.deleteKryo(kryo); |
| 1331 | |
| 1332 | return sortedFlowPaths; |
| 1333 | } |
Pavlin Radoslavov | 6b79f2b | 2013-10-26 21:31:10 -0700 | [diff] [blame] | 1334 | } |