未验证 提交 e9451fdb 编写于 作者: R Rudá Moura

Isolate avocado.restclient.cli from being used by test developers.

Move avocado.restclient.cli to avocado.core.restclient.cli,
related to `avocado-rest-client` script.

Users can make use of `avocado.restclient.connection` and
`avocado.restclient.response`.
These are very lightweight and intended to let users query and manipulate
avocado-server data without starting from scratch.
Signed-off-by: NCleber Rosa <crosa@redhat.com>
Signed-off-by: NRudá Moura <rmoura@redhat.com>
上级 c679f530
......@@ -7,7 +7,7 @@ command is used
"""
from avocado.restclient import connection
from avocado.restclient.cli.actions import base
from avocado.core.restclient.cli.actions import base
@base.action
......
......@@ -23,10 +23,10 @@ import importlib
import functools
from avocado import settings
from avocado.restclient import connection
from avocado.core import output
from avocado.core import exit_codes
from avocado.restclient import connection
from avocado.restclient.cli import parser
from avocado.core.restclient.cli import parser
__all__ = ['App']
......@@ -82,7 +82,7 @@ class App(object):
This involves loading the relevant module file.
"""
module_name = "%s.%s" % ('avocado.restclient.cli.actions',
module_name = "%s.%s" % ('avocado.core.restclient.cli.actions',
self.args.top_level_action)
try:
......
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
#
# See LICENSE for more details.
#
# Copyright: Red Hat Inc. 2015
# Author: Cleber Rosa <cleber@redhat.com>
......@@ -16,7 +16,7 @@
This module has actions for the server command
"""
from avocado.restclient.cli.args import base
from avocado.core.restclient.cli.args import base
__all__ = ['ACTION_STATUS', 'ACTION_ARGUMENTS', 'ARGUMENTS']
......
......@@ -69,7 +69,7 @@ class Parser(argparse.ArgumentParser):
help='Password to give to avocado server')
def add_arguments_on_all_modules(self,
prefix='avocado.restclient.cli.args'):
prefix='avocado.core.restclient.cli.args'):
'''
Add arguments that are present on all Python modules at a given prefix
......
......@@ -207,7 +207,7 @@ def get_default():
"""
Returns the global, default connection to avocado-server
:returns: an avocado.restclient.connection.Connection instance
:returns: an avocado.core.restclient.connection.Connection instance
"""
global CONNECTION
......
......@@ -22,7 +22,7 @@ basedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
if os.path.isdir(os.path.join(basedir, 'avocado')):
sys.path.append(basedir)
from avocado.restclient.cli.app import App
from avocado.core.restclient.cli.app import App
if __name__ == '__main__':
app = App()
......
......@@ -113,9 +113,10 @@ if __name__ == '__main__':
'avocado.utils',
'avocado.core.remote',
'avocado.restclient',
'avocado.restclient.cli',
'avocado.restclient.cli.args',
'avocado.restclient.cli.actions'],
'avocado.core.restclient',
'avocado.core.restclient.cli',
'avocado.core.restclient.cli.args',
'avocado.core.restclient.cli.actions'],
package_data={'avocado.core.plugins': _get_plugin_resource_files(
'avocado/plugins/resources')},
data_files=get_data_files(),
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册