X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=blobdiff_plain;f=src%2Femuvim%2Fdcemulator%2Fnet.py;h=ed4054594c5f84ed1c89d79012a6baa722a9b115;hp=0bef2fa8a899b5f55d5ff768b174f57268f720b9;hb=5b37641a26aef3691b6f5ad2e3d1b768841eee8f;hpb=df6cd75e31d6d9c19662d90a2d112040b76ef8c9 diff --git a/src/emuvim/dcemulator/net.py b/src/emuvim/dcemulator/net.py index 0bef2fa..ed40545 100755 --- a/src/emuvim/dcemulator/net.py +++ b/src/emuvim/dcemulator/net.py @@ -8,6 +8,9 @@ import site import time from subprocess import Popen import os +import re + + from mininet.net import Dockernet from mininet.node import Controller, DefaultController, OVSSwitch, OVSKernelSwitch, Docker, RemoteController @@ -18,7 +21,6 @@ from emuvim.dcemulator.monitoring import DCNetworkMonitor from emuvim.dcemulator.node import Datacenter, EmulatorCompute from emuvim.dcemulator.resourcemodel import ResourceModelRegistrar - class DCNetwork(Dockernet): """ Wraps the original Mininet/Dockernet class and provides @@ -27,7 +29,7 @@ class DCNetwork(Dockernet): This class is used by topology definition scripts. """ - def __init__(self, controller=RemoteController, + def __init__(self, controller=RemoteController, monitor=False, dc_emulation_max_cpu=1.0, # fraction of overall CPU time for emulation dc_emulation_max_mem=512, # emulation max mem in MB **kwargs): @@ -56,7 +58,10 @@ class DCNetwork(Dockernet): self.DCNetwork_graph = nx.MultiDiGraph() # monitoring agent - self.monitor_agent = DCNetworkMonitor(self) + if monitor: + self.monitor_agent = DCNetworkMonitor(self) + else: + self.monitor_agent = None # initialize resource model registrar self.rm_registrar = ResourceModelRegistrar( @@ -119,22 +124,46 @@ class DCNetwork(Dockernet): if isinstance(node1, Docker): if "id" in params["params1"]: node1_port_id = params["params1"]["id"] + node1_port_name = link.intf1.name node2_port_id = node2.ports[link.intf2] if isinstance(node2, Docker): if "id" in params["params2"]: node2_port_id = params["params2"]["id"] + node2_port_name = link.intf2.name + # add edge and assigned port number to graph in both directions between node1 and node2 # port_id: id given in descriptor (if available, otherwise same as port) # port: portnumber assigned by Dockernet - self.DCNetwork_graph.add_edge(node1.name, node2.name, - attr_dict={'src_port_id': node1_port_id, 'src_port': node1.ports[link.intf1], - 'dst_port_id': node2_port_id, 'dst_port': node2.ports[link.intf2]}) - self.DCNetwork_graph.add_edge(node2.name, node1.name, - attr_dict={'src_port_id': node2_port_id, 'src_port': node2.ports[link.intf2], - 'dst_port_id': node1_port_id, 'dst_port': node1.ports[link.intf1]}) + attr_dict = {} + # possible weight metrics allowed by TClink class: + weight_metrics = ['bw', 'delay', 'jitter', 'loss'] + edge_attributes = [p for p in params if p in weight_metrics] + for attr in edge_attributes: + # if delay: strip ms (need number as weight in graph) + match = re.search('([0-9]*\.?[0-9]+)', params[attr]) + if match: + attr_number = match.group(1) + else: + attr_number = None + attr_dict[attr] = attr_number + + + attr_dict2 = {'src_port_id': node1_port_id, 'src_port_nr': node1.ports[link.intf1], + 'src_port_name': node1_port_name, + 'dst_port_id': node2_port_id, 'dst_port_nr': node2.ports[link.intf2], + 'dst_port_name': node2_port_name} + attr_dict2.update(attr_dict) + self.DCNetwork_graph.add_edge(node1.name, node2.name, attr_dict=attr_dict2) + + attr_dict2 = {'src_port_id': node2_port_id, 'src_port_nr': node2.ports[link.intf2], + 'src_port_name': node2_port_name, + 'dst_port_id': node1_port_id, 'dst_port_nr': node1.ports[link.intf1], + 'dst_port_name': node1_port_name} + attr_dict2.update(attr_dict) + self.DCNetwork_graph.add_edge(node2.name, node1.name, attr_dict=attr_dict2) return link @@ -176,15 +205,23 @@ class DCNetwork(Dockernet): Dockernet.start(self) def stop(self): - # stop Ryu controller + + # stop the monitor agent + if self.monitor_agent is not None: + self.monitor_agent.stop() + + # stop emulator net Dockernet.stop(self) + + # stop Ryu controller self.stopRyu() + def CLI(self): CLI(self) # to remove chain do setChain( src, dst, cmd='del-flows') - def setChain(self, vnf_src_name, vnf_dst_name, vnf_src_interface=None, vnf_dst_interface=None, cmd='add-flow'): + def setChain(self, vnf_src_name, vnf_dst_name, vnf_src_interface=None, vnf_dst_interface=None, cmd='add-flow', weight=None): #check if port is specified (vnf:port) if vnf_src_interface is None: @@ -192,15 +229,15 @@ class DCNetwork(Dockernet): connected_sw = self.DCNetwork_graph.neighbors(vnf_src_name)[0] link_dict = self.DCNetwork_graph[vnf_src_name][connected_sw] vnf_src_interface = link_dict[0]['src_port_id'] - #vnf_source_interface = 0 + #logging.info('vnf_src_if: {0}'.format(vnf_src_interface)) for connected_sw in self.DCNetwork_graph.neighbors(vnf_src_name): link_dict = self.DCNetwork_graph[vnf_src_name][connected_sw] for link in link_dict: - #logging.info("{0},{1}".format(link_dict[link],vnf_source_interface)) + #logging.info("here1: {0},{1}".format(link_dict[link],vnf_src_interface)) if link_dict[link]['src_port_id'] == vnf_src_interface: # found the right link and connected switch - #logging.info("{0},{1}".format(link_dict[link]['src_port_id'], vnf_source_interface)) + #logging.info("conn_sw: {2},{0},{1}".format(link_dict[link]['src_port_id'], vnf_src_interface, connected_sw)) src_sw = connected_sw src_sw_inport = link_dict[link]['dst_port'] @@ -211,7 +248,6 @@ class DCNetwork(Dockernet): connected_sw = self.DCNetwork_graph.neighbors(vnf_dst_name)[0] link_dict = self.DCNetwork_graph[connected_sw][vnf_dst_name] vnf_dst_interface = link_dict[0]['dst_port_id'] - #vnf_dest_interface = 0 vnf_dst_name = vnf_dst_name.split(':')[0] for connected_sw in self.DCNetwork_graph.neighbors(vnf_dst_name): @@ -227,7 +263,9 @@ class DCNetwork(Dockernet): # get shortest path #path = nx.shortest_path(self.DCNetwork_graph, vnf_src_name, vnf_dst_name) try: - path = nx.shortest_path(self.DCNetwork_graph, src_sw, dst_sw) + # returns the first found shortest path + # if all shortest paths are wanted, use: all_shortest_paths + path = nx.shortest_path(self.DCNetwork_graph, src_sw, dst_sw, weight=weight) except: logging.info("No path could be found between {0} and {1}".format(vnf_src_name, vnf_dst_name)) return "No path could be found between {0} and {1}".format(vnf_src_name, vnf_dst_name) @@ -259,20 +297,12 @@ class DCNetwork(Dockernet): index_edge_out = 0 switch_outport = self.DCNetwork_graph[current_hop][next_hop][index_edge_out]['src_port'] - # take into account that multiple edges are possible between 2 nodes - index_edge_in = 0 - - - #switch_inport = self.DCNetwork_graph[current_hop][next_hop][index_edge_in]['dst_port'] - - #next2_hop = path[path.index(current_hop)+2] - #index_edge_out = 0 - #switch_outport = self.DCNetwork_graph[next_hop][next2_hop][index_edge_out]['src_port'] - #switch_outport = self.DCNetwork_graph[current_hop][next_hop][index_edge_out]['src_port'] #logging.info("add flow in switch: {0} in_port: {1} out_port: {2}".format(current_node.name, switch_inport, switch_outport)) # set of entry via ovs-ofctl - # TODO use rest API of ryu to set flow entries to correct witch dpid + # TODO use rest API of ryu to set flow entries to correct dpid + # TODO this only sets port in to out, no match, so this will give trouble when multiple services are deployed... + # TODO need multiple matches to do this (VLAN tags) if isinstance( current_node, OVSSwitch ): match = 'in_port=%s' % switch_inport @@ -308,9 +338,9 @@ class DCNetwork(Dockernet): ryu_of_port = '6653' ryu_cmd = 'ryu-manager' FNULL = open("/tmp/ryu.log", 'w') - self.ryu_process = Popen([ryu_cmd, ryu_path, ryu_path2, ryu_option, ryu_of_port], stdout=FNULL, stderr=FNULL) + #self.ryu_process = Popen([ryu_cmd, ryu_path, ryu_path2, ryu_option, ryu_of_port], stdout=FNULL, stderr=FNULL) # no learning switch - #self.ryu_process = Popen([ryu_cmd, ryu_path2, ryu_option, ryu_of_port], stdout=FNULL, stderr=FNULL) + self.ryu_process = Popen([ryu_cmd, ryu_path2, ryu_option, ryu_of_port], stdout=FNULL, stderr=FNULL) time.sleep(1) def stopRyu(self):