From: stevenvanrossem Date: Thu, 22 Dec 2016 00:26:02 +0000 (+0100) Subject: update monitor REST API according to D3.2 X-Git-Tag: v3.1~45^2~29 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=4fac2afba3182039dae6216d267d13eb3b98a56f;p=osm%2Fvim-emu.git update monitor REST API according to D3.2 --- diff --git a/src/emuvim/api/rest/monitor.py b/src/emuvim/api/rest/monitor.py index 45d9541..8de0379 100755 --- a/src/emuvim/api/rest/monitor.py +++ b/src/emuvim/api/rest/monitor.py @@ -53,20 +53,26 @@ 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 except Exception as ex: logging.exception("API error.") return ex.message, 500 - 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 except Exception as ex: @@ -101,6 +107,102 @@ class MonitorFlowAction(Resource): c = net.monitor_agent.stop_flow(vnf_name, vnf_interface, metric, cookie) # return monitor message response return str(c), 200 + except Exception as ex: + logging.exception("API error.") + return ex.message, 500 + +class MonitorLinkAction(Resource): + """ + Add or remove chains between VNFs. These chain links are implemented as flow entries in the networks' SDN switches. + :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 = net.monitor_agent.setup_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 \ No newline at end of file diff --git a/src/emuvim/api/rest/network.py b/src/emuvim/api/rest/network.py index 5375943..88ea470 100755 --- a/src/emuvim/api/rest/network.py +++ b/src/emuvim/api/rest/network.py @@ -39,6 +39,7 @@ import json logging.basicConfig(level=logging.INFO) +# the global net is set from the topology file, and connected via connectDCNetwork function in rest_api_endpoint.py net = None diff --git a/src/emuvim/api/rest/rest_api_endpoint.py b/src/emuvim/api/rest/rest_api_endpoint.py index a065e16..7a0fc4f 100755 --- a/src/emuvim/api/rest/rest_api_endpoint.py +++ b/src/emuvim/api/rest/rest_api_endpoint.py @@ -39,7 +39,7 @@ import network from network import NetworkAction import monitor -from monitor import MonitorInterfaceAction, MonitorFlowAction +from monitor import MonitorInterfaceAction, MonitorFlowAction, MonitorLinkAction logging.basicConfig(level=logging.INFO) @@ -71,14 +71,18 @@ class RestApiEndpoint(object): self.api.add_resource(DatacenterStatus, "/restapi/datacenter/") self.api.add_resource(DatacenterList, "/restapi/datacenter") - self.api.add_resource(NetworkAction, "/restapi/network//", ) + self.api.add_resource(NetworkAction, + "/restapi/network//") self.api.add_resource(MonitorInterfaceAction, - "/restapi/monitor//", - "/restapi/monitor///") + "/restapi/monitor/vnf//", + "/restapi/monitor/vnf///", + "/restapi/monitor/vnf////") self.api.add_resource(MonitorFlowAction, - "/restapi/flowmon///", - "/restapi/flowmon////") + "/restapi/monitor/flow///", + "/restapi/monitor/flow////") + self.api.add_resource(MonitorLinkAction, + "/restapi/monitor/link//") logging.debug("Created API endpoint %s(%s:%d)" % (self.__class__.__name__, self.ip, self.port)) diff --git a/src/emuvim/dcemulator/net.py b/src/emuvim/dcemulator/net.py index cf85085..8f627b5 100755 --- a/src/emuvim/dcemulator/net.py +++ b/src/emuvim/dcemulator/net.py @@ -457,7 +457,7 @@ class DCNetwork(Containernet): kwargs['switch_outport_name'] = dst_sw_outport_name kwargs['skip_vlan_tag'] = True - monitor_placement = kwargs.get('monitor_placement') + monitor_placement = kwargs.get('monitor_placement').strip() # put monitor flow at the dst switch insert_flow = False if monitor_placement == 'tx' and path.index(current_hop) == 0: # first node: @@ -465,7 +465,7 @@ class DCNetwork(Containernet): # put monitoring flow at the src switch elif monitor_placement == 'rx' and path.index(current_hop) == len(path) - 1: # last node: insert_flow = True - else: + elif monitor_placement not in ['rx', 'tx']: LOG.exception('invalid monitor command: {0}'.format(monitor_placement)) @@ -524,7 +524,7 @@ class DCNetwork(Containernet): return ret else: # no chain existing (or E-LAN) -> install normal chain - LOG.warning('*** installing monitoring chain without pre-defined chain from {0}:{1} -> {2}:{3}'. + LOG.warning('*** installing monitoring chain without pre-defined NSD chain from {0}:{1} -> {2}:{3}'. format(vnf_src_name, vnf_src_interface, vnf_dst_name, vnf_dst_interface)) pass