Refactor installation process

Change-Id: I72eb7917b3800bdabfae46e1605e78f7066b4941
This commit is contained in:
Denis Makogon 2015-03-23 15:42:43 +02:00
parent 13d0c6b42a
commit 2298ac8d51
7 changed files with 12 additions and 5 deletions

View File

@ -13,9 +13,9 @@
# under the License. # under the License.
from cloudv_ostf_adapter.common import cfg from cloudv_ostf_adapter.common import cfg
from cloudv_ostf_adapter.cloudv_client import plugins from cloudv_client import plugins
from cloudv_ostf_adapter.cloudv_client import suites from cloudv_client import suites
from cloudv_ostf_adapter.cloudv_client import tests from cloudv_client import tests
CONF = cfg.CONF CONF = cfg.CONF

View File

@ -17,7 +17,7 @@ import sys
from oslo_config import cfg from oslo_config import cfg
from cloudv_ostf_adapter.common import cfg as config from cloudv_ostf_adapter.common import cfg as config
from cloudv_ostf_adapter.cloudv_client import client from cloudv_client import client
from cloudv_ostf_adapter.common import utils from cloudv_ostf_adapter.common import utils
from cloudv_ostf_adapter.cmd import _common as cmd from cloudv_ostf_adapter.cmd import _common as cmd
@ -35,6 +35,7 @@ class ClientV1Shell(object):
""" """
List plugins List plugins
""" """
resp = self._client.plugins.list(load_tests=False) resp = self._client.plugins.list(load_tests=False)
for plugin in resp: for plugin in resp:
suites = plugin['suites'] suites = plugin['suites']
@ -49,6 +50,7 @@ class ClientV1Shell(object):
Required options: Required options:
--validation-plugin --validation-plugin
""" """
resp = self._client.suites.list_suites(validation_plugin_name) resp = self._client.suites.list_suites(validation_plugin_name)
suites = resp['suites'] suites = resp['suites']
resp['suites'] = "\n".join(suites) resp['suites'] = "\n".join(suites)
@ -62,6 +64,7 @@ class ClientV1Shell(object):
Required options: Required options:
--validation-plugin --validation-plugin
""" """
resp = self._client.suites.list_tests_for_suites( resp = self._client.suites.list_tests_for_suites(
validation_plugin_name) validation_plugin_name)
tests = resp['tests'] tests = resp['tests']
@ -76,6 +79,7 @@ class ClientV1Shell(object):
Required options: Required options:
--validation-plugin --validation-plugin
""" """
resp = self._client.suites.run_suites(validation_plugin_name) resp = self._client.suites.run_suites(validation_plugin_name)
utils.print_list(resp, utils.print_list(resp,
['test', 'duration', 'result', 'report'], ['test', 'duration', 'result', 'report'],
@ -90,6 +94,7 @@ class ClientV1Shell(object):
--validation-plugin --validation-plugin
--suite --suite
""" """
resp = self._client.suites.run_suite_tests( resp = self._client.suites.run_suite_tests(
suite, validation_plugin_name) suite, validation_plugin_name)
suite_test_reports = resp['report'] suite_test_reports = resp['report']
@ -106,6 +111,7 @@ class ClientV1Shell(object):
--validation-plugin --validation-plugin
--test --test
""" """
resp = self._client.tests.run(test, validation_plugin_name) resp = self._client.tests.run(test, validation_plugin_name)
utils.print_list(resp, utils.print_list(resp,
['test', 'duration', 'result', 'report'], ['test', 'duration', 'result', 'report'],

View File

@ -19,6 +19,7 @@ classifier =
[files] [files]
packages = packages =
cloudv_ostf_adapter cloudv_ostf_adapter
cloudv_client
[compile_catalog] [compile_catalog]
domain = cloudv_ostf_adapter domain = cloudv_ostf_adapter
@ -27,7 +28,7 @@ domain = cloudv_ostf_adapter
console_scripts = console_scripts =
cloudvalidation-cli = cloudv_ostf_adapter.cmd.cli:main cloudvalidation-cli = cloudv_ostf_adapter.cmd.cli:main
cloudvalidation-server = cloudv_ostf_adapter.cmd.server:main cloudvalidation-server = cloudv_ostf_adapter.cmd.server:main
cloudvalidation = cloudv_ostf_adapter.cmd.client:main cloudvalidation = cloudv_client.cmd.client:main
[global] [global]
setup-hooks = setup-hooks =