Replay change to reporting

Puts /reporting back into the web server's path.

Change-Id: I201a7d5a9d22b4d34d7706711fcd3c8efd76f1eb
JIRA: STORPERF-192
Signed-off-by: mbeierl <mark.beierl@dell.com>

diff --git a/docker/storperf-httpfrontend/nginx.conf b/docker/storperf-httpfrontend/nginx.conf
index d655aee..ef9fe82 100644 (file)
--- 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 (file)
--- 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')