renamed all kollaclient references to kollacli other than the git repo path
This commit is contained in:
parent
8b85da4e79
commit
12732b9c89
16
README.rst
16
README.rst
|
@ -1,26 +1,26 @@
|
|||
===========
|
||||
KollaClient
|
||||
===========
|
||||
========
|
||||
KollaCLI
|
||||
========
|
||||
|
||||
The following steps can be used to build / run the kollaclient:
|
||||
The following steps can be used to build / run the kollacli
|
||||
|
||||
* virtualenv .venv
|
||||
* . .venv/bin/activate
|
||||
* pip install -r requirements.txt
|
||||
* python setup.py install
|
||||
* kollaclient
|
||||
* kollacli
|
||||
|
||||
At that point you will be dropped into the kollaclient shell where
|
||||
At that point you will be dropped into the kollacli shell where
|
||||
you can run commands like help or ? to see what commands are
|
||||
available and any of the sub commands can be executed directly.
|
||||
|
||||
Alternately you can not use the shell and just execute commands
|
||||
directly via >kollaclient host add, etc.
|
||||
directly via >kollacli host add, etc.
|
||||
|
||||
If you make changes to the i18n strings (denoted by methods like
|
||||
_("message")) make sure to re-generate the i18n files with the
|
||||
>python setup.py extract_messages command and check in the files
|
||||
generated in openstack-kollaclient.
|
||||
generated in openstack-kollacli.
|
||||
|
||||
===============
|
||||
Troubleshooting
|
||||
|
|
|
@ -15,8 +15,8 @@ import logging
|
|||
import os
|
||||
import yaml
|
||||
|
||||
from kollaclient.utils import get_kolla_etc
|
||||
from kollaclient.utils import get_kolla_home
|
||||
from kollacli.utils import get_kolla_etc
|
||||
from kollacli.utils import get_kolla_home
|
||||
|
||||
|
||||
class AnsibleProperties(object):
|
|
@ -14,9 +14,9 @@
|
|||
import logging
|
||||
import os
|
||||
|
||||
from kollaclient.i18n import _
|
||||
from kollaclient.utils import get_kolla_etc
|
||||
from kollaclient.utils import get_kolla_home
|
||||
from kollacli.i18n import _
|
||||
from kollacli.utils import get_kolla_etc
|
||||
from kollacli.utils import get_kolla_home
|
||||
|
||||
from cliff.command import Command
|
||||
|
|
@ -15,11 +15,11 @@ import argparse
|
|||
import getpass
|
||||
import logging
|
||||
|
||||
from kollaclient import exceptions
|
||||
from kollaclient.i18n import _
|
||||
from kollaclient.objects.hosts import Host
|
||||
from kollaclient.objects.hosts import Hosts
|
||||
from kollaclient.objects.zones import Zones
|
||||
from kollacli import exceptions
|
||||
from kollacli.i18n import _
|
||||
from kollacli.objects.hosts import Host
|
||||
from kollacli.objects.hosts import Hosts
|
||||
from kollacli.objects.zones import Zones
|
||||
|
||||
from cliff.command import Command
|
||||
from cliff.lister import Lister
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
import oslo_i18n
|
||||
|
||||
_translators = oslo_i18n.TranslatorFactory(domain='openstack-kollaclient')
|
||||
_translators = oslo_i18n.TranslatorFactory(domain='openstack-kollacli')
|
||||
|
||||
# The primary translation function using the well-known name "_"
|
||||
_ = _translators.primary
|
|
@ -16,14 +16,14 @@ import traceback
|
|||
|
||||
from paramiko import AuthenticationException
|
||||
|
||||
from kollaclient import exceptions
|
||||
from kollaclient import utils
|
||||
from kollacli import exceptions
|
||||
from kollacli import utils
|
||||
|
||||
from kollaclient.sshutils import ssh_check_host
|
||||
from kollaclient.sshutils import ssh_check_keys
|
||||
from kollaclient.sshutils import ssh_install_host
|
||||
from kollaclient.sshutils import ssh_keygen
|
||||
from kollaclient.sshutils import ssh_uninstall_host
|
||||
from kollacli.sshutils import ssh_check_host
|
||||
from kollacli.sshutils import ssh_check_keys
|
||||
from kollacli.sshutils import ssh_install_host
|
||||
from kollacli.sshutils import ssh_keygen
|
||||
from kollacli.sshutils import ssh_uninstall_host
|
||||
|
||||
|
||||
class Host(object):
|
|
@ -12,7 +12,7 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import kollaclient.utils as utils
|
||||
import kollacli.utils as utils
|
||||
|
||||
|
||||
class Zones(object):
|
|
@ -13,8 +13,8 @@
|
|||
# under the License.
|
||||
import logging
|
||||
|
||||
from kollaclient.ansible import properties
|
||||
from kollaclient.i18n import _
|
||||
from kollacli.ansible import properties
|
||||
from kollacli.i18n import _
|
||||
|
||||
from cliff.command import Command
|
||||
from cliff.lister import Lister
|
|
@ -13,7 +13,7 @@
|
|||
# under the License.
|
||||
import logging
|
||||
|
||||
from kollaclient.i18n import _
|
||||
from kollacli.i18n import _
|
||||
|
||||
from cliff.command import Command
|
||||
|
|
@ -19,10 +19,10 @@ from cliff.app import App
|
|||
from cliff.commandmanager import CommandManager
|
||||
|
||||
|
||||
class KollaClient(App):
|
||||
class KollaCli(App):
|
||||
|
||||
def __init__(self):
|
||||
super(KollaClient, self).__init__(
|
||||
super(KollaCli, self).__init__(
|
||||
description='Command-Line Client for StackForge Kolla',
|
||||
version='0.1',
|
||||
command_manager=CommandManager('kolla.cli'),
|
||||
|
@ -39,7 +39,7 @@ class KollaClient(App):
|
|||
|
||||
|
||||
def main(argv=sys.argv[1:]):
|
||||
shell = KollaClient()
|
||||
shell = KollaCli()
|
||||
return shell.run(argv)
|
||||
|
||||
if __name__ == "__main__":
|
|
@ -15,10 +15,10 @@ import logging
|
|||
import os.path
|
||||
import paramiko
|
||||
|
||||
from kollaclient.utils import get_admin_user
|
||||
from kollaclient.utils import get_pk_bits
|
||||
from kollaclient.utils import get_pk_file
|
||||
from kollaclient.utils import get_pk_password
|
||||
from kollacli.utils import get_admin_user
|
||||
from kollacli.utils import get_pk_bits
|
||||
from kollacli.utils import get_pk_file
|
||||
from kollacli.utils import get_pk_password
|
||||
|
||||
|
||||
def ssh_check_keys():
|
|
@ -24,7 +24,7 @@ def get_kolla_etc():
|
|||
|
||||
|
||||
def get_client_home():
|
||||
return os.environ.get("KOLLA_CLIENT_HOME", "/opt/kollaclient/")
|
||||
return os.environ.get("KOLLA_CLIENT_HOME", "/opt/kollacli/")
|
||||
|
||||
|
||||
def get_client_etc():
|
|
@ -13,7 +13,7 @@
|
|||
# under the License.
|
||||
import logging
|
||||
|
||||
from kollaclient.objects.zones import Zones
|
||||
from kollacli.objects.zones import Zones
|
||||
|
||||
from cliff.command import Command
|
||||
|
|
@ -0,0 +1,79 @@
|
|||
# Translations template for kollacli.
|
||||
# Copyright (C) 2015 ORGANIZATION
|
||||
# This file is distributed under the same license as the kollacli project.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: kollacli 0.1.0.dev22\n"
|
||||
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
|
||||
"POT-Creation-Date: 2015-08-06 15:09-0700\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=utf-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Generated-By: Babel 2.0\n"
|
||||
|
||||
#: kollacli/common.py:30
|
||||
msgid "deploy"
|
||||
msgstr ""
|
||||
|
||||
#: kollacli/common.py:40
|
||||
msgid "install"
|
||||
msgstr ""
|
||||
|
||||
#: kollacli/common.py:50
|
||||
msgid "list"
|
||||
msgstr ""
|
||||
|
||||
#: kollacli/common.py:62
|
||||
msgid "start"
|
||||
msgstr ""
|
||||
|
||||
#: kollacli/common.py:80
|
||||
msgid "stop"
|
||||
msgstr ""
|
||||
|
||||
#: kollacli/common.py:89
|
||||
msgid "sync"
|
||||
msgstr ""
|
||||
|
||||
#: kollacli/common.py:98
|
||||
msgid "upgrade"
|
||||
msgstr ""
|
||||
|
||||
#: kollacli/common.py:107
|
||||
msgid "dump"
|
||||
msgstr ""
|
||||
|
||||
#: kollacli/host.py:156
|
||||
msgid "host addservice"
|
||||
msgstr ""
|
||||
|
||||
#: kollacli/host.py:166
|
||||
msgid "host removeservice"
|
||||
msgstr ""
|
||||
|
||||
#: kollacli/property.py:29
|
||||
msgid "property set"
|
||||
msgstr ""
|
||||
|
||||
#: kollacli/service.py:27
|
||||
msgid "service activate"
|
||||
msgstr ""
|
||||
|
||||
#: kollacli/service.py:37
|
||||
msgid "service deactivate"
|
||||
msgstr ""
|
||||
|
||||
#: kollacli/service.py:47
|
||||
msgid "service autodeploy"
|
||||
msgstr ""
|
||||
|
||||
#: kollacli/service.py:57
|
||||
msgid "service list"
|
||||
msgstr ""
|
||||
|
|
@ -1,112 +0,0 @@
|
|||
# Translations template for kollaclient.
|
||||
# Copyright (C) 2015 ORGANIZATION
|
||||
# This file is distributed under the same license as the kollaclient
|
||||
# project.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: kollaclient 0.1.0.dev4\n"
|
||||
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
|
||||
"POT-Creation-Date: 2015-07-23 10:32-0700\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=utf-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Generated-By: Babel 1.3\n"
|
||||
|
||||
#: kollaclient/common.py:17
|
||||
msgid "deploy"
|
||||
msgstr ""
|
||||
|
||||
#: kollaclient/common.py:27
|
||||
msgid "install"
|
||||
msgstr ""
|
||||
|
||||
#: kollaclient/common.py:37
|
||||
msgid "list"
|
||||
msgstr ""
|
||||
|
||||
#: kollaclient/common.py:49
|
||||
msgid "start"
|
||||
msgstr ""
|
||||
|
||||
#: kollaclient/common.py:67
|
||||
msgid "stop"
|
||||
msgstr ""
|
||||
|
||||
#: kollaclient/common.py:76
|
||||
msgid "sync"
|
||||
msgstr ""
|
||||
|
||||
#: kollaclient/common.py:85
|
||||
msgid "upgrade"
|
||||
msgstr ""
|
||||
|
||||
#: kollaclient/common.py:94
|
||||
msgid "dump"
|
||||
msgstr ""
|
||||
|
||||
#: kollaclient/host.py:32
|
||||
msgid "host already exists"
|
||||
msgstr ""
|
||||
|
||||
#: kollaclient/host.py:72
|
||||
msgid "host list"
|
||||
msgstr ""
|
||||
|
||||
#: kollaclient/host.py:86
|
||||
msgid "host setzone"
|
||||
msgstr ""
|
||||
|
||||
#: kollaclient/host.py:96
|
||||
msgid "host addservice"
|
||||
msgstr ""
|
||||
|
||||
#: kollaclient/host.py:106
|
||||
msgid "host removeservice"
|
||||
msgstr ""
|
||||
|
||||
#: kollaclient/host.py:122
|
||||
msgid "host check"
|
||||
msgstr ""
|
||||
|
||||
#: kollaclient/host.py:153
|
||||
msgid "host install"
|
||||
msgstr ""
|
||||
|
||||
#: kollaclient/property.py:14
|
||||
msgid "property set"
|
||||
msgstr ""
|
||||
|
||||
#: kollaclient/property.py:24
|
||||
msgid "property list"
|
||||
msgstr ""
|
||||
|
||||
#: kollaclient/service.py:14
|
||||
msgid "service activate"
|
||||
msgstr ""
|
||||
|
||||
#: kollaclient/service.py:24
|
||||
msgid "service deactivate"
|
||||
msgstr ""
|
||||
|
||||
#: kollaclient/service.py:34
|
||||
msgid "service autodeploy"
|
||||
msgstr ""
|
||||
|
||||
#: kollaclient/service.py:44
|
||||
msgid "service list"
|
||||
msgstr ""
|
||||
|
||||
#: kollaclient/zone.py:26
|
||||
msgid "zone already exists"
|
||||
msgstr ""
|
||||
|
||||
#: kollaclient/zone.py:64
|
||||
msgid "zone list"
|
||||
msgstr ""
|
||||
|
72
setup.cfg
72
setup.cfg
|
@ -1,5 +1,5 @@
|
|||
[metadata]
|
||||
name = kollaclient
|
||||
name = kollacli
|
||||
version = 0.1
|
||||
|
||||
description-file =
|
||||
|
@ -24,51 +24,51 @@ classifier =
|
|||
|
||||
[files]
|
||||
packages =
|
||||
kollaclient
|
||||
kollacli
|
||||
|
||||
[entry_points]
|
||||
console_scripts =
|
||||
kollacli = kollaclient.shell:main
|
||||
kollacli = kollacli.shell:main
|
||||
|
||||
kolla.cli =
|
||||
host_add = kollaclient.host:HostAdd
|
||||
host_remove = kollaclient.host:HostRemove
|
||||
host_list = kollaclient.host:HostList
|
||||
host_setzone = kollaclient.host:HostSetzone
|
||||
host_clearzone = kollaclient.host:HostClearzone
|
||||
host_addservice = kollaclient.host:HostAddservice
|
||||
host_removeservice = kollaclient.host:HostRemoveservice
|
||||
host_check = kollaclient.host:HostCheck
|
||||
host_install = kollaclient.host:HostInstall
|
||||
host_uninstall = kollaclient.host:HostUninstall
|
||||
service_activate = kollaclient.service:ServiceEnable
|
||||
service_deactivate = kollaclient.service:ServiceDisable
|
||||
service_autodeploy = kollaclient.service:ServiceAutodeploy
|
||||
service_list = kollaclient.service:ServiceList
|
||||
zone_add = kollaclient.zone:ZoneAdd
|
||||
zone_remove = kollaclient.zone:ZoneRemove
|
||||
zone_list = kollaclient.zone:ZoneList
|
||||
property_set = kollaclient.property:PropertySet
|
||||
property_list = kollaclient.property:PropertyList
|
||||
deploy = kollaclient.common:Deploy
|
||||
install = kollaclient.common:Install
|
||||
list = kollaclient.common:List
|
||||
start = kollaclient.common:Start
|
||||
stop = kollaclient.common:Stop
|
||||
sync = kollaclient.common:Sync
|
||||
upgrade = kollaclient.common:Upgrade
|
||||
dump = kollaclient.common:Dump
|
||||
host_add = kollacli.host:HostAdd
|
||||
host_remove = kollacli.host:HostRemove
|
||||
host_list = kollacli.host:HostList
|
||||
host_setzone = kollacli.host:HostSetzone
|
||||
host_clearzone = kollacli.host:HostClearzone
|
||||
host_addservice = kollacli.host:HostAddservice
|
||||
host_removeservice = kollacli.host:HostRemoveservice
|
||||
host_check = kollacli.host:HostCheck
|
||||
host_install = kollacli.host:HostInstall
|
||||
host_uninstall = kollacli.host:HostUninstall
|
||||
service_activate = kollacli.service:ServiceEnable
|
||||
service_deactivate = kollacli.service:ServiceDisable
|
||||
service_autodeploy = kollacli.service:ServiceAutodeploy
|
||||
service_list = kollacli.service:ServiceList
|
||||
zone_add = kollacli.zone:ZoneAdd
|
||||
zone_remove = kollacli.zone:ZoneRemove
|
||||
zone_list = kollacli.zone:ZoneList
|
||||
property_set = kollacli.property:PropertySet
|
||||
property_list = kollacli.property:PropertyList
|
||||
deploy = kollacli.common:Deploy
|
||||
install = kollacli.common:Install
|
||||
list = kollacli.common:List
|
||||
start = kollacli.common:Start
|
||||
stop = kollacli.common:Stop
|
||||
sync = kollacli.common:Sync
|
||||
upgrade = kollacli.common:Upgrade
|
||||
dump = kollacli.common:Dump
|
||||
|
||||
[extract_messages]
|
||||
keywords = _ gettext ngettext l_ lazy_gettext
|
||||
mapping_file = babel.cfg
|
||||
output_file = openstack-kollaclient/locale/openstack-kollaclient.pot
|
||||
output_file = openstack-kollacli/locale/openstack-kollacli.pot
|
||||
|
||||
[update_catalog]
|
||||
domain = openstack-kollaclient
|
||||
output_dir = openstack-kollaclient/locale
|
||||
input_file = openstack-kollaclient/locale/openstack-kollaclient.pot
|
||||
domain = openstack-kollacli
|
||||
output_dir = openstack-kollacli/locale
|
||||
input_file = openstack-kollacli/locale/openstack-kollacli.pot
|
||||
|
||||
[compile_catalog]
|
||||
directory = openstack-kollaclient/locale
|
||||
domain = openstack-kollaclient
|
||||
directory = openstack-kollacli/locale
|
||||
domain = openstack-kollacli
|
||||
|
|
|
@ -20,14 +20,14 @@ import traceback
|
|||
|
||||
import testtools
|
||||
|
||||
import kollaclient.utils as utils
|
||||
import kollacli.utils as utils
|
||||
|
||||
|
||||
TEST_SUFFIX = '/test/'
|
||||
ENV_ETC = 'KOLLA_CLIENT_ETC'
|
||||
VENV_PY_PATH = '/.venv/bin/python'
|
||||
KOLLA_CMD = 'kollacli'
|
||||
KOLLA_SHELL_DIR = 'kollaclient'
|
||||
KOLLA_SHELL_DIR = 'kollacli'
|
||||
HOSTS_FNAME = 'test_hosts'
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue