X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=blobdiff_plain;f=src%2Femuvim%2Fapi%2Frest%2Fnetwork.py;h=a16a84a0c8375fd4c8bdc9a2073d0bdebe76ac27;hp=5375943e58ff8b6da911ee1878b473350bc95f2b;hb=aa8823c85d94a4fa72de058076195296334cdb91;hpb=bf1754e2241e389c3b1dc14fb7d30ac58492e2e7 diff --git a/src/emuvim/api/rest/network.py b/src/emuvim/api/rest/network.py index 5375943..a16a84a 100755 --- a/src/emuvim/api/rest/network.py +++ b/src/emuvim/api/rest/network.py @@ -1,44 +1,43 @@ -""" -Copyright (c) 2015 SONATA-NFV and Paderborn University -ALL RIGHTS RESERVED. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - -Neither the name of the SONATA-NFV [, ANY ADDITIONAL AFFILIATION] -nor the names of its contributors may be used to endorse or promote -products derived from this software without specific prior written -permission. - -This work has been performed in the framework of the SONATA project, -funded by the European Commission under Grant number 671517 through -the Horizon 2020 and 5G-PPP programmes. The authors would like to -acknowledge the contributions of their colleagues of the SONATA -partner consortium (www.sonata-nfv.eu). -""" - -""" -Distributed Cloud Emulator (dcemulator) -Networking and monitoring functions -(c) 2015 by Steven Van Rossem -""" - +# Copyright (c) 2015 SONATA-NFV and Paderborn University +# ALL RIGHTS RESERVED. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Neither the name of the SONATA-NFV, Paderborn University +# nor the names of its contributors may be used to endorse or promote +# products derived from this software without specific prior written +# permission. +# +# This work has been performed in the framework of the SONATA project, +# funded by the European Commission under Grant number 671517 through +# the Horizon 2020 and 5G-PPP programmes. The authors would like to +# acknowledge the contributions of their colleagues of the SONATA +# partner consortium (www.sonata-nfv.eu). +# +# Distributed Cloud Emulator (dcemulator) +# Networking and monitoring functions +# (c) 2015 by Steven Van Rossem import logging from flask_restful import Resource from flask import request -import json +import networkx + +logging.basicConfig() -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 @@ -62,27 +61,32 @@ class NetworkAction(Resource): global net - def put(self, vnf_src_name, vnf_dst_name): + def put(self): logging.debug("REST CALL: network chain add") command = 'add-flow' - return self._NetworkAction(vnf_src_name, vnf_dst_name, command=command) + return self._NetworkAction(command=command) - def delete(self, vnf_src_name, vnf_dst_name): + def delete(self): logging.debug("REST CALL: network chain remove") command = 'del-flows' - return self._NetworkAction(vnf_src_name, vnf_dst_name, command=command) + return self._NetworkAction(command=command) - def _NetworkAction(self, vnf_src_name, vnf_dst_name, command=None): + def _NetworkAction(self, 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 + # check json payload + logging.debug("json: {}".format(request.json)) + logging.debug("args: {}".format(request.args)) + data = request.json + if data is None: + data = request.args if data is None: data = {} - elif type(data) is not dict: - data = json.loads(request.json) + vnf_src_name = data.get("vnf_src_name") + vnf_dst_name = data.get("vnf_dst_name") vnf_src_interface = data.get("vnf_src_interface") vnf_dst_interface = data.get("vnf_dst_interface") weight = data.get("weight") @@ -108,7 +112,36 @@ class NetworkAction(Resource): 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 \ No newline at end of file + return str(ex), 500, CORS_HEADER + + +class DrawD3jsgraph(Resource): + + global net + + def get(self): + nodes = list() + nodes2 = list() + links = list() + # add all DCs + node_attr = networkx.get_node_attributes(net.DCNetwork_graph, 'type') + for node_name in net.DCNetwork_graph.nodes(): + nodes2.append(node_name) + type = node_attr[node_name] + node_dict = {"name": node_name, "group": type} + nodes.append(node_dict) + + # add links between other DCs + for node1_name in net.DCNetwork_graph.nodes(): + node1_index = nodes2.index(node1_name) + for node2_name in net.DCNetwork_graph.neighbors(node1_name): + node2_index = nodes2.index(node2_name) + edge_dict = {"source": node1_index, + "target": node2_index, "value": 10} + links.append(edge_dict) + + json = {"nodes": nodes, "links": links} + return json, 200, CORS_HEADER