diff --git a/ryu/app/network_awareness/README.md b/ryu/app/network_awareness/README.md index d87d43723..393a1c587 100644 --- a/ryu/app/network_awareness/README.md +++ b/ryu/app/network_awareness/README.md @@ -1,20 +1,25 @@ ##Network Awareness -Network Awareness is a set of Ryu applications to collecting the basic network information including the topology, link delay, and link free bandwidth. Also, the Shortest\_forwarding.py application can achieve the shortest path forwarding based on hop or delay. Actually, it can based on bandwidth easily if you make a little bit change of code. The detail information of modules shows below. +Network Awareness is a set of Ryu applications to collecting the basic network information including the topology, link delay, and link free bandwidth. Also, the Shortest\_forwarding.py application can achieve the shortest path forwarding based on HOP, DELAY and BANDWIDTH. You can set model of computing shortest path when starting Ryu by adding "weight" argument. Moreover, you can set "k-paths" argument to support K-Shortest paths computing. Fortunately, our application supports load balance based on dynamic traffic information. -* NetworkAwareness is a module for collecting network information. +The detail information of modules shows below. -* NetworkMonitor is a module for collecting network traffic information. +* Network Aware is a module for collecting network information. -* NetworkDelayDetector is a module for collecting link delay information. [Coming soon] +* Network Monitor is a module for collecting network traffic information. + +* Network Delay is a module for collecting link delay information. + +* Shortest\_forwarding is a simple application to achieve shortest forwarding based on hop or delay. + +* Setting is the common setting module. -* ShortestForwarding is a simple application to achieve shortest forwarding based on hop or delay. In this version, we take networkx's data structure to store topology. Meanwhile, we also use networkx's function to calculate shortest path. -###Download File +### Download File Download files, and add them to ryu directory, for instance, app/network_awareness @@ -25,14 +30,16 @@ You have to reinstall Ryu, so that you can run the new code. In the top derector sudo python setup.py install -###Start +### Start -Go into the directory, and run applications. +Go into the directory, and run applications. You are suggested to add arguments when starting Ryu. The example shows below. - ryu-manager shortest_forwarding.py --observe-links + ryu-manager shortest_forwarding.py --observe-links --k-paths=2 --weight=bw The last step is to set up a network and connect to Ryu. -You will find out the information shown in terninal. +If you need to show collected information, you can set the parameter in setting.py. Also, you can define your personal setting, such as topology discovery period, You will find out the information shown in terninal. + +Enjoy it! Good Luck! -Good Luck! +If you have any question, you can email me. Don't forget to STAR this repository! diff --git a/ryu/app/network_awareness/network_awareness.py b/ryu/app/network_awareness/network_awareness.py index 2d1a8d43e..9e5f46474 100644 --- a/ryu/app/network_awareness/network_awareness.py +++ b/ryu/app/network_awareness/network_awareness.py @@ -20,6 +20,7 @@ import copy import networkx as nx from operator import attrgetter +from ryu import cfg from ryu.base import app_manager from ryu.controller import ofp_event from ryu.controller.handler import MAIN_DISPATCHER, DEAD_DISPATCHER @@ -34,12 +35,14 @@ from ryu.topology import event, switches from ryu.topology.api import get_switch, get_link +import setting + + +CONF = cfg.CONF class NetworkAwareness(app_manager.RyuApp): OFP_VERSIONS = [ofproto_v1_3.OFP_VERSION] - SLEEP_PERIOD = 10 - IS_UPDATE = True def __init__(self, *args, **kwargs): super(NetworkAwareness, self).__init__(*args, **kwargs) @@ -66,7 +69,7 @@ def _discover(self): if i == 5: self.get_topology(None) i = 0 - hub.sleep(self.SLEEP_PERIOD) + hub.sleep(setting.DISCOVERY_PERIOD) i = i + 1 @set_ev_cls(ofp_event.EventOFPSwitchFeatures, CONFIG_DISPATCHER) @@ -113,7 +116,7 @@ def get_links(self): def get_graph(self, link_list): for src in self.switches: for dst in self.switches: - self.graph.add_edge(src, dst, weight=float('inf')) + # self.graph.add_edge(src, dst, weight=float('inf')) if src == dst: self.graph.add_edge(src, dst, weight=0) elif (src, dst) in link_list: @@ -148,16 +151,38 @@ def create_interior_links(self, link_list): # get ports without link into access_ports def create_access_ports(self): for sw in self.switch_port_table: - self.access_ports[sw] = self.switch_port_table[ - sw] - self.interior_ports[sw] - - def floyd_dict(self, graph, cutoff=None, weight='weight'): - return nx.all_pairs_dijkstra_path(graph, cutoff=cutoff, weight=weight) - - def get_shortest_paths(self, cutoff=None, weight='weight'): - self.shortest_paths = self.floyd_dict(self.graph, cutoff=cutoff, - weight=weight) - return self.shortest_paths + all_port_table = self.switch_port_table[sw] + interior_port = self.interior_ports[sw] + self.access_ports[sw] = all_port_table - interior_port + + def k_shortest_paths(self, graph, src, dst, weight='weight', k=1): + generator = nx.shortest_simple_paths(graph, source=src, + target=dst, weight=weight) + shortest_paths = [] + try: + for path in generator: + if k <= 0: + break + shortest_paths.append(path) + k -= 1 + return shortest_paths + except: + self.logger.debug("No path between %s and %s" % (src, dst)) + + def all_k_shortest_paths(self, graph, weight='weight', k=1): + _graph = copy.deepcopy(graph) + paths = {} + + # find ksp in graph. + for src in _graph.nodes(): + paths.setdefault(src, {src: [[src] for i in xrange(k)]}) + for dst in _graph.nodes(): + if src == dst: + continue + paths[src].setdefault(dst, []) + paths[src][dst] = self.k_shortest_paths(_graph, src, dst, + weight=weight, k=k) + return paths events = [event.EventSwitchEnter, event.EventSwitchLeave, event.EventPortAdd, @@ -173,7 +198,8 @@ def get_topology(self, ev): self.create_interior_links(links) self.create_access_ports() self.get_graph(self.link_to_port.keys()) - self.get_shortest_paths(weight='weight') + self.shortest_paths = self.all_k_shortest_paths( + self.graph, weight='weight', k=CONF.k_paths) def register_access_info(self, dpid, in_port, ip, mac): if in_port in self.access_ports[dpid]: @@ -211,7 +237,7 @@ def _packet_in_handler(self, ev): def show_topology(self): switch_num = len(self.graph.nodes()) - if self.pre_graph != self.graph or self.IS_UPDATE: + if self.pre_graph != self.graph or setting.TOSHOW: print "---------------------Topo Link---------------------" print '%10s' % ("switch"), for i in xrange(1, switch_num + 1): @@ -224,7 +250,7 @@ def show_topology(self): print "" self.pre_graph = copy.deepcopy(self.graph) - if self.pre_link_to_port != self.link_to_port or self.IS_UPDATE: + if self.pre_link_to_port != self.link_to_port or setting.TOSHOW: print "---------------------Link Port---------------------" print '%10s' % ("switch"), for i in xrange(1, switch_num + 1): @@ -240,7 +266,7 @@ def show_topology(self): print "" self.pre_link_to_port = copy.deepcopy(self.link_to_port) - if self.pre_access_table != self.access_table or self.IS_UPDATE: + if self.pre_access_table != self.access_table or setting.TOSHOW: print "----------------Access Host-------------------" print '%10s' % ("switch"), '%12s' % "Host" if not self.access_table.keys(): diff --git a/ryu/app/network_awareness/network_delay_detector.py b/ryu/app/network_awareness/network_delay_detector.py new file mode 100644 index 000000000..9b2222a85 --- /dev/null +++ b/ryu/app/network_awareness/network_delay_detector.py @@ -0,0 +1,152 @@ +# Copyright (C) 2016 Li Cheng at Beijing University of Posts +# and Telecommunications. www.muzixing.com +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from __future__ import division +from ryu import cfg +from ryu.base import app_manager +from ryu.base.app_manager import lookup_service_brick +from ryu.controller import ofp_event +from ryu.controller.handler import MAIN_DISPATCHER, DEAD_DISPATCHER +from ryu.controller.handler import set_ev_cls +from ryu.ofproto import ofproto_v1_3 +from ryu.lib import hub +from ryu.topology.switches import Switches +from ryu.topology.switches import LLDPPacket +import networkx as nx +import time +import setting + + +CONF = cfg.CONF + + +class NetworkDelayDetector(app_manager.RyuApp): + OFP_VERSIONS = [ofproto_v1_3.OFP_VERSION] + + def __init__(self, *args, **kwargs): + super(NetworkDelayDetector, self).__init__(*args, **kwargs) + self.name = 'delaydetector' + self.sw_module = lookup_service_brick('switches') + self.awareness = lookup_service_brick('awareness') + + self.datapaths = {} + self.echo_latency = {} + self.measure_thread = hub.spawn(self._detector) + + @set_ev_cls(ofp_event.EventOFPStateChange, + [MAIN_DISPATCHER, DEAD_DISPATCHER]) + def _state_change_handler(self, ev): + datapath = ev.datapath + if ev.state == MAIN_DISPATCHER: + if not datapath.id in self.datapaths: + self.logger.debug('Register datapath: %016x', datapath.id) + self.datapaths[datapath.id] = datapath + elif ev.state == DEAD_DISPATCHER: + if datapath.id in self.datapaths: + self.logger.debug('Unregister datapath: %016x', datapath.id) + del self.datapaths[datapath.id] + + def _detector(self): + while CONF.weight == 'delay': + self.create_link_delay() + try: + self.awareness.shortest_paths = {} + self.logger.debug("Refresh the shortest_paths") + except: + self.awareness = lookup_service_brick('awareness') + + self.show_delay_statis() + self._send_echo_request() + hub.sleep(setting.DELAY_DETECTING_PERIOD) + + def _send_echo_request(self): + for datapath in self.datapaths.values(): + parser = datapath.ofproto_parser + data = "%.6f" % time.time() + echo_req = parser.OFPEchoRequest(datapath, data=data) + datapath.send_msg(echo_req) + + @set_ev_cls(ofp_event.EventOFPEchoReply, MAIN_DISPATCHER) + def echo_reply_handler(self, ev): + try: + latency = time.time() - eval(ev.msg.data) + self.echo_latency[ev.msg.datapath.id] = latency + except: + return + + def get_dalay(self, src, dst): + try: + fwd_delay = self.awareness.graph[src][dst]['lldpdelay'] + re_delay = self.awareness.graph[dst][src]['lldpdelay'] + src_latency = self.echo_latency[src] + dst_latency = self.echo_latency[dst] + + delay = (fwd_delay + re_delay - src_latency - dst_latency)/2 + return max(delay, 0) + except: + return float('inf') + + def _save_lldp_delay(self, src=0, dst=0, lldpdelay=0): + try: + self.awareness.graph[src][dst]['lldpdelay'] = lldpdelay + except: + if self.awareness is None: + self.awareness = lookup_service_brick('awareness') + return + + def create_link_delay(self): + try: + for src in self.awareness.graph: + for dst in self.awareness.graph[src]: + if src == dst: + self.awareness.graph[src][dst]['delay'] = 0 + continue + delay = self.get_dalay(src, dst) + self.awareness.graph[src][dst]['delay'] = delay + except: + if self.awareness is None: + self.awareness = lookup_service_brick('awareness') + return + + @set_ev_cls(ofp_event.EventOFPPacketIn, MAIN_DISPATCHER) + def packet_in_handler(self, ev): + msg = ev.msg + try: + src_dpid, src_port_no = LLDPPacket.lldp_parse(msg.data) + dpid = msg.datapath.id + in_port = msg.match['in_port'] + if self.sw_module is None: + self.sw_module = lookup_service_brick('switches') + + for port in self.sw_module.ports.keys(): + if src_dpid == port.dpid and src_port_no == port.port_no: + port_data = self.sw_module.ports[port] + timestamp = port_data.timestamp + if timestamp: + delay = time.time() - timestamp + self._save_lldp_delay(src=src_dpid, dst=dpid, + lldpdelay=delay) + except LLDPPacket.LLDPUnknownFormat as e: + return + + def show_delay_statis(self): + if setting.TOSHOW and self.awareness is not None: + self.logger.info("\nsrc dst delay") + self.logger.info("---------------------------") + for src in self.awareness.graph: + for dst in self.awareness.graph[src]: + delay = self.awareness.graph[src][dst]['delay'] + self.logger.info("%s<-->%s : %s" % (src, dst, delay)) diff --git a/ryu/app/network_awareness/network_monitor.py b/ryu/app/network_awareness/network_monitor.py index 896daea94..e65f9e817 100644 --- a/ryu/app/network_awareness/network_monitor.py +++ b/ryu/app/network_awareness/network_monitor.py @@ -15,8 +15,11 @@ # limitations under the License. from __future__ import division +import copy from operator import attrgetter +from ryu import cfg from ryu.base import app_manager +from ryu.base.app_manager import lookup_service_brick from ryu.controller import ofp_event from ryu.controller.handler import MAIN_DISPATCHER, DEAD_DISPATCHER from ryu.controller.handler import CONFIG_DISPATCHER @@ -24,11 +27,14 @@ from ryu.ofproto import ofproto_v1_3 from ryu.lib import hub from ryu.lib.packet import packet +import setting + + +CONF = cfg.CONF class NetworkMonitor(app_manager.RyuApp): OFP_VERSIONS = [ofproto_v1_3.OFP_VERSION] - SLEEP_PERIOD = 10 def __init__(self, *args, **kwargs): super(NetworkMonitor, self).__init__(*args, **kwargs) @@ -40,7 +46,11 @@ def __init__(self, *args, **kwargs): self.flow_speed = {} self.stats = {} self.port_link = {} + self.free_bandwidth = {} + self.awareness = lookup_service_brick('awareness') + self.graph = None self.monitor_thread = hub.spawn(self._monitor) + self.save_freebandwidth_thread = hub.spawn(self._save_bw_graph) @set_ev_cls(ofp_event.EventOFPStateChange, [MAIN_DISPATCHER, DEAD_DISPATCHER]) @@ -56,32 +66,108 @@ def _state_change_handler(self, ev): del self.datapaths[datapath.id] def _monitor(self): - while True: + while CONF.weight == 'bw': self.stats['flow'] = {} self.stats['port'] = {} for dp in self.datapaths.values(): self.port_link.setdefault(dp.id, {}) self._request_stats(dp) - hub.sleep(self.SLEEP_PERIOD) + hub.sleep(setting.MONITOR_PERIOD) if self.stats['flow'] or self.stats['port']: - self.show_stat('flow', self.stats['flow']) - self.show_stat('port', self.stats['port']) + self.show_stat('flow') + self.show_stat('port') hub.sleep(1) + def _save_bw_graph(self): + while CONF.weight == 'bw': + self.graph = self.create_bw_graph(self.free_bandwidth) + self.logger.debug("save_freebandwidth") + hub.sleep(setting.MONITOR_PERIOD) + def _request_stats(self, datapath): self.logger.debug('send stats request: %016x', datapath.id) ofproto = datapath.ofproto parser = datapath.ofproto_parser - req = parser.OFPFlowStatsRequest(datapath) + req = parser.OFPPortDescStatsRequest(datapath, 0) datapath.send_msg(req) req = parser.OFPPortStatsRequest(datapath, 0, ofproto.OFPP_ANY) datapath.send_msg(req) - req = parser.OFPPortDescStatsRequest(datapath, 0) + req = parser.OFPFlowStatsRequest(datapath) datapath.send_msg(req) + def get_min_bw_of_links(self, graph, path, min_bw): + _len = len(path) + if _len > 1: + minimal_band_width = min_bw + for i in xrange(_len-1): + pre, curr = path[i], path[i+1] + if 'bandwidth' in graph[pre][curr]: + bw = graph[pre][curr]['bandwidth'] + minimal_band_width = min(bw, minimal_band_width) + else: + continue + return minimal_band_width + return min_bw + + def get_best_path_by_bw(self, graph, paths): + capabilities = {} + best_paths = copy.deepcopy(paths) + + for src in paths: + for dst in paths[src]: + if src == dst: + best_paths[src][src] = [src] + capabilities.setdefault(src, {src: setting.MAX_CAPACITY}) + capabilities[src][src] = setting.MAX_CAPACITY + continue + max_bw_of_paths = 0 + best_path = paths[src][dst][0] + for path in paths[src][dst]: + min_bw = setting.MAX_CAPACITY + min_bw = self.get_min_bw_of_links(graph, path, min_bw) + if min_bw > max_bw_of_paths: + max_bw_of_paths = min_bw + best_path = path + + best_paths[src][dst] = best_path + capabilities.setdefault(src, {dst: max_bw_of_paths}) + capabilities[src][dst] = max_bw_of_paths + return capabilities, best_paths + + def create_bw_graph(self, bw_dict): + try: + graph = self.awareness.graph + link_to_port = self.awareness.link_to_port + for link in link_to_port: + (src_dpid, dst_dpid) = link + (src_port, dst_port) = link_to_port[link] + if src_dpid in bw_dict and dst_dpid in bw_dict: + bw_src = bw_dict[src_dpid][src_port] + bw_dst = bw_dict[dst_dpid][dst_port] + bandwidth = min(bw_src, bw_dst) + graph[src_dpid][dst_dpid]['bandwidth'] = bandwidth + else: + graph[src_dpid][dst_dpid]['bandwidth'] = 0 + return graph + except: + self.logger.info("Create bw graph exception") + if self.awareness is None: + self.awareness = lookup_service_brick('awareness') + return self.awareness.graph + + def _save_freebandwidth(self, dpid, port_no, speed): + port_state = self.port_link.get(dpid).get(port_no) + if port_state: + capacity = port_state[2] + curr_bw = self._get_free_bw(capacity, speed) + self.free_bandwidth[dpid].setdefault(port_no, None) + self.free_bandwidth[dpid][port_no] = curr_bw + else: + self.logger.info("Fail in getting port state") + def _save_stats(self, dist, key, value, length): if key not in dist: dist[key] = [] @@ -96,62 +182,16 @@ def _get_speed(self, now, pre, period): else: return 0 + def _get_free_bw(self, capacity, speed): + # BW:Mbit/s + return max(capacity / 10**3 - speed * 8, 0) + def _get_time(self, sec, nsec): return sec + nsec / (10 ** 9) def _get_period(self, n_sec, n_nsec, p_sec, p_nsec): return self._get_time(n_sec, n_nsec) - self._get_time(p_sec, p_nsec) - def show_stat(self, type, bodys): - ''' - type: 'port' 'flow' - bodys: port or flow `s information :{dpid:body} - ''' - if(type == 'flow'): - - print('datapath '' in-port ip-dst ' - 'out-port packets bytes flow-speed(B/s)') - print('---------------- '' -------- ----------------- ' - '-------- -------- -------- -----------') - for dpid in bodys.keys(): - for stat in sorted( - [flow for flow in bodys[dpid] if flow.priority == 1], - key=lambda flow: (flow.match.get('in_port'), - flow.match.get('ipv4_dst'))): - print('%016x %8x %17s %8x %8d %8d %8.1f' % ( - dpid, - stat.match['in_port'], stat.match['ipv4_dst'], - stat.instructions[0].actions[0].port, - stat.packet_count, stat.byte_count, - abs(self.flow_speed[dpid][ - (stat.match.get('in_port'), - stat.match.get('ipv4_dst'), - stat.instructions[0].actions[0].port)][-1]))) - print '\n' - - if(type == 'port'): - print('datapath port ''rx-pkts rx-bytes rx-error ' - 'tx-pkts tx-bytes tx-error port-speed(B/s)' - ' current-capacity(Kbps) ' - 'port-stat link-stat') - print('---------------- -------- ''-------- -------- -------- ' - '-------- -------- -------- ' - '---------------- ---------------- ' - ' ----------- -----------') - format = '%016x %8x %8d %8d %8d %8d %8d %8d %8.1f %16d %16s %16s' - for dpid in bodys.keys(): - for stat in sorted(bodys[dpid], key=attrgetter('port_no')): - if stat.port_no != ofproto_v1_3.OFPP_LOCAL: - print(format % ( - dpid, stat.port_no, - stat.rx_packets, stat.rx_bytes, stat.rx_errors, - stat.tx_packets, stat.tx_bytes, stat.tx_errors, - abs(self.port_speed[(dpid, stat.port_no)][-1]), - self.port_link[dpid][stat.port_no][2], - self.port_link[dpid][stat.port_no][0], - self.port_link[dpid][stat.port_no][1])) - print '\n' - @set_ev_cls(ofp_event.EventOFPFlowStatsReply, MAIN_DISPATCHER) def _flow_stats_reply_handler(self, ev): body = ev.msg.body @@ -170,7 +210,7 @@ def _flow_stats_reply_handler(self, ev): # Get flow's speed. pre = 0 - period = self.SLEEP_PERIOD + period = setting.MONITOR_PERIOD tmp = self.flow_stats[dpid][key] if len(tmp) > 1: pre = tmp[-2][1] @@ -185,10 +225,14 @@ def _flow_stats_reply_handler(self, ev): @set_ev_cls(ofp_event.EventOFPPortStatsReply, MAIN_DISPATCHER) def _port_stats_reply_handler(self, ev): body = ev.msg.body - self.stats['port'][ev.msg.datapath.id] = body + dpid = ev.msg.datapath.id + self.stats['port'][dpid] = body + self.free_bandwidth.setdefault(dpid, {}) + for stat in sorted(body, key=attrgetter('port_no')): - if stat.port_no != ofproto_v1_3.OFPP_LOCAL: - key = (ev.msg.datapath.id, stat.port_no) + port_no = stat.port_no + if port_no != ofproto_v1_3.OFPP_LOCAL: + key = (dpid, port_no) value = (stat.tx_bytes, stat.rx_bytes, stat.rx_errors, stat.duration_sec, stat.duration_nsec) @@ -196,7 +240,7 @@ def _port_stats_reply_handler(self, ev): # Get port speed. pre = 0 - period = self.SLEEP_PERIOD + period = setting.MONITOR_PERIOD tmp = self.port_stats[key] if len(tmp) > 1: pre = tmp[-2][0] + tmp[-2][1] @@ -208,6 +252,7 @@ def _port_stats_reply_handler(self, ev): pre, period) self._save_stats(self.port_speed, key, speed, 5) + self._save_freebandwidth(dpid, port_no, speed) @set_ev_cls(ofp_event.EventOFPPortDescStatsReply, MAIN_DISPATCHER) def port_desc_stats_reply_handler(self, ev): @@ -266,3 +311,55 @@ def _port_status_handler(self, ev): print "switch%d: port %s %s" % (dpid, reason_dict[reason], port_no) else: print "switch%d: Illeagal port state %s %s" % (port_no, reason) + + def show_stat(self, type): + ''' + type: 'port' 'flow' + ''' + if setting.TOSHOW is False: + return + + bodys = self.stats[type] + if(type == 'flow'): + print('datapath '' in-port ip-dst ' + 'out-port packets bytes flow-speed(B/s)') + print('---------------- '' -------- ----------------- ' + '-------- -------- -------- -----------') + for dpid in bodys.keys(): + for stat in sorted( + [flow for flow in bodys[dpid] if flow.priority == 1], + key=lambda flow: (flow.match.get('in_port'), + flow.match.get('ipv4_dst'))): + print('%016x %8x %17s %8x %8d %8d %8.1f' % ( + dpid, + stat.match['in_port'], stat.match['ipv4_dst'], + stat.instructions[0].actions[0].port, + stat.packet_count, stat.byte_count, + abs(self.flow_speed[dpid][ + (stat.match.get('in_port'), + stat.match.get('ipv4_dst'), + stat.instructions[0].actions[0].port)][-1]))) + print '\n' + + if(type == 'port'): + print('datapath port ''rx-pkts rx-bytes rx-error ' + 'tx-pkts tx-bytes tx-error port-speed(B/s)' + ' current-capacity(Kbps) ' + 'port-stat link-stat') + print('---------------- -------- ''-------- -------- -------- ' + '-------- -------- -------- ' + '---------------- ---------------- ' + ' ----------- -----------') + format = '%016x %8x %8d %8d %8d %8d %8d %8d %8.1f %16d %16s %16s' + for dpid in bodys.keys(): + for stat in sorted(bodys[dpid], key=attrgetter('port_no')): + if stat.port_no != ofproto_v1_3.OFPP_LOCAL: + print(format % ( + dpid, stat.port_no, + stat.rx_packets, stat.rx_bytes, stat.rx_errors, + stat.tx_packets, stat.tx_bytes, stat.tx_errors, + abs(self.port_speed[(dpid, stat.port_no)][-1]), + self.port_link[dpid][stat.port_no][2], + self.port_link[dpid][stat.port_no][0], + self.port_link[dpid][stat.port_no][1])) + print '\n' diff --git a/ryu/app/network_awareness/setting.py b/ryu/app/network_awareness/setting.py new file mode 100644 index 000000000..cf9ec036d --- /dev/null +++ b/ryu/app/network_awareness/setting.py @@ -0,0 +1,9 @@ +# Common Setting for Networ awareness module. + + +DISCOVERY_PERIOD = 10 +MONITOR_PERIOD = 10 +DELAY_DETECTING_PERIOD = 10 + +TOSHOW = True +MAX_CAPACITY = 281474976710655L diff --git a/ryu/app/network_awareness/shortest_forwarding.py b/ryu/app/network_awareness/shortest_forwarding.py index 5bfffe607..3bab84069 100644 --- a/ryu/app/network_awareness/shortest_forwarding.py +++ b/ryu/app/network_awareness/shortest_forwarding.py @@ -19,6 +19,7 @@ import struct import networkx as nx from operator import attrgetter +from ryu import cfg from ryu.base import app_manager from ryu.controller import ofp_event from ryu.controller.handler import MAIN_DISPATCHER, DEAD_DISPATCHER @@ -35,21 +36,36 @@ import network_awareness import network_monitor +import network_delay_detector -class Shortest_Forwarding(app_manager.RyuApp): +CONF = cfg.CONF + + +class ShortestForwarding(app_manager.RyuApp): OFP_VERSIONS = [ofproto_v1_3.OFP_VERSION] _CONTEXTS = { "network_awareness": network_awareness.NetworkAwareness, - "network_monitor": network_monitor.NetworkMonitor} + "network_monitor": network_monitor.NetworkMonitor, + "network_delay_detector": network_delay_detector.NetworkDelayDetector} + + WEIGHT_MODEL = {'hop': 'weight', 'delay': "delay", "bw": "bw"} def __init__(self, *args, **kwargs): - super(Shortest_Forwarding, self).__init__(*args, **kwargs) + super(ShortestForwarding, self).__init__(*args, **kwargs) self.name = 'shortest_forwarding' self.awareness = kwargs["network_awareness"] self.monitor = kwargs["network_monitor"] + self.delay_detector = kwargs["network_delay_detector"] self.mac_to_port = {} self.datapaths = {} + self.weight = self.WEIGHT_MODEL[CONF.weight] + + def set_weight_mode(self, weight): + self.weight = weight + if self.weight == self.WEIGHT_MODEL['hop']: + self.awareness.get_shortest_paths(weight=self.weight) + return True @set_ev_cls(ofp_event.EventOFPStateChange, [MAIN_DISPATCHER, DEAD_DISPATCHER]) @@ -161,8 +177,29 @@ def arp_forwarding(self, msg, src_ip, dst_ip): else: self.flood(msg) - def get_path(self, src, dst): - return self.awareness.shortest_paths.get(src).get(dst) + def get_path(self, src, dst, weight): + shortest_paths = self.awareness.shortest_paths + graph = self.awareness.graph + + if weight == self.WEIGHT_MODEL['hop']: + return shortest_paths.get(src).get(dst)[0] + elif weight == self.WEIGHT_MODEL['delay']: + # If paths existed, return it, else figure it out and save it. + try: + paths = shortest_paths.get(src).get(dst) + return paths[0] + except: + paths = self.awareness.k_shortest_paths(graph, src, dst, + weight=weight) + + shortest_paths.setdefault(src, {}) + shortest_paths[src].setdefault(dst, paths) + return paths[0] + elif weight == self.WEIGHT_MODEL['bw']: + result = self.monitor.get_best_path_by_bw(graph, shortest_paths) + paths = result[1] + best_path = paths.get(src).get(dst) + return best_path def get_sw(self, dpid, in_port, src, dst): src_sw = dpid @@ -252,7 +289,7 @@ def shortest_forwarding(self, msg, eth_type, ip_src, ip_dst): if result: src_sw, dst_sw = result[0], result[1] if dst_sw: - path = self.get_path(src_sw, dst_sw) + path = self.get_path(src_sw, dst_sw, weight=self.weight) self.logger.info("[PATH]%s<-->%s: %s" % (ip_src, ip_dst, path)) flow_info = (eth_type, ip_src, ip_dst, in_port) self.install_flow(self.datapaths, diff --git a/ryu/flags.py b/ryu/flags.py index 225cbbb4a..655bc4614 100644 --- a/ryu/flags.py +++ b/ryu/flags.py @@ -82,3 +82,10 @@ help='tester sw OFP version [openflow13|openflow14] ' '(default: openflow13)') ], group='test-switch') + + +CONF.register_cli_opts([ + # k_shortest_forwarding + cfg.IntOpt('k-paths', default=1, help='number for k shortest paths'), + cfg.StrOpt('weight', default='hop', + help='weight type of computing shortest path.')])