X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fdcemulator%2Fnet.py;h=8973bb988220428f40d6d49b56dbe6aab0f5dd4c;hb=17b6e881a3813e6f1f99100ed384f974eaff36a3;hp=1a8d938d80ad55d3e9af5a5e6478d63c83906d7b;hpb=08f91be07d9124986dacf05b7cd87eb8d3d8b338;p=osm%2Fvim-emu.git diff --git a/src/emuvim/dcemulator/net.py b/src/emuvim/dcemulator/net.py index 1a8d938..8973bb9 100755 --- a/src/emuvim/dcemulator/net.py +++ b/src/emuvim/dcemulator/net.py @@ -41,7 +41,7 @@ from mininet.link import TCLink from mininet.clean import cleanup import networkx as nx from emuvim.dcemulator.monitoring import DCNetworkMonitor -from emuvim.dcemulator.node import Datacenter, EmulatorCompute +from emuvim.dcemulator.node import Datacenter, EmulatorCompute, EmulatorExtSAP from emuvim.dcemulator.resourcemodel import ResourceModelRegistrar LOG = logging.getLogger("dcemulator.net") @@ -229,20 +229,43 @@ class DCNetwork(Containernet): return link + def removeLink(self, link=None, node1=None, node2=None): + """ + Remove the link from the Containernet and the networkx graph + """ + Containernet.removeLink(self, link=link, node1=node1, node2=node2) + self.DCNetwork_graph.remove_edge(node2.name, node1.name) + def addDocker( self, label, **params ): """ Wrapper for addDocker method to use custom container class. """ - self.DCNetwork_graph.add_node(label) + self.DCNetwork_graph.add_node(label, type=params.get('type', 'docker')) return Containernet.addDocker(self, label, cls=EmulatorCompute, **params) - def removeDocker( self, label, **params ): + def removeDocker( self, label, **params): """ Wrapper for removeDocker method to update graph. """ self.DCNetwork_graph.remove_node(label) return Containernet.removeDocker(self, label, **params) + def addExtSAP(self, sap_name, sap_ip, **params): + """ + Wrapper for addExtSAP method to store SAP also in graph. + """ + # make sure that 'type' is set + params['type'] = params.get('type','sap_ext') + self.DCNetwork_graph.add_node(sap_name, type=params['type']) + return Containernet.addExtSAP(self, sap_name, sap_ip, **params) + + def removeExtSAP(self, sap_name, **params): + """ + Wrapper for removeExtSAP method to remove SAP also from graph. + """ + self.DCNetwork_graph.remove_node(sap_name) + return Containernet.removeExtSAP(self, sap_name) + def addSwitch( self, name, add_to_graph=True, **params ): """ Wrapper for addSwitch method to store switch also in graph. @@ -250,7 +273,8 @@ class DCNetwork(Containernet): # add this switch to the global topology overview if add_to_graph: - self.DCNetwork_graph.add_node(name) + self.DCNetwork_graph.add_node(name, type=params.get('type','switch')) + LOG.info('*** **** *** add switch: {0} type: {1}'.format(name, params.get('type'))) # set the learning switch behavior if 'failMode' in params : @@ -260,12 +284,6 @@ class DCNetwork(Containernet): s = Containernet.addSwitch(self, name, protocols='OpenFlow10,OpenFlow12,OpenFlow13', failMode=failMode, **params) - # set flow entry that enables learning switch behavior (needed to enable E-LAN functionality) - #LOG.info('failmode {0}'.format(failMode)) - #if failMode == 'standalone' : - # LOG.info('add NORMAL') - # s.dpctl('add-flow', 'actions=NORMAL') - return s def getAllContainers(self): @@ -456,6 +474,7 @@ class DCNetwork(Containernet): kwargs['switch_inport_name'] = src_sw_inport_name kwargs['switch_outport_name'] = dst_sw_outport_name kwargs['skip_vlan_tag'] = True + kwargs['pathindex'] = i monitor_placement = kwargs.get('monitor_placement').strip() # put monitor flow at the dst switch @@ -500,12 +519,10 @@ class DCNetwork(Containernet): :param cookie: cookie for the installed flowrules (can be used later as identifier for a set of installed chains) :param match: custom match entry to be added to the flowrules (default: only in_port and vlan tag) :param priority: custom flowrule priority -<<<<<<< HEAD :param monitor: boolean to indicate whether this chain is a monitoring chain :param tag: vlan tag to be used for this chain (pre-defined or new one if none is specified) -======= + :param skip_vlan_tag: boolean to indicate if a vlan tag should be appointed to this flow or not :param path: custom path between the two VNFs (list of switches) ->>>>>>> upstream/master :return: output log string """ @@ -617,7 +634,6 @@ class DCNetwork(Containernet): switch_inport_nr = src_sw_inport_nr # choose free vlan - ## if path contains more than 1 switch cmd = kwargs.get('cmd') vlan = None if cmd == 'add-flow': @@ -661,7 +677,7 @@ class DCNetwork(Containernet): switch_outport_nr = self.DCNetwork_graph[current_hop][next_hop][index_edge_out]['src_port_nr'] - # set of entry via ovs-ofctl + # set OpenFlow entry if isinstance( current_node, OVSSwitch ): kwargs['vlan'] = vlan kwargs['path'] = path @@ -904,7 +920,14 @@ class DCNetwork(Containernet): dict.update({match[0]:m2}) return dict - def find_connected_dc_interface(self, vnf_src_name, vnf_src_interface): + def find_connected_dc_interface(self, vnf_src_name, vnf_src_interface=None): + + if vnf_src_interface is None: + # take first interface by default + 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'] + 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: