From: stevenvanrossem Date: Fri, 3 Feb 2017 15:11:42 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Tag: v3.1~45^2~13 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;ds=inline;h=a6ce6f3c00d8d4ae7d378da7ddc6feccf9a38477;p=osm%2Fvim-emu.git Merge remote-tracking branch 'upstream/master' solve Conflicts: src/emuvim/api/rest/monitor.py src/emuvim/api/rest/network.py --- a6ce6f3c00d8d4ae7d378da7ddc6feccf9a38477 diff --cc dashboard/README.md index 0000000,db15c9d..db15c9d mode 000000,100644..100755 --- a/dashboard/README.md +++ b/dashboard/README.md diff --cc dashboard/css/main.css index 0000000,7b10dbc..7b10dbc mode 000000,100644..100755 --- a/dashboard/css/main.css +++ b/dashboard/css/main.css diff --cc dashboard/img/SONATA_new.png index 0000000,8fd99f4..8fd99f4 mode 000000,100644..100755 Binary files differ diff --cc dashboard/index.html index 0000000,3c31bec..3c31bec mode 000000,100644..100755 --- a/dashboard/index.html +++ b/dashboard/index.html diff --cc dashboard/js/main.js index 0000000,71741f2..71741f2 mode 000000,100644..100755 --- a/dashboard/js/main.js +++ b/dashboard/js/main.js diff --cc dashboard/son-emu-dashboard-screenshot.png index 0000000,8274984..8274984 mode 000000,100644..100755 Binary files differ diff --cc misc/sonata-stress-service.son index 8028314,8028314..8028314 mode 100644,100644..100755 Binary files differ diff --cc src/emuvim/api/rest/compute.py index f0c8954,22e9d6d..dc2b611 --- a/src/emuvim/api/rest/compute.py +++ b/src/emuvim/api/rest/compute.py @@@ -72,25 -69,11 +74,25 @@@ class Compute(Resource) c = dcs.get(dc_label).startCompute( compute_name, image=image, command=command, network=nw_list) # return docker inspect dict - return c.getStatus(), 200 + return c.getStatus(), 200, CORS_HEADER except Exception as ex: logging.exception("API error.") - return ex.message, 500 + return ex.message, 500, CORS_HEADER + def _update_resource(self, dc_label, compute_name, resource, value): + #check if container exists + d = dcs.get(dc_label).net.getNodeByName(compute_name) + if resource == 'cpu': + cpu_period = int(dcs.get(dc_label).net.cpu_period) + cpu_quota = int(cpu_period * float(value)) + #put default values back + if float(value) <= 0: + cpu_period = 100000 + cpu_quota = -1 + d.updateCpuLimit(cpu_period=cpu_period, cpu_quota=cpu_quota) + return d + + def get(self, dc_label, compute_name): logging.debug("API CALL: compute status") diff --cc src/emuvim/api/rest/monitor.py index c1c7831,5558b87..209670c --- a/src/emuvim/api/rest/monitor.py +++ b/src/emuvim/api/rest/monitor.py @@@ -53,31 -55,25 +55,31 @@@ class MonitorInterfaceAction(Resource) """ global net - def put(self, vnf_name, vnf_interface=None, metric='tx_packets'): + def put(self, vnf_name, vnf_interface=None, metric='tx_packets', cookie=None): logging.debug("REST CALL: start monitor VNF interface") try: - c = net.monitor_agent.setup_metric(vnf_name, vnf_interface, metric) + if cookie: + c = net.monitor_agent.setup_flow(vnf_name, vnf_interface, metric, cookie) + else: + c = net.monitor_agent.setup_metric(vnf_name, vnf_interface, metric) # return monitor message response - return str(c), 200 + return str(c), 200, CORS_HEADER except Exception as ex: logging.exception("API error.") - return ex.message, 500 + return ex.message, 500, CORS_HEADER - def delete(self, vnf_name, vnf_interface=None, metric='tx_packets'): + def delete(self, vnf_name, vnf_interface=None, metric='tx_packets', cookie=None): logging.debug("REST CALL: stop monitor VNF interface") try: - c = net.monitor_agent.stop_metric(vnf_name, vnf_interface, metric) + if cookie: + c = net.monitor_agent.stop_flow(vnf_name, vnf_interface, metric, cookie) + else: + c = net.monitor_agent.stop_metric(vnf_name, vnf_interface, metric) # return monitor message response - return str(c), 200 + return str(c), 200, CORS_HEADER except Exception as ex: logging.exception("API error.") - return ex.message, 500 + return ex.message, 500, CORS_HEADER class MonitorFlowAction(Resource): @@@ -106,143 -102,7 +108,144 @@@ try: c = net.monitor_agent.stop_flow(vnf_name, vnf_interface, metric, cookie) # return monitor message response - return str(c), 200 + return str(c), 200, CORS_HEADER except Exception as ex: logging.exception("API error.") - return ex.message, 500 + return ex.message, 500, CORS_HEADER + +class MonitorLinkAction(Resource): + """ + Add or remove flow monitoring on chains between VNFs. + These chain links are implemented as flow entries in the networks' SDN switches. + The monitoring is an extra flow entry on top of the existing chain, with a specific match. (preserving the chaining) + The counters of this new monitoring flow are exported + :param vnf_src_name: VNF name of the source of the link + :param vnf_dst_name: VNF name of the destination of the link + :param vnf_src_interface: VNF interface name of the source of the link + :param vnf_dst_interface: VNF interface name of the destination of the link + :param weight: weight of the link (can be useful for routing calculations) + :param match: OpenFlow match format of the flow entry + :param bidirectional: boolean value if the link needs to be implemented from src to dst and back + :param cookie: cookie value, identifier of the flow entry to be installed. + :param priority: integer indicating the priority of the flow entry + :param skip_vlan_tag: boolean to indicate whether a new vlan tag should be created for this chain + :param monitor: boolean to indicate whether a new vlan tag should be created for this chain + :param monitor_placement: 'tx'=place the monitoring flowrule at the beginning of the chain, 'rx'=place at the end of the chain + :param metric: tx_packet_rate, tx_byte_rate, rx_packet_rate, rx_byte_rate + :return: message string indicating if the chain action is succesful or not + """ + + # the global net is set from the topology file, and connected via connectDCNetwork function in rest_api_endpoint.py + global net + + def put(self, vnf_src_name, vnf_dst_name): + logging.debug("REST CALL: monitor link flow add") + + try: + command = 'add-flow' + return self._MonitorLinkAction(vnf_src_name, vnf_dst_name, command=command) + except Exception as ex: + logging.exception("API error.") + return ex.message, 500 + + def delete(self, vnf_src_name, vnf_dst_name): + logging.debug("REST CALL: monitor link flow remove") + + try: + command = 'del-flows' + return self._MonitorLinkAction(vnf_src_name, vnf_dst_name, command=command) + except Exception as ex: + logging.exception("API error.") + return ex.message, 500 + + def _MonitorLinkAction(self, vnf_src_name, vnf_dst_name, command=None): + # call DCNetwork method, not really datacenter specific API for now... + # no check if vnfs are really connected to this datacenter... + try: + # check if json data is a dict + data = request.json + if data is None: + data = {} + elif type(data) is not dict: + data = json.loads(request.json) + + vnf_src_interface = data.get("vnf_src_interface") + vnf_dst_interface = data.get("vnf_dst_interface") + weight = data.get("weight") + match = data.get("match") + bidirectional = data.get("bidirectional") + cookie = data.get("cookie") + priority = data.get("priority") + skip_vlan_tag = data.get("skip_vlan_tag") + monitor = data.get("monitor") + monitor_placement = data.get("monitor_placement") + + #first install monitor flow + c1 = net.setChain( + vnf_src_name, vnf_dst_name, + vnf_src_interface=vnf_src_interface, + vnf_dst_interface=vnf_dst_interface, + cmd=command, + weight=weight, + match=match, + bidirectional=bidirectional, + cookie=cookie, + priority=priority, + skip_vlan_tag=skip_vlan_tag, + monitor=monitor, + monitor_placement=monitor_placement) + + #then export monitor flow + metric = data.get("metric") + if 'rx' in monitor_placement: + vnf_name = vnf_dst_name + vnf_interface = vnf_dst_interface + elif 'tx' in monitor_placement: + vnf_name = vnf_src_name + vnf_interface = vnf_src_interface + + c2 = 'command unknown' + if command == 'add-flow': + c2 = net.monitor_agent.setup_flow(vnf_name, vnf_interface, metric, cookie) + elif command == 'del-flows': + c2 = net.monitor_agent.stop_flow(vnf_name, vnf_interface, metric, cookie) + + # return setChain response + return (str(c1) + " " + str(c2)), 200 + except Exception as ex: + logging.exception("API error.") - return ex.message, 500 ++ return ex.message, 500, CORS_HEADER + +class MonitorSkewAction(Resource): + """ + Monitor the counters of a VNF interface + :param vnf_name: name of the VNF to be monitored + :param resource: the resource to be monitored (cpu, mem, ...) + :return: message string indicating if the monitor action is succesful or not + """ + global net + + def put(self, vnf_name, resource_name='cpu'): + logging.debug("REST CALL: start monitor skewness") + try: + # configure skewmon + c = net.monitor_agent.update_skewmon(vnf_name, resource_name, action='start') + + # return monitor message response + return str(c), 200 + except Exception as ex: + logging.exception("API error.") + return ex.message, 500 + + def delete(self, vnf_name, resource_name='cpu'): + logging.debug("REST CALL: stop monitor skewness") + try: + # configure skewmon + c = net.monitor_agent.update_skewmon(vnf_name, resource_name, action='stop') + + # return monitor message response + return str(c), 200 + except Exception as ex: + logging.exception("API error.") - return ex.message, 500 ++ return ex.message, 500, CORS_HEADER ++ diff --cc src/emuvim/api/rest/network.py index 88ea470,2745602..10baa8f --- a/src/emuvim/api/rest/network.py +++ b/src/emuvim/api/rest/network.py @@@ -39,7 -39,8 +39,9 @@@ import jso logging.basicConfig(level=logging.INFO) + CORS_HEADER = {'Access-Control-Allow-Origin': '*'} + +# the global net is set from the topology file, and connected via connectDCNetwork function in rest_api_endpoint.py net = None @@@ -104,12 -98,9 +106,12 @@@ class NetworkAction(Resource) match=match, bidirectional=bidirectional, cookie=cookie, - priority=priority) + priority=priority, + skip_vlan_tag=skip_vlan_tag, + monitor=monitor, + monitor_placement=monitor_placement) # return setChain response - return str(c), 200 + return str(c), 200, CORS_HEADER except Exception as ex: logging.exception("API error.") - return ex.message, 500 + return ex.message, 500, CORS_HEADER