diff options
Diffstat (limited to 'docker')
15 files changed, 68 insertions, 47 deletions
diff --git a/docker/storperf-httpfrontend/html/css/bootstrap.min.css b/docker/storperf-httpfrontend/html/3rd_party/css/bootstrap.min.css index ed3905e..ed3905e 100644 --- a/docker/storperf-httpfrontend/html/css/bootstrap.min.css +++ b/docker/storperf-httpfrontend/html/3rd_party/css/bootstrap.min.css diff --git a/docker/storperf-httpfrontend/html/index.html b/docker/storperf-httpfrontend/html/index.html index 3b41653..d07ec97 100644 --- a/docker/storperf-httpfrontend/html/index.html +++ b/docker/storperf-httpfrontend/html/index.html @@ -17,7 +17,7 @@ StorPerf Home <head> <title>Storperf</title> <!-- Latest compiled and minified CSS --> -<link rel="stylesheet" href="./css/bootstrap.min.css"> +<link rel="stylesheet" href="./3rd_party/css/bootstrap.min.css"> </head> @@ -47,4 +47,4 @@ elaboration about Storperf. Open to Suggestions.</p> </body> -</html>
\ No newline at end of file +</html> diff --git a/docker/storperf-master/rest_server.py b/docker/storperf-master/rest_server.py index 67d2d05..7f38ab6 100644 --- a/docker/storperf-master/rest_server.py +++ b/docker/storperf-master/rest_server.py @@ -192,6 +192,7 @@ class Configure(Resource): 'stack_id': storperf.stack_id}) except Exception as e: + self.logger.exception(e) abort(400, str(e)) @swagger.operation( diff --git a/docker/storperf-master/storperf/storperf_master.py b/docker/storperf-master/storperf/storperf_master.py index da8a05e..7244b66 100644 --- a/docker/storperf-master/storperf/storperf_master.py +++ b/docker/storperf-master/storperf/storperf_master.py @@ -40,10 +40,19 @@ class StorPerfMaster(object): name='StorPerfAgentGroup', template_path='storperf/resources/hot/agent-group.yaml') - self.os_creds = OSCreds(username=os.environ.get('OS_USERNAME'), - password=os.environ.get('OS_PASSWORD'), - auth_url=os.environ.get('OS_AUTH_URL'), - project_name=os.environ.get('OS_PROJECT_NAME')) + self.os_creds = OSCreds( + username=os.environ.get('OS_USERNAME'), + password=os.environ.get('OS_PASSWORD'), + auth_url=os.environ.get('OS_AUTH_URL'), + identity_api_version=os.environ.get('OS_IDENTITY_API_VERSION'), + user_domain_name=os.environ.get('OS_USER_DOMAIN_NAME'), + user_domain_id=os.environ.get('OS_USER_DOMAIN_ID'), + region_name=os.environ.get('OS_REGION_NAME'), + project_domain_name=os.environ.get('OS_PROJECT_DOMAIN_NAME'), + project_domain_id=os.environ.get('OS_PROJECT_DOMAIN_ID'), + project_name=os.environ.get('OS_PROJECT_NAME')) + + self.logger.debug("OSCreds: %s" % self.os_creds) self.heat_stack = OpenStackHeatStack(self.os_creds, self.stack_settings) @@ -265,12 +274,23 @@ class StorPerfMaster(object): res = heat_utils.get_resources(heat_cli, self.heat_stack.get_stack().id) self.logger.error("Stack creation failed") + reason = "" + failed = False for resource in res: - status = resource.status - self.logger.error("%s: %s" % (resource.name, status)) - if status == u'CREATE_FAILED': - self.delete_stack() - raise Exception(resource.status_reason) + if resource.status == u'CREATE_FAILED': + failed = True + reason += "%s: %s " % (resource.name, + resource.status_reason) + self.logger.error("%s - %s: %s" % (resource.name, + resource.status, + resource.status_reason)) + + if failed: + try: + self.heat_stack.clean() + except Exception: + pass + raise Exception(reason) def delete_stack(self): if self._test_executor is not None: diff --git a/docker/storperf-reporting/src/app.py b/docker/storperf-reporting/src/app.py index 79baa33..9bd1a04 100644 --- a/docker/storperf-reporting/src/app.py +++ b/docker/storperf-reporting/src/app.py @@ -128,12 +128,12 @@ def file_not_found(): return redirect(url_for('index')) -@app.route('/reporting/js/<path:path>') +@app.route('/reporting/3rd_party/js/<path:path>') def js(path): return send_from_directory('static/js/', path) -@app.route('/reporting/css/<path:path>') +@app.route('/reporting/3rd_party/css/<path:path>') def css(path): return send_from_directory('static/css/', path) diff --git a/docker/storperf-reporting/src/static/css/bootstrap.min.css b/docker/storperf-reporting/src/static/3rd_party/css/bootstrap.min.css index cd1c616..cd1c616 100644 --- a/docker/storperf-reporting/src/static/css/bootstrap.min.css +++ b/docker/storperf-reporting/src/static/3rd_party/css/bootstrap.min.css diff --git a/docker/storperf-reporting/src/static/js/Chart.min.js b/docker/storperf-reporting/src/static/3rd_party/js/Chart.min.js index 3e93936..3e93936 100644 --- a/docker/storperf-reporting/src/static/js/Chart.min.js +++ b/docker/storperf-reporting/src/static/3rd_party/js/Chart.min.js diff --git a/docker/storperf-reporting/src/static/js/bootstrap.min.js b/docker/storperf-reporting/src/static/3rd_party/js/bootstrap.min.js index c8f82e5..c8f82e5 100644 --- a/docker/storperf-reporting/src/static/js/bootstrap.min.js +++ b/docker/storperf-reporting/src/static/3rd_party/js/bootstrap.min.js diff --git a/docker/storperf-reporting/src/static/js/jquery-2.1.3.min.js b/docker/storperf-reporting/src/static/3rd_party/js/jquery-2.1.3.min.js index 25714ed..25714ed 100644 --- a/docker/storperf-reporting/src/static/js/jquery-2.1.3.min.js +++ b/docker/storperf-reporting/src/static/3rd_party/js/jquery-2.1.3.min.js diff --git a/docker/storperf-reporting/src/static/js/jquery.bootpag.min.js b/docker/storperf-reporting/src/static/3rd_party/js/jquery.bootpag.min.js index 324b1a3..324b1a3 100644 --- a/docker/storperf-reporting/src/static/js/jquery.bootpag.min.js +++ b/docker/storperf-reporting/src/static/3rd_party/js/jquery.bootpag.min.js diff --git a/docker/storperf-reporting/src/static/js/plotly-latest.min.js b/docker/storperf-reporting/src/static/3rd_party/js/plotly-latest.min.js index 753a7ba..753a7ba 100644 --- a/docker/storperf-reporting/src/static/js/plotly-latest.min.js +++ b/docker/storperf-reporting/src/static/3rd_party/js/plotly-latest.min.js diff --git a/docker/storperf-reporting/src/templates/index.html b/docker/storperf-reporting/src/templates/index.html index ab4e539..65da38d 100644 --- a/docker/storperf-reporting/src/templates/index.html +++ b/docker/storperf-reporting/src/templates/index.html @@ -4,10 +4,10 @@ <head> <title>Graphing Module | Storperf</title> <link rel="icon" href="/reporting/images/OPNVF_ProjectIcons_2400x2400_Storperf.png"> - <link rel="stylesheet" href="/reporting/css/bootstrap.min.css"> - <script src="/reporting/js/jquery-2.1.3.min.js"></script> - <script src="/reporting/js/bootstrap.min.js"></script> - <script src="/reporting/js/jquery.bootpag.min.js"></script> + <link rel="stylesheet" href="/reporting/3rd_party/css/bootstrap.min.css"> + <script src="/reporting/3rd_party/js/jquery-2.1.3.min.js"></script> + <script src="/reporting/3rd_party/js/bootstrap.min.js"></script> + <script src="/reporting/3rd_party/js/jquery.bootpag.min.js"></script> </head> <body> @@ -37,4 +37,4 @@ </div> </body> -</html>
\ No newline at end of file +</html> diff --git a/docker/storperf-reporting/src/templates/plot_jobs.html b/docker/storperf-reporting/src/templates/plot_jobs.html index d2d3613..f10dd6c 100644 --- a/docker/storperf-reporting/src/templates/plot_jobs.html +++ b/docker/storperf-reporting/src/templates/plot_jobs.html @@ -4,12 +4,12 @@ <head> <meta charset="utf-8" /> <title>Chart | Storperf</title> - <link rel="stylesheet" href="/reporting/css/bootstrap.min.css"> - <script src="/reporting/js/jquery-2.1.3.min.js"></script> - <script src="/reporting/js/bootstrap.min.js"></script> - <script src="/reporting/js/jquery.bootpag.min.js"></script> - <script src="/reporting/js/plotly-latest.min.js"></script> - <script src="/reporting/js/Chart.min.js"></script> + <link rel="stylesheet" href="/reporting/3rd_party/css/bootstrap.min.css"> + <script src="/reporting/3rd_party/js/jquery-2.1.3.min.js"></script> + <script src="/reporting/3rd_party/js/bootstrap.min.js"></script> + <script src="/reporting/3rd_party/js/jquery.bootpag.min.js"></script> + <script src="/reporting/3rd_party/js/plotly-latest.min.js"></script> + <script src="/reporting/3rd_party/js/Chart.min.js"></script> <style> /* The Modal (background) */ .modal { @@ -88,8 +88,8 @@ ul { text += "<div class='row well' id='row-" + key[i] + "'>"; text += "<h4> Job ID: " + key[i] + "</h4>"; text += "<button type='button' class='btn btn-default btn-lg' id='para-"+ key[i] + - "' onclick=add_info('" + key[i] + "')> Click here to view details </button>"; - text += "</div>"; + "' onclick=add_info('" + key[i] + "')> Click here to view details </button>"; + text += "</div>"; } $("#content").html(text); } @@ -112,8 +112,8 @@ ul { text += "<h4 onclick=add_test('" + keys[i] + "')>" + keys[i] + "</h4>"; text += "</div>"; } - } - $("#content").html(text); + } + $("#content").html(text); } function add_test(key){ if(document.getElementById("test-" + key) == null){ @@ -264,4 +264,4 @@ ul { </script> </body> -</html>
\ No newline at end of file +</html> diff --git a/docker/storperf-reporting/src/templates/plot_multi_data.html b/docker/storperf-reporting/src/templates/plot_multi_data.html index 9a81599..f35c368 100644 --- a/docker/storperf-reporting/src/templates/plot_multi_data.html +++ b/docker/storperf-reporting/src/templates/plot_multi_data.html @@ -4,12 +4,12 @@ <head> <meta charset="utf-8" /> <title>Chart | Storperf</title> - <link rel="stylesheet" href="/reporting/css/bootstrap.min.css"> - <script src="/reporting/js/jquery-2.1.3.min.js"></script> - <script src="/reporting/js/bootstrap.min.js"></script> - <script src="/reporting/js/jquery.bootpag.min.js"></script> - <script src="/reporting/js/plotly-latest.min.js"></script> - <script src="/reporting/js/Chart.min.js"></script> + <link rel="stylesheet" href="/reporting/3rd_party/css/bootstrap.min.css"> + <script src="/reporting/3rd_party/js/jquery-2.1.3.min.js"></script> + <script src="/reporting/3rd_party/js/bootstrap.min.js"></script> + <script src="/reporting/3rd_party/js/jquery.bootpag.min.js"></script> + <script src="/reporting/3rd_party/js/plotly-latest.min.js"></script> + <script src="/reporting/3rd_party/js/Chart.min.js"></script> </head> <body> diff --git a/docker/storperf-reporting/src/templates/plot_tables.html b/docker/storperf-reporting/src/templates/plot_tables.html index ecdf764..536bb42 100644 --- a/docker/storperf-reporting/src/templates/plot_tables.html +++ b/docker/storperf-reporting/src/templates/plot_tables.html @@ -4,12 +4,12 @@ <head> <meta charset="utf-8" /> <title>Chart | Storperf</title> - <link rel="stylesheet" href="/reporting/css/bootstrap.min.css"> - <script src="/reporting/js/jquery-2.1.3.min.js"></script> - <script src="/reporting/js/bootstrap.min.js"></script> - <script src="/reporting/js/jquery.bootpag.min.js"></script> - <script src="/reporting/js/plotly-latest.min.js"></script> - <script src="/reporting/js/Chart.min.js"></script> + <link rel="stylesheet" href="/reporting/3rd_party/css/bootstrap.min.css"> + <script src="/reporting/3rd_party/js/jquery-2.1.3.min.js"></script> + <script src="/reporting/3rd_party/js/bootstrap.min.js"></script> + <script src="/reporting/3rd_party/js/jquery.bootpag.min.js"></script> + <script src="/reporting/3rd_party/js/plotly-latest.min.js"></script> + <script src="/reporting/3rd_party/js/Chart.min.js"></script> <style> </style> </head> @@ -41,8 +41,8 @@ text += "<h4> Start Date : " + results["start_date"] + "</h4>"; text += "<h4> Criteria : " + results["criteria"] + "</h4>"; text += "<h4> Build Tag : " + results["build_tag"] + "</h4>"; - text += "<button type='button' class='btn btn-default btn-lg' onclick=add_info()> Click here to view details </button>"; - text += "</div>"; + text += "<button type='button' class='btn btn-default btn-lg' onclick=add_info()> Click here to view details </button>"; + text += "</div>"; text += "<div id='info'></div>"; $("#content").html(text); } @@ -55,7 +55,7 @@ text += "<h4> Build Tag : " + results["build_tag"] + "</h4>"; text += "<button type='button' class='btn btn-default btn-lg' onclick=create_block_report()> Steady State Convergence Report - All Block Sizes </button>"; text += "<div class='row' id='block_report'></div>" - text += "</div>"; + text += "</div>"; text += "<div id='info'></div>"; for (var i = 0; i < keys.length; i++ ){ text += "<div class='row' id='row-"+ keys[i] +"'>"; @@ -89,7 +89,7 @@ for( item in report_data[key][test] ){ var state = report_data[key][test][item]["steady_state"]; text += "<li onclick=create_modal('" + key + "','" + test + "','" + item + "') id='"; - text += key + "-" + test + "-" + item + "'>" + item + " (steady state: " + state +")"; + text += key + "-" + test + "-" + item + "'>" + item + " (steady state: " + state +")"; text += "<br><div id='modal-" + key + "-" + test + "-" + item + "'>"; text += '<div class="modal-content-'+ key + '-' + test + '-' + item +'">'; text += '<div id="modal-text-'+ key + '-' + test + '-' + item +'"></div>'; @@ -280,7 +280,7 @@ for(i in report_data){ if(report_data[i][test] == undefined && test == 'lat_ns.mean') test = 'lat.mean'; - data[i] = report_data[i][test][key]; + data[i] = report_data[i][test][key]; } document.getElementById('close-block-report-'+key+'-'+test).style.display = 'block'; var modal = document.getElementById('modal-block-report-'+key+'-'+test); @@ -327,4 +327,4 @@ </script> </body> -</html>
\ No newline at end of file +</html> |