From 70742b22b94305fb1f5951485517843dc6dc0398 Mon Sep 17 00:00:00 2001 From: Yichen Wang Date: Wed, 27 Jan 2016 18:02:45 -0800 Subject: [PATCH] Fix the Rest API server to support storage tests 1. Fix the Rest API server to support storage tests; 2. Add a new folder to hold Web UI for storage tests; Change-Id: Id55e77fab17b587ab1590b33281117bfba9245e3 --- kb_server/kb_server/controllers/api_cfg.py | 3 ++- kb_server/public/ui/{ => http}/404.html | 0 kb_server/public/ui/{ => http}/favicon.ico | Bin .../public/ui/{ => http}/images/back.8e3b7090.jpg | Bin .../public/ui/{ => http}/images/logo.d2085010.jpg | Bin kb_server/public/ui/{ => http}/index.html | 0 kb_server/public/ui/{ => http}/robots.txt | 0 .../ui/{ => http}/scripts/scripts.fa59335f.js | 0 .../public/ui/{ => http}/scripts/vendor.3054de46.js | 0 .../glyphicons-halflings-regular.448c34a5.woff2 | Bin .../fonts/glyphicons-halflings-regular.89889688.svg | 0 .../fonts/glyphicons-halflings-regular.e18bbf61.ttf | Bin .../fonts/glyphicons-halflings-regular.f4769f9b.eot | Bin .../glyphicons-halflings-regular.fa277232.woff | Bin .../public/ui/{ => http}/styles/main.29bdece9.css | 0 .../public/ui/{ => http}/styles/vendor.17ab9586.css | 0 kb_server/public/ui/storage/index.html | 1 + 17 files changed, 3 insertions(+), 1 deletion(-) rename kb_server/public/ui/{ => http}/404.html (100%) rename kb_server/public/ui/{ => http}/favicon.ico (100%) rename kb_server/public/ui/{ => http}/images/back.8e3b7090.jpg (100%) rename kb_server/public/ui/{ => http}/images/logo.d2085010.jpg (100%) rename kb_server/public/ui/{ => http}/index.html (100%) rename kb_server/public/ui/{ => http}/robots.txt (100%) rename kb_server/public/ui/{ => http}/scripts/scripts.fa59335f.js (100%) rename kb_server/public/ui/{ => http}/scripts/vendor.3054de46.js (100%) rename kb_server/public/ui/{ => http}/styles/fonts/glyphicons-halflings-regular.448c34a5.woff2 (100%) rename kb_server/public/ui/{ => http}/styles/fonts/glyphicons-halflings-regular.89889688.svg (100%) rename kb_server/public/ui/{ => http}/styles/fonts/glyphicons-halflings-regular.e18bbf61.ttf (100%) rename kb_server/public/ui/{ => http}/styles/fonts/glyphicons-halflings-regular.f4769f9b.eot (100%) rename kb_server/public/ui/{ => http}/styles/fonts/glyphicons-halflings-regular.fa277232.woff (100%) rename kb_server/public/ui/{ => http}/styles/main.29bdece9.css (100%) rename kb_server/public/ui/{ => http}/styles/vendor.17ab9586.css (100%) create mode 100644 kb_server/public/ui/storage/index.html diff --git a/kb_server/kb_server/controllers/api_cfg.py b/kb_server/kb_server/controllers/api_cfg.py index fb3b839..07ed57e 100644 --- a/kb_server/kb_server/controllers/api_cfg.py +++ b/kb_server/kb_server/controllers/api_cfg.py @@ -177,7 +177,8 @@ class ConfigController(object): kb_session.kloudbuster = KloudBuster( kb_config.cred_tested, kb_config.cred_testing, kb_config.server_cfg, kb_config.client_cfg, - kb_config.topo_cfg, kb_config.tenants_list) + kb_config.topo_cfg, kb_config.tenants_list, + storage_mode=kb_config.storage_mode) kb_session.kloudbuster.fp_logfile = open(logfile_name) except Exception: LOG.warning(traceback.format_exc()) diff --git a/kb_server/public/ui/404.html b/kb_server/public/ui/http/404.html similarity index 100% rename from kb_server/public/ui/404.html rename to kb_server/public/ui/http/404.html diff --git a/kb_server/public/ui/favicon.ico b/kb_server/public/ui/http/favicon.ico similarity index 100% rename from kb_server/public/ui/favicon.ico rename to kb_server/public/ui/http/favicon.ico diff --git a/kb_server/public/ui/images/back.8e3b7090.jpg b/kb_server/public/ui/http/images/back.8e3b7090.jpg similarity index 100% rename from kb_server/public/ui/images/back.8e3b7090.jpg rename to kb_server/public/ui/http/images/back.8e3b7090.jpg diff --git a/kb_server/public/ui/images/logo.d2085010.jpg b/kb_server/public/ui/http/images/logo.d2085010.jpg similarity index 100% rename from kb_server/public/ui/images/logo.d2085010.jpg rename to kb_server/public/ui/http/images/logo.d2085010.jpg diff --git a/kb_server/public/ui/index.html b/kb_server/public/ui/http/index.html similarity index 100% rename from kb_server/public/ui/index.html rename to kb_server/public/ui/http/index.html diff --git a/kb_server/public/ui/robots.txt b/kb_server/public/ui/http/robots.txt similarity index 100% rename from kb_server/public/ui/robots.txt rename to kb_server/public/ui/http/robots.txt diff --git a/kb_server/public/ui/scripts/scripts.fa59335f.js b/kb_server/public/ui/http/scripts/scripts.fa59335f.js similarity index 100% rename from kb_server/public/ui/scripts/scripts.fa59335f.js rename to kb_server/public/ui/http/scripts/scripts.fa59335f.js diff --git a/kb_server/public/ui/scripts/vendor.3054de46.js b/kb_server/public/ui/http/scripts/vendor.3054de46.js similarity index 100% rename from kb_server/public/ui/scripts/vendor.3054de46.js rename to kb_server/public/ui/http/scripts/vendor.3054de46.js diff --git a/kb_server/public/ui/styles/fonts/glyphicons-halflings-regular.448c34a5.woff2 b/kb_server/public/ui/http/styles/fonts/glyphicons-halflings-regular.448c34a5.woff2 similarity index 100% rename from kb_server/public/ui/styles/fonts/glyphicons-halflings-regular.448c34a5.woff2 rename to kb_server/public/ui/http/styles/fonts/glyphicons-halflings-regular.448c34a5.woff2 diff --git a/kb_server/public/ui/styles/fonts/glyphicons-halflings-regular.89889688.svg b/kb_server/public/ui/http/styles/fonts/glyphicons-halflings-regular.89889688.svg similarity index 100% rename from kb_server/public/ui/styles/fonts/glyphicons-halflings-regular.89889688.svg rename to kb_server/public/ui/http/styles/fonts/glyphicons-halflings-regular.89889688.svg diff --git a/kb_server/public/ui/styles/fonts/glyphicons-halflings-regular.e18bbf61.ttf b/kb_server/public/ui/http/styles/fonts/glyphicons-halflings-regular.e18bbf61.ttf similarity index 100% rename from kb_server/public/ui/styles/fonts/glyphicons-halflings-regular.e18bbf61.ttf rename to kb_server/public/ui/http/styles/fonts/glyphicons-halflings-regular.e18bbf61.ttf diff --git a/kb_server/public/ui/styles/fonts/glyphicons-halflings-regular.f4769f9b.eot b/kb_server/public/ui/http/styles/fonts/glyphicons-halflings-regular.f4769f9b.eot similarity index 100% rename from kb_server/public/ui/styles/fonts/glyphicons-halflings-regular.f4769f9b.eot rename to kb_server/public/ui/http/styles/fonts/glyphicons-halflings-regular.f4769f9b.eot diff --git a/kb_server/public/ui/styles/fonts/glyphicons-halflings-regular.fa277232.woff b/kb_server/public/ui/http/styles/fonts/glyphicons-halflings-regular.fa277232.woff similarity index 100% rename from kb_server/public/ui/styles/fonts/glyphicons-halflings-regular.fa277232.woff rename to kb_server/public/ui/http/styles/fonts/glyphicons-halflings-regular.fa277232.woff diff --git a/kb_server/public/ui/styles/main.29bdece9.css b/kb_server/public/ui/http/styles/main.29bdece9.css similarity index 100% rename from kb_server/public/ui/styles/main.29bdece9.css rename to kb_server/public/ui/http/styles/main.29bdece9.css diff --git a/kb_server/public/ui/styles/vendor.17ab9586.css b/kb_server/public/ui/http/styles/vendor.17ab9586.css similarity index 100% rename from kb_server/public/ui/styles/vendor.17ab9586.css rename to kb_server/public/ui/http/styles/vendor.17ab9586.css diff --git a/kb_server/public/ui/storage/index.html b/kb_server/public/ui/storage/index.html new file mode 100644 index 0000000..9daeafb --- /dev/null +++ b/kb_server/public/ui/storage/index.html @@ -0,0 +1 @@ +test