From: zhang ab Date: Fri, 23 Mar 2018 07:22:35 +0000 (+0000) Subject: Merge "Migrate get vim_types to new framework" X-Git-Tag: v1.1.2~52 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=multicloud%2Fframework.git;a=commitdiff_plain;h=8bc264d30294b15639c37ab446aa081ff09e41f0;hp=a137643d7f753d1b26f0d7863912264e7c49a2fe Merge "Migrate get vim_types to new framework" --- diff --git a/docs/specs/parallelism_improvement.rst b/docs/specs/parallelism_improvement.rst index 00d66df..86f39d8 100644 --- a/docs/specs/parallelism_improvement.rst +++ b/docs/specs/parallelism_improvement.rst @@ -116,7 +116,7 @@ Result: 100000 requests, concurrency level 1000 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Command: `ab -n 10000 -c 100 http:///api/multicloud/v0/vim_types` +Command: `ab -n 100000 -c 1000 http:///api/multicloud/v0/vim_types` Result: Django runserver: Apache Benchmark quit because it reports timeout after running a random portion of all requests. diff --git a/multivimbroker/requirements.txt b/multivimbroker/requirements.txt index ef24d49..1d8330c 100644 --- a/multivimbroker/requirements.txt +++ b/multivimbroker/requirements.txt @@ -24,4 +24,11 @@ mock==2.0.0 unittest_xml_reporting==1.12.0 # for onap logging -onappylog>=1.0.6 \ No newline at end of file +onappylog>=1.0.6 + +# for pecan framework +pecan>=1.2.1 +oslo.concurrency>=3.21.0 +oslo.config>=4.11.0 +oslo.service>=1.25.0 +eventlet>=0.20.0 diff --git a/multivimbroker/run.sh b/multivimbroker/run.sh index 35f2b9e..e73496f 100755 --- a/multivimbroker/run.sh +++ b/multivimbroker/run.sh @@ -26,10 +26,14 @@ if [ ! -x $logDir ]; then mkdir -p $logDir fi -nohup python manage.py runserver 0.0.0.0:9001 2>&1 & +if [ "$WEB_FRAMEWORK" == "pecan" ] +then + python multivimbroker/scripts/api.py +else + nohup python manage.py runserver 0.0.0.0:9001 2>&1 & -while [ ! -f $logDir/multivimbroker.log ]; do - sleep 1 -done + while [ ! -f $logDir/multivimbroker.log ]; do + sleep 1 + done -tail -F $logDir/multivimbroker.log + tail -F $logDir/multivimbroker.log