:param compute_name: compute container name
:param image: image name
:param command: command to execute
- :param network:
- :return: networks list({"ip": "10.0.0.254/8"}, {"ip": "11.0.0.254/24"})
+ :param network: list of all interface of the vnf, with their parameters (id=id1,ip=x.x.x.x/x),...
+ :return: networks list({"id":"input","ip": "10.0.0.254/8"}, {"id":"output","ip": "11.0.0.254/24"})
"""
# TODO what to return UUID / given name / internal name ?
logging.debug("RPC CALL: compute start")
def __init__(self, net):
self.net = net
- def network_action_start(self, vnf_src_name, vnf_dst_name):
+ def network_action_start(self, vnf_src_name, vnf_dst_name, vnf_src_interface=None, vnf_dst_interface=None):
# call DCNetwork method, not really datacenter specific API for now...
# provided dc name needs to be part of API endpoint
# no check if vnfs are really connected to this datacenter...
logging.debug("RPC CALL: network chain start")
try:
c = self.net.setChain(
- vnf_src_name, vnf_dst_name)
+ vnf_src_name, vnf_dst_name, vnf_src_interface, vnf_dst_interface)
return str(c)
except Exception as ex:
logging.exception("RPC error.")
return ex.message
- def network_action_stop(self, vnf_src_name, vnf_dst_name):
+ def network_action_stop(self, vnf_src_name, vnf_dst_name, vnf_src_interface=None, vnf_dst_interface=None):
# call DCNetwork method, not really datacenter specific API for now...
# provided dc name needs to be part of API endpoint
# no check if vnfs are really connected to this datacenter...
logging.debug("RPC CALL: network chain stop")
try:
c = self.net.setChain(
- vnf_src_name, vnf_dst_name, cmd='del-flows')
+ vnf_src_name, vnf_dst_name, vnf_src_interface, vnf_dst_interface, cmd='del-flows')
+ return c
+ except Exception as ex:
+ logging.exception("RPC error.")
+ return ex.message
+
+ # setup the rate measurement for a vnf interface
+ def monitor_setup_rate_measurement(self, vnf_name, vnf_interface, direction, metric):
+ logging.debug("RPC CALL: get rate")
+ try:
+ c = self.net.monitor_agent.setup_rate_measurement(vnf_name, vnf_interface, direction, metric)
return c
except Exception as ex:
logging.exception("RPC error.")
return ex.message
# get egress(default) or ingress rate of a vnf
- def monitor_get_rate(self, vnf_name, direction):
+ def monitor_get_rate(self, vnf_name, vnf_interface, direction, metric):
logging.debug("RPC CALL: get rate")
try:
- c = self.net.monitor_agent.get_rate(vnf_name, direction)
+ c = self.net.monitor_agent.get_rate(vnf_name, vnf_interface, direction, metric)
return c
except Exception as ex:
logging.exception("RPC error.")
def start(self, args):
nw_list = list()
if args.get("network") is not None:
- networks = args.get("network").split(",")
- for nw in networks:
- nw_list.append({"ip": nw})
+ nw_list = self._parse_network(args.get("network"))
+
r = self.c.compute_action_start(
args.get("datacenter"),
args.get("name"),
args.get("datacenter"), args.get("name"))
pp.pprint(r)
+ def _parse_network(self, network_str):
+ '''
+ parse the options for all network interfaces of the vnf
+ :param network_str: (id=x,ip=x.x.x.x/x), ...
+ :return: list of dicts [{"id":x,"ip":"x.x.x.x/x"}, ...]
+ '''
+ nw_list = list()
+ networks = network_str[1:-1].split('),(')
+ for nw in networks:
+ nw_dict = dict(tuple(e.split('=')) for e in nw.split(','))
+ nw_list.append(nw_dict)
+
+ return nw_list
+
+
parser = argparse.ArgumentParser(description='son-emu compute')
parser.add_argument(
import pprint\r
from tabulate import tabulate\r
import zerorpc\r
+import time\r
\r
\r
pp = pprint.PrettyPrinter(indent=4)\r
print "Command not implemented."\r
\r
def get_rate(self, args):\r
- r = self.c.monitor_get_rate(\r
- args.get("vnf_name"),\r
- args.get("direction"))\r
- pp.pprint(r)\r
+ vnf_name = self._parse_vnf_name(args.get("vnf_name"))\r
+ vnf_interface = self._parse_vnf_interface(args.get("vnf_name"))\r
+ self.c.monitor_setup_rate_measurement(\r
+ vnf_name,\r
+ vnf_interface,\r
+ args.get("direction"),\r
+ args.get("metric"))\r
+ while True:\r
+ r = self.c.monitor_get_rate(\r
+ vnf_name,\r
+ vnf_interface,\r
+ args.get("direction"),\r
+ args.get("metric"))\r
+ pp.pprint(r)\r
+ time.sleep(1)\r
\r
+ def _parse_vnf_name(self, vnf_name_str):\r
+ vnf_name = vnf_name_str.split(':')[0]\r
+ return vnf_name\r
+\r
+ def _parse_vnf_interface(self, vnf_name_str):\r
+ try:\r
+ vnf_interface = vnf_name_str.split(':')[1]\r
+ except:\r
+ vnf_interface = None\r
+\r
+ return vnf_interface\r
\r
parser = argparse.ArgumentParser(description='son-emu network')\r
parser.add_argument(\r
help="vnf name to be monitored")\r
parser.add_argument(\r
"--direction", "-d", dest="direction",\r
- help="in (ingress rate) or out (egress rate)")\r
+ help="rx (ingress rate) or tx (egress rate)")\r
+parser.add_argument(\r
+ "--metric", "-m", dest="metric",\r
+ help="bytes (byte rate), packets (packet rate)")\r
\r
def main(argv):\r
print "This is the son-emu monitor CLI."\r
print "Command not implemented."\r
\r
def add(self, args):\r
+ vnf_src_name = self._parse_vnf_name(args.get("source"))\r
+ vnf_src_interface = self._parse_vnf_interface(args.get("source"))\r
+ vnf_dst_name = self._parse_vnf_name(args.get("destination"))\r
+ vnf_dst_interface = self._parse_vnf_interface(args.get("destination"))\r
r = self.c.network_action_start(\r
#args.get("datacenter"),\r
- args.get("source"),\r
- args.get("destination"))\r
+ vnf_src_name,\r
+ vnf_dst_name,\r
+ vnf_src_interface,\r
+ vnf_dst_interface)\r
pp.pprint(r)\r
\r
def remove(self, args):\r
+ vnf_src_name = self._parse_vnf_name(args.get("source"))\r
+ vnf_src_interface = self._parse_vnf_interface(args.get("source"))\r
+ vnf_dst_name = self._parse_vnf_name(args.get("destination"))\r
+ vnf_dst_interface = self._parse_vnf_interface(args.get("destination"))\r
r = self.c.network_action_stop(\r
#args.get("datacenter"),\r
- args.get("source"),\r
- args.get("destination"))\r
+ vnf_src_name,\r
+ vnf_dst_name,\r
+ vnf_src_interface,\r
+ vnf_dst_interface)\r
pp.pprint(r)\r
\r
+ def _parse_vnf_name(self, vnf_name_str):\r
+ vnf_name = vnf_name_str.split(':')[0]\r
+ return vnf_name\r
+\r
+ def _parse_vnf_interface(self, vnf_name_str):\r
+ try:\r
+ vnf_interface = vnf_name_str.split(':')[1]\r
+ except:\r
+ vnf_interface = None\r
+\r
+ return vnf_interface\r
+\r
\r
parser = argparse.ArgumentParser(description='son-emu network')\r
parser.add_argument(\r
import logging\r
from mininet.node import OVSSwitch\r
import ast\r
+import time\r
logging.basicConfig(level=logging.INFO)\r
\r
"""\r
self.port = '8080'\r
self.REST_api = 'http://{0}:{1}'.format(self.ip,self.port)\r
\r
+ self.previous_measurement = 0\r
+ self.previous_monitor_time = 0\r
+ self.switch_dpid = 0\r
+ self.metric_key = None\r
+ self.mon_port = None\r
+\r
+ # first set some parameters, before measurement can start\r
+ def setup_rate_measurement(self, vnf_name, vnf_interface=None, direction='tx', metric='packets'):\r
+ # check if port is specified (vnf:port)\r
+ if vnf_interface is None:\r
+ # take first interface by default\r
+ connected_sw = self.net.DCNetwork_graph.neighbors(vnf_name)[0]\r
+ link_dict = self.net.DCNetwork_graph[vnf_name][connected_sw]\r
+ vnf_interface = link_dict[0]['src_port_id']\r
+\r
+ for connected_sw in self.net.DCNetwork_graph.neighbors(vnf_name):\r
+ link_dict = self.net.DCNetwork_graph[vnf_name][connected_sw]\r
+ for link in link_dict:\r
+ # logging.info("{0},{1}".format(link_dict[link],vnf_interface))\r
+ if link_dict[link]['src_port_id'] == vnf_interface:\r
+ # found the right link and connected switch\r
+ # logging.info("{0},{1}".format(link_dict[link]['src_port_id'], vnf_source_interface))\r
+ self.mon_port = link_dict[link]['dst_port']\r
+ break\r
\r
- def get_rate(self, vnf_name, direction='tx'):\r
try:\r
+ # default port direction to monitor\r
+ if direction is None:\r
+ direction = 'tx'\r
+ if metric is None:\r
+ metric = 'packets'\r
+\r
vnf_switch = self.net.DCNetwork_graph.neighbors(str(vnf_name))\r
\r
if len(vnf_switch) > 1:\r
vnf_switch = vnf_switch[0]\r
next_node = self.net.getNodeByName(vnf_switch)\r
\r
- if not isinstance( next_node, OVSSwitch ):\r
+ if not isinstance(next_node, OVSSwitch):\r
logging.info("vnf: {0} is not connected to switch".format(vnf_name))\r
return\r
\r
- mon_port = self.net.DCNetwork_graph[vnf_name][vnf_switch]['dst_port']\r
- switch_dpid = x = int(str(next_node.dpid),16)\r
+ self.previous_measurement = 0\r
+ self.previous_monitor_time = 0\r
\r
- ret = self.REST_cmd('stats/port', switch_dpid)\r
- port_stat_dict = ast.literal_eval(ret)\r
- for port_stat in port_stat_dict[str(switch_dpid)]:\r
- if port_stat['port_no'] == mon_port:\r
- return port_stat\r
- break\r
-\r
- return ret\r
+ #self.switch_dpid = x = int(str(next_node.dpid), 16)\r
+ self.switch_dpid = int(str(next_node.dpid), 16)\r
+ self.metric_key = '{0}_{1}'.format(direction, metric)\r
\r
except Exception as ex:\r
logging.exception("get_txrate error.")\r
return ex.message\r
\r
\r
+ # call this function repeatedly for streaming measurements\r
+ def get_rate(self, vnf_name, vnf_interface=None, direction='tx', metric='packets'):\r
+\r
+ key = self.metric_key\r
+\r
+ ret = self.REST_cmd('stats/port', self.switch_dpid)\r
+ port_stat_dict = ast.literal_eval(ret)\r
+ for port_stat in port_stat_dict[str(self.switch_dpid)]:\r
+ if port_stat['port_no'] == self.mon_port:\r
+ port_uptime = port_stat['duration_sec'] + port_stat['duration_nsec'] * 10 ** (-9)\r
+ this_measurement = port_stat[key]\r
+\r
+ if self.previous_monitor_time <= 0 or self.previous_monitor_time >= port_uptime:\r
+ self.previous_measurement = port_stat[key]\r
+ self.previous_monitor_time = port_uptime\r
+ # do first measurement\r
+ time.sleep(1)\r
+ byte_rate = self.get_rate(vnf_name, vnf_interface, direction, metric)\r
+ return byte_rate\r
+ else:\r
+ time_delta = (port_uptime - self.previous_monitor_time)\r
+ byte_rate = (this_measurement - self.previous_measurement) / float(time_delta)\r
+ #logging.info('uptime:{2} delta:{0} rate:{1}'.format(time_delta,byte_rate,port_uptime))\r
+\r
+ self.previous_measurement = this_measurement\r
+ self.previous_monitor_time = port_uptime\r
+ return byte_rate\r
+\r
+ return ret\r
\r
def REST_cmd(self, prefix, dpid):\r
url = self.REST_api + '/' + str(prefix) + '/' + str(dpid)\r
self.addController('c0', controller=controller)
# graph of the complete DC network
- self.DCNetwork_graph = nx.DiGraph()
+ self.DCNetwork_graph = nx.MultiDiGraph()
# monitoring agent
self.monitor_agent = DCNetworkMonitor(self)
link = Dockernet.addLink(self, node1, node2, **params)
+ # try to give container interfaces a default id
+ node1_port_id = node1.ports[link.intf1]
+ if isinstance(node1, Docker):
+ if "id" in params["params1"]:
+ node1_port_id = params["params1"]["id"]
+
+ node2_port_id = node2.ports[link.intf2]
+ if isinstance(node2, Docker):
+ if "id" in params["params2"]:
+ node2_port_id = params["params2"]["id"]
+
# add edge and assigned port number to graph in both directions between node1 and node2
- self.DCNetwork_graph.add_edge(node1.name, node2.name, \
- {'src_port': node1.ports[link.intf1], 'dst_port': node2.ports[link.intf2]})
- self.DCNetwork_graph.add_edge(node2.name, node1.name, \
- {'src_port': node2.ports[link.intf2], 'dst_port': node1.ports[link.intf1]})
+ # 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]})
return link
CLI(self)
# to remove chain do setChain( src, dst, cmd='del-flows')
- def setChain(self, vnf_src_name, vnf_dst_name, cmd='add-flow'):
+ def setChain(self, vnf_src_name, vnf_dst_name, vnf_src_interface=None, vnf_dst_interface=None, cmd='add-flow'):
+
+ #check if port is specified (vnf:port)
+ 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']
+ #vnf_source_interface = 0
+
+ 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))
+ 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))
+ src_sw = connected_sw
+
+ src_sw_inport = link_dict[link]['dst_port']
+ break
+
+ if vnf_dst_interface is None:
+ # take first interface by default
+ 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):
+ link_dict = self.DCNetwork_graph[connected_sw][vnf_dst_name]
+ for link in link_dict:
+ if link_dict[link]['dst_port_id'] == vnf_dst_interface:
+ # found the right link and connected switch
+ dst_sw = connected_sw
+ dst_sw_outport = link_dict[link]['src_port']
+ break
+
+
# get shortest path
- path = nx.shortest_path(self.DCNetwork_graph, vnf_src_name, vnf_dst_name)
+ #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)
+ 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)
+
logging.info("Path between {0} and {1}: {2}".format(vnf_src_name, vnf_dst_name, path))
- current_hop = vnf_src_name
+ #current_hop = vnf_src_name
+ current_hop = src_sw
+ switch_inport = src_sw_inport
+
for i in range(0,len(path)):
- next_hop = path[path.index(current_hop)+1]
+ current_node = self.getNodeByName(current_hop)
+ if path.index(current_hop) < len(path)-1:
+ next_hop = path[path.index(current_hop)+1]
+ else:
+ #last switch reached
+ next_hop = vnf_dst_name
+
next_node = self.getNodeByName(next_hop)
if next_hop == vnf_dst_name:
- return "path added between {0} and {1}".format(vnf_src_name, vnf_dst_name)
+ switch_outport = dst_sw_outport
+ logging.info("end node reached: {0}".format(vnf_dst_name))
elif not isinstance( next_node, OVSSwitch ):
logging.info("Next node: {0} is not a switch".format(next_hop))
return "Next node: {0} is not a switch".format(next_hop)
+ else:
+ # take first link between switches by default
+ 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']
- switch_inport = self.DCNetwork_graph[current_hop][next_hop]['dst_port']
- next2_hop = path[path.index(current_hop)+2]
- switch_outport = self.DCNetwork_graph[next_hop][next2_hop]['src_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(next_node.name, switch_inport, switch_outport))
+ #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
- if isinstance( next_node, OVSSwitch ):
+ if isinstance( current_node, OVSSwitch ):
match = 'in_port=%s' % switch_inport
if cmd=='add-flow':
else:
ofcmd=''
- next_node.dpctl(cmd, ofcmd)
-
- current_hop = next_hop
+ current_node.dpctl(cmd, ofcmd)
+ logging.info("add flow in switch: {0} in_port: {1} out_port: {2}".format(current_node.name, switch_inport,
+ switch_outport))
+ # take first link between switches by default
+ if isinstance( next_node, OVSSwitch ):
+ switch_inport = self.DCNetwork_graph[current_hop][next_hop][0]['dst_port']
+ current_hop = next_hop
- return "destination node: {0} not reached".format(vnf_dst_name)
+ return "path added between {0} and {1}".format(vnf_src_name, vnf_dst_name)
+ #return "destination node: {0} not reached".format(vnf_dst_name)
# start Ryu Openflow controller as Remote Controller for the DCNetwork
def startRyu(self):
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)
+ # no learning switch
+ #self.ryu_process = Popen([ryu_cmd, ryu_path2, ryu_option, ryu_of_port], stdout=FNULL, stderr=FNULL)
time.sleep(1)
def stopRyu(self):
memswap_limit="%dm" % int(mem_limit) if mem_limit > 0 else None # lets set swap to mem limit for now
)
# connect all given networks
+ # if no --net option is given, network = [{}], so 1 empty dict in the list
+ # this results in 1 default interface with a default ip address
for nw in network:
# TODO we cannot use TCLink here (see: https://github.com/mpeuster/dockernet/issues/3)
self.net.addLink(d, self.switch, params1=nw, cls=Link)
projects / osm / vim-emu.git / commitdiff