projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try to avoid race condition problems in unittests
[osm/vim-emu.git]
/
src
/
emuvim
/
api
/
rest
/
rest_api_endpoint.py
diff --git
a/src/emuvim/api/rest/rest_api_endpoint.py
b/src/emuvim/api/rest/rest_api_endpoint.py
index
71f87b9
..
891f95d
100755
(executable)
--- a/
src/emuvim/api/rest/rest_api_endpoint.py
+++ b/
src/emuvim/api/rest/rest_api_endpoint.py
@@
-30,7
+30,7
@@
import logging
import threading
from flask import Flask
from flask_restful import Api
import threading
from flask import Flask
from flask_restful import Api
-
#
from gevent.wsgi import WSGIServer
+from gevent.wsgi import WSGIServer
# need to import total module to set its global variable dcs
import compute
# need to import total module to set its global variable dcs
import compute
@@
-38,10
+38,10
@@
from compute import dcs, ComputeList, Compute, ComputeResources, DatacenterList,
# need to import total module to set its global variable net
import network
# need to import total module to set its global variable net
import network
-from network import NetworkAction
+from network import NetworkAction
, DrawD3jsgraph
import monitor
import monitor
-from monitor import MonitorInterfaceAction, MonitorFlowAction, MonitorLinkAction, MonitorSkewAction
+from monitor import MonitorInterfaceAction, MonitorFlowAction, MonitorLinkAction, MonitorSkewAction
, MonitorTerminal
import pkg_resources
from os import path
import pkg_resources
from os import path
@@
-85,7
+85,8
@@
class RestApiEndpoint(object):
# network related actions (setup chaining between VNFs)
self.api.add_resource(NetworkAction,
"/restapi/network")
# network related actions (setup chaining between VNFs)
self.api.add_resource(NetworkAction,
"/restapi/network")
-
+ self.api.add_resource(DrawD3jsgraph,
+ "/restapi/network/d3jsgraph")
# monitoring related actions
# export a network interface traffic rate counter
# monitoring related actions
# export a network interface traffic rate counter
@@
-102,6
+103,10
@@
class RestApiEndpoint(object):
# the skewness metric is exported
self.api.add_resource(MonitorSkewAction,
"/restapi/monitor/skewness")
# the skewness metric is exported
self.api.add_resource(MonitorSkewAction,
"/restapi/monitor/skewness")
+ # start a terminal window for the specified vnfs
+ self.api.add_resource(MonitorTerminal,
+ "/restapi/monitor/term")
+
logging.debug("Created API endpoint %s(%s:%d)" % (self.__class__.__name__, self.ip, self.port))
logging.debug("Created API endpoint %s(%s:%d)" % (self.__class__.__name__, self.ip, self.port))
@@
-125,7
+130,7
@@
class RestApiEndpoint(object):
logging.info("Started API endpoint @ http://%s:%d" % (self.ip, self.port))
def _start_flask(self):
logging.info("Started API endpoint @ http://%s:%d" % (self.ip, self.port))
def _start_flask(self):
- self.app.run(self.ip, self.port, debug=True, use_reloader=False)
+
#
self.app.run(self.ip, self.port, debug=True, use_reloader=False)
#this should be a more production-fit http-server
#this should be a more production-fit http-server
-
#
http_server = WSGIServer((self.ip, self.port), self.app)
-
#
http_server.serve_forever()
+ http_server = WSGIServer((self.ip, self.port), self.app)
+ http_server.serve_forever()