From da56b4dac702713045aaeeedbab9234e1825ffe0 Mon Sep 17 00:00:00 2001 From: Mark Beierl Date: Wed, 4 May 2016 22:53:07 -0400 Subject: Add Stats report and Swagger UI Add Swagger web ui at /swagger Add ability to fetch read/write latency status via ReST ui Can now delete where stack was removed from OpenStack but not from the storperf DB Change to use Floating IPs instead of private IP Fix delete bug where there was no dependency on resources in the resource group. JIRA: STORPERF-19 JIRA: STORPERF-20 Change-Id: I1d9627d81f3c309b178a9b68cc306a4101c1a231 Signed-off-by: Mark Beierl --- docker/Dockerfile | 9 +++++++++ docker/requirements.pip | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile index fab768f..fb25bfc 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -40,6 +40,7 @@ wget \ puppet \ build-essential \ python-dev \ +python-matplotlib \ python-pip \ --no-install-recommends @@ -63,9 +64,17 @@ RUN chmod 700 /root/.ssh RUN git config --global http.sslVerify false RUN git clone https://gerrit.opnfv.org/gerrit/storperf ${repos_dir}/storperf RUN git clone https://gerrit.opnfv.org/gerrit/releng ${repos_dir}/releng + +# Third party git fetches +RUN git clone https://github.com/swagger-api/swagger-ui.git ${repos_dir}/swagger-ui +RUN mkdir -p ${repos_dir}/storperf/storperf/resources/html/swagger +RUN cp -r ${repos_dir}/swagger-ui/dist/* ${repos_dir}/storperf/storperf/resources/html/swagger +RUN sed -i 's|url = "http://petstore.swagger.io/v2/swagger.json";|url = window.location.protocol+"//"+window.location.host+"/api/spec.json";|' ${repos_dir}/storperf/storperf/resources/html/swagger/index.html + RUN git clone http://git.kernel.dk/fio.git ${repos_dir}/fio RUN cd ${repos_dir}/fio && git checkout tags/fio-2.2.10 RUN cd ${repos_dir}/fio && make -j 6 install + RUN puppet module install gdsoperations-graphite RUN chmod 600 ${repos_dir}/storperf/storperf/resources/ssh/storperf_rsa diff --git a/docker/requirements.pip b/docker/requirements.pip index 89f19ae..4c9aaae 100644 --- a/docker/requirements.pip +++ b/docker/requirements.pip @@ -9,4 +9,4 @@ flask==0.10 flask-restful==0.3.5 flask-restful-swagger==0.19 flask-swagger==0.2.12 -html2text==2016.1.8 \ No newline at end of file +html2text==2016.1.8 -- cgit 1.2.3-korg