summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Beierl <mark.beierl@dell.com>2017-07-21 14:09:20 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-07-21 14:09:20 +0000
commit5e01201c1f4d757dfde2eafff10f7ecec370dbdd (patch)
tree3bbb7f034eb8d02f0cbffa97a04bb9197bedfcb9
parentbc5aeb16806c5b38506a9d2054ec772ad96dc16e (diff)
parent56fefc180443bbc1464be317befe2cfbb65513f3 (diff)
Merge "Replay change to reporting"
-rw-r--r--docker/storperf-httpfrontend/nginx.conf2
-rw-r--r--docker/storperf-reporting/src/app.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/docker/storperf-httpfrontend/nginx.conf b/docker/storperf-httpfrontend/nginx.conf
index d655aee..ef9fe82 100644
--- a/docker/storperf-httpfrontend/nginx.conf
+++ b/docker/storperf-httpfrontend/nginx.conf
@@ -26,7 +26,7 @@ http {
}
location /reporting/ {
- proxy_pass http://storperf-reporting:5000/;
+ proxy_pass http://storperf-reporting:5000;
proxy_set_header Host $host:$proxy_port;
}
diff --git a/docker/storperf-reporting/src/app.py b/docker/storperf-reporting/src/app.py
index 1c70faf..25edf48 100644
--- a/docker/storperf-reporting/src/app.py
+++ b/docker/storperf-reporting/src/app.py
@@ -14,14 +14,14 @@ app = Flask(__name__)
app.secret_key = 'storperf_graphing_module'
-@app.route('/success/')
+@app.route('/reporting/success/')
def success():
data = urllib.urlopen(session["url"]).read()
data = json.loads(data)
return render_template('plot_tables.html', data=data)
-@app.route('/url', methods=['POST', 'GET'])
+@app.route('/reporting/url', methods=['POST', 'GET'])
def url():
if request.method == 'POST':
url = request.form['url']
@@ -29,7 +29,7 @@ def url():
return redirect(url_for('success'))
-@app.route('/')
+@app.route('/reporting/')
def index():
return render_template('index.html')