2013-01-24 12:00:30 -06:00
|
|
|
# Copyright 2012-2013 OpenStack, LLC.
|
2012-04-19 22:41:44 -05:00
|
|
|
#
|
2013-01-24 12:00:30 -06:00
|
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
|
|
# not use this file except in compliance with the License. You may obtain
|
|
|
|
# a copy of the License at
|
2012-04-19 22:41:44 -05:00
|
|
|
#
|
2013-01-24 12:00:30 -06:00
|
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
2012-04-19 22:41:44 -05:00
|
|
|
#
|
2013-01-24 12:00:30 -06:00
|
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
|
|
# License for the specific language governing permissions and limitations
|
|
|
|
# under the License.
|
2012-04-19 22:41:44 -05:00
|
|
|
#
|
|
|
|
|
|
|
|
"""
|
2012-04-25 16:48:19 -05:00
|
|
|
Command-line interface to the OpenStack APIs
|
2012-04-19 22:41:44 -05:00
|
|
|
"""
|
|
|
|
|
2012-06-29 22:29:46 +00:00
|
|
|
import getpass
|
2012-04-25 16:48:19 -05:00
|
|
|
import logging
|
2012-04-19 22:41:44 -05:00
|
|
|
import os
|
|
|
|
import sys
|
|
|
|
|
2012-04-25 16:48:19 -05:00
|
|
|
from cliff.app import App
|
|
|
|
from cliff.commandmanager import CommandManager
|
|
|
|
|
2012-05-02 17:02:08 -04:00
|
|
|
from openstackclient.common import clientmanager
|
2012-05-09 17:15:43 -05:00
|
|
|
from openstackclient.common import exceptions as exc
|
Keyring support for openstackclient.
Bug: 1030440
If password is defined in keyring, use it; otherwise, prompt for the
password. Keying is configured using command line switch,
--os-use-keyring or env(OS_USE_KEYRING).
* openstackclient/common/openstackkeyring.py
The abstract class for keyring, specifically for openstack. The
class is used to store encrypted password in keyring, without
prompting for keyring password. The encrypted password is
stored in ~/.openstack-keyring.cfg file.
* openstack-common.py
Update openstackkeyring library from openstack.common.
* openstackclient/shell.py
OpenStackClient.build_option_parser(): New boolean argument,
--os-use-keyring, default to env(OS_USE_KEYRING).
OpenStackClient.authenticate_user(): Get password from keyring,
if it is defined; otherwise, prompt for the password. If user
enter a password and keyring is enabled, store it in keyring.
OpenStackClient.init_keyring_backend(): New method to define
openstack backend for keyring.
OpenStackClient.get_password_from_keyring(): New method to
get password from keyring.
OpenStackClient.set_password_in_keyring(): New method go set
password in keyring.
* toos/pip-requires
Define keyring and pycrypto as one of dependent.
Change-Id: I36d3a63054658c0ef0553d68b38fefbc236930ef
2012-07-08 16:06:32 -07:00
|
|
|
from openstackclient.common import openstackkeyring
|
2012-04-19 22:41:44 -05:00
|
|
|
from openstackclient.common import utils
|
|
|
|
|
|
|
|
|
2012-04-25 16:48:19 -05:00
|
|
|
VERSION = '0.1'
|
Keyring support for openstackclient.
Bug: 1030440
If password is defined in keyring, use it; otherwise, prompt for the
password. Keying is configured using command line switch,
--os-use-keyring or env(OS_USE_KEYRING).
* openstackclient/common/openstackkeyring.py
The abstract class for keyring, specifically for openstack. The
class is used to store encrypted password in keyring, without
prompting for keyring password. The encrypted password is
stored in ~/.openstack-keyring.cfg file.
* openstack-common.py
Update openstackkeyring library from openstack.common.
* openstackclient/shell.py
OpenStackClient.build_option_parser(): New boolean argument,
--os-use-keyring, default to env(OS_USE_KEYRING).
OpenStackClient.authenticate_user(): Get password from keyring,
if it is defined; otherwise, prompt for the password. If user
enter a password and keyring is enabled, store it in keyring.
OpenStackClient.init_keyring_backend(): New method to define
openstack backend for keyring.
OpenStackClient.get_password_from_keyring(): New method to
get password from keyring.
OpenStackClient.set_password_in_keyring(): New method go set
password in keyring.
* toos/pip-requires
Define keyring and pycrypto as one of dependent.
Change-Id: I36d3a63054658c0ef0553d68b38fefbc236930ef
2012-07-08 16:06:32 -07:00
|
|
|
KEYRING_SERVICE = 'openstack'
|
2012-04-25 16:48:19 -05:00
|
|
|
|
|
|
|
|
2012-04-19 22:41:44 -05:00
|
|
|
def env(*vars, **kwargs):
|
|
|
|
"""Search for the first defined of possibly many env vars
|
|
|
|
|
|
|
|
Returns the first environment variable defined in vars, or
|
|
|
|
returns the default defined in kwargs.
|
|
|
|
|
|
|
|
"""
|
|
|
|
for v in vars:
|
|
|
|
value = os.environ.get(v, None)
|
|
|
|
if value:
|
|
|
|
return value
|
|
|
|
return kwargs.get('default', '')
|
|
|
|
|
|
|
|
|
2012-04-25 16:48:19 -05:00
|
|
|
class OpenStackShell(App):
|
|
|
|
|
2012-05-11 15:11:07 -05:00
|
|
|
CONSOLE_MESSAGE_FORMAT = '%(levelname)s: %(name)s %(message)s'
|
2012-05-01 08:37:38 -05:00
|
|
|
|
2012-04-25 16:48:19 -05:00
|
|
|
log = logging.getLogger(__name__)
|
|
|
|
|
|
|
|
def __init__(self):
|
|
|
|
super(OpenStackShell, self).__init__(
|
|
|
|
description=__doc__.strip(),
|
|
|
|
version=VERSION,
|
|
|
|
command_manager=CommandManager('openstack.cli'),
|
2012-04-19 22:41:44 -05:00
|
|
|
)
|
2012-04-25 16:48:19 -05:00
|
|
|
|
2012-05-01 08:37:38 -05:00
|
|
|
# This is instantiated in initialize_app() only when using
|
|
|
|
# password flow auth
|
|
|
|
self.auth_client = None
|
|
|
|
|
2012-04-25 16:48:19 -05:00
|
|
|
def build_option_parser(self, description, version):
|
|
|
|
parser = super(OpenStackShell, self).build_option_parser(
|
|
|
|
description,
|
|
|
|
version,
|
2012-04-19 22:41:44 -05:00
|
|
|
)
|
|
|
|
|
|
|
|
# Global arguments
|
2012-04-26 10:31:14 -05:00
|
|
|
parser.add_argument('--os-auth-url', metavar='<auth-url>',
|
2012-04-19 22:41:44 -05:00
|
|
|
default=env('OS_AUTH_URL'),
|
|
|
|
help='Authentication URL (Env: OS_AUTH_URL)')
|
|
|
|
|
2012-04-26 10:31:14 -05:00
|
|
|
parser.add_argument('--os-tenant-name', metavar='<auth-tenant-name>',
|
2012-04-19 22:41:44 -05:00
|
|
|
default=env('OS_TENANT_NAME'),
|
|
|
|
help='Authentication tenant name (Env: OS_TENANT_NAME)')
|
|
|
|
|
2012-04-26 10:31:14 -05:00
|
|
|
parser.add_argument('--os-tenant-id', metavar='<auth-tenant-id>',
|
2012-04-19 22:41:44 -05:00
|
|
|
default=env('OS_TENANT_ID'),
|
|
|
|
help='Authentication tenant ID (Env: OS_TENANT_ID)')
|
|
|
|
|
2012-04-26 10:31:14 -05:00
|
|
|
parser.add_argument('--os-username', metavar='<auth-username>',
|
2012-04-19 22:41:44 -05:00
|
|
|
default=utils.env('OS_USERNAME'),
|
|
|
|
help='Authentication username (Env: OS_USERNAME)')
|
|
|
|
|
2012-04-26 10:31:14 -05:00
|
|
|
parser.add_argument('--os-password', metavar='<auth-password>',
|
2012-04-19 22:41:44 -05:00
|
|
|
default=utils.env('OS_PASSWORD'),
|
|
|
|
help='Authentication password (Env: OS_PASSWORD)')
|
|
|
|
|
2012-04-26 10:31:14 -05:00
|
|
|
parser.add_argument('--os-region-name', metavar='<auth-region-name>',
|
2012-04-19 22:41:44 -05:00
|
|
|
default=env('OS_REGION_NAME'),
|
|
|
|
help='Authentication region name (Env: OS_REGION_NAME)')
|
|
|
|
|
2012-04-26 10:31:14 -05:00
|
|
|
parser.add_argument('--os-identity-api-version',
|
2012-04-19 22:41:44 -05:00
|
|
|
metavar='<identity-api-version>',
|
|
|
|
default=env('OS_IDENTITY_API_VERSION', default='2.0'),
|
2012-06-13 10:49:43 -07:00
|
|
|
help='Identity API version, default=2.0 '
|
Add openstack-common and test infrastructure.
Fix pep8 errors (project is pep8 clean now).
Update setup.py to use openstack-common style dependencies.
Remove the unused novaclient dependency.
Change the keystoneclient dependency to a git URL.
Add test-requires, and move some pip-requires dependencies
into it.
Remove the test_utils unit test which wasn't testing anything
that is actually present in the project.
Add the test_authors unit test.
Use tox for running tests locally.
See: http://wiki.openstack.org/ProjectTestingInterface
Tox can manage virtualenvs, and is currently doing so for running
tests in Jenkins. It's just as, or more, useful for running tests
locally, so this starts the migration from the run_tests system to
tox. The goal is to reduce duplicate testing infrastructure, and
get what's running locally on developer workstations as close to
what is run by Jenkins as possible.
Run_tests.sh will now call tox to facilitate the transition for
developers used to typing "run_tests.sh".
Developers will need tox installed on their workstations. It can
be installed from PyPI with "pip install tox". run_tests.sh outputs
those instructions if tox is not present.
New facilities are available using tox directly, including:
tox -e py26 # run tests under python 2.6
tox -e py27 # run tests under python 2.7
tox -e pep8 # run pep8 tests
tox # run all of the above
tox -e venv foo # run the command "foo" inside a virtualenv
The OpenStack nose plugin is used when running tox from the
command line, so the enhanced, colorized output is visible to
developers running the test suite locally. However, when Jenkins
runs tox, xunit output will be used instead, which is natively
understood by jenkins and much more readable in that context.
Change-Id: Ib627be3b37b5a09d3795006d412ddcc35f8c6c1e
2012-04-28 22:21:53 +00:00
|
|
|
'(Env: OS_IDENTITY_API_VERSION)')
|
2012-04-19 22:41:44 -05:00
|
|
|
|
2012-04-26 10:31:14 -05:00
|
|
|
parser.add_argument('--os-compute-api-version',
|
2012-04-19 22:41:44 -05:00
|
|
|
metavar='<compute-api-version>',
|
|
|
|
default=env('OS_COMPUTE_API_VERSION', default='2'),
|
2012-06-13 10:49:43 -07:00
|
|
|
help='Compute API version, default=2 '
|
Add openstack-common and test infrastructure.
Fix pep8 errors (project is pep8 clean now).
Update setup.py to use openstack-common style dependencies.
Remove the unused novaclient dependency.
Change the keystoneclient dependency to a git URL.
Add test-requires, and move some pip-requires dependencies
into it.
Remove the test_utils unit test which wasn't testing anything
that is actually present in the project.
Add the test_authors unit test.
Use tox for running tests locally.
See: http://wiki.openstack.org/ProjectTestingInterface
Tox can manage virtualenvs, and is currently doing so for running
tests in Jenkins. It's just as, or more, useful for running tests
locally, so this starts the migration from the run_tests system to
tox. The goal is to reduce duplicate testing infrastructure, and
get what's running locally on developer workstations as close to
what is run by Jenkins as possible.
Run_tests.sh will now call tox to facilitate the transition for
developers used to typing "run_tests.sh".
Developers will need tox installed on their workstations. It can
be installed from PyPI with "pip install tox". run_tests.sh outputs
those instructions if tox is not present.
New facilities are available using tox directly, including:
tox -e py26 # run tests under python 2.6
tox -e py27 # run tests under python 2.7
tox -e pep8 # run pep8 tests
tox # run all of the above
tox -e venv foo # run the command "foo" inside a virtualenv
The OpenStack nose plugin is used when running tox from the
command line, so the enhanced, colorized output is visible to
developers running the test suite locally. However, when Jenkins
runs tox, xunit output will be used instead, which is natively
understood by jenkins and much more readable in that context.
Change-Id: Ib627be3b37b5a09d3795006d412ddcc35f8c6c1e
2012-04-28 22:21:53 +00:00
|
|
|
'(Env: OS_COMPUTE_API_VERSION)')
|
2012-04-19 22:41:44 -05:00
|
|
|
|
2012-04-26 10:31:14 -05:00
|
|
|
parser.add_argument('--os-image-api-version',
|
2012-04-19 22:41:44 -05:00
|
|
|
metavar='<image-api-version>',
|
|
|
|
default=env('OS_IMAGE_API_VERSION', default='1.0'),
|
2012-06-13 10:49:43 -07:00
|
|
|
help='Image API version, default=1.0 '
|
Add openstack-common and test infrastructure.
Fix pep8 errors (project is pep8 clean now).
Update setup.py to use openstack-common style dependencies.
Remove the unused novaclient dependency.
Change the keystoneclient dependency to a git URL.
Add test-requires, and move some pip-requires dependencies
into it.
Remove the test_utils unit test which wasn't testing anything
that is actually present in the project.
Add the test_authors unit test.
Use tox for running tests locally.
See: http://wiki.openstack.org/ProjectTestingInterface
Tox can manage virtualenvs, and is currently doing so for running
tests in Jenkins. It's just as, or more, useful for running tests
locally, so this starts the migration from the run_tests system to
tox. The goal is to reduce duplicate testing infrastructure, and
get what's running locally on developer workstations as close to
what is run by Jenkins as possible.
Run_tests.sh will now call tox to facilitate the transition for
developers used to typing "run_tests.sh".
Developers will need tox installed on their workstations. It can
be installed from PyPI with "pip install tox". run_tests.sh outputs
those instructions if tox is not present.
New facilities are available using tox directly, including:
tox -e py26 # run tests under python 2.6
tox -e py27 # run tests under python 2.7
tox -e pep8 # run pep8 tests
tox # run all of the above
tox -e venv foo # run the command "foo" inside a virtualenv
The OpenStack nose plugin is used when running tox from the
command line, so the enhanced, colorized output is visible to
developers running the test suite locally. However, when Jenkins
runs tox, xunit output will be used instead, which is natively
understood by jenkins and much more readable in that context.
Change-Id: Ib627be3b37b5a09d3795006d412ddcc35f8c6c1e
2012-04-28 22:21:53 +00:00
|
|
|
'(Env: OS_IMAGE_API_VERSION)')
|
2012-04-19 22:41:44 -05:00
|
|
|
|
2012-04-26 17:18:37 -05:00
|
|
|
parser.add_argument('--os-token', metavar='<token>',
|
|
|
|
default=env('OS_TOKEN'),
|
|
|
|
help='Defaults to env[OS_TOKEN]')
|
2012-04-19 22:41:44 -05:00
|
|
|
|
2012-04-26 17:18:37 -05:00
|
|
|
parser.add_argument('--os-url', metavar='<url>',
|
|
|
|
default=env('OS_URL'),
|
|
|
|
help='Defaults to env[OS_URL]')
|
2012-04-19 22:41:44 -05:00
|
|
|
|
Keyring support for openstackclient.
Bug: 1030440
If password is defined in keyring, use it; otherwise, prompt for the
password. Keying is configured using command line switch,
--os-use-keyring or env(OS_USE_KEYRING).
* openstackclient/common/openstackkeyring.py
The abstract class for keyring, specifically for openstack. The
class is used to store encrypted password in keyring, without
prompting for keyring password. The encrypted password is
stored in ~/.openstack-keyring.cfg file.
* openstack-common.py
Update openstackkeyring library from openstack.common.
* openstackclient/shell.py
OpenStackClient.build_option_parser(): New boolean argument,
--os-use-keyring, default to env(OS_USE_KEYRING).
OpenStackClient.authenticate_user(): Get password from keyring,
if it is defined; otherwise, prompt for the password. If user
enter a password and keyring is enabled, store it in keyring.
OpenStackClient.init_keyring_backend(): New method to define
openstack backend for keyring.
OpenStackClient.get_password_from_keyring(): New method to
get password from keyring.
OpenStackClient.set_password_in_keyring(): New method go set
password in keyring.
* toos/pip-requires
Define keyring and pycrypto as one of dependent.
Change-Id: I36d3a63054658c0ef0553d68b38fefbc236930ef
2012-07-08 16:06:32 -07:00
|
|
|
env_os_keyring = env('OS_USE_KEYRING', default=False)
|
|
|
|
if type(env_os_keyring) == str:
|
|
|
|
if env_os_keyring.lower() in ['true', '1']:
|
|
|
|
env_os_keyring = True
|
|
|
|
else:
|
|
|
|
env_os_keyring = False
|
|
|
|
parser.add_argument('--os-use-keyring',
|
|
|
|
default=env_os_keyring,
|
|
|
|
action='store_true',
|
|
|
|
help='Use keyring to store password, '
|
|
|
|
'default=False (Env: OS_USE_KEYRING)')
|
|
|
|
|
2012-04-19 22:41:44 -05:00
|
|
|
return parser
|
|
|
|
|
2012-05-10 15:20:40 -04:00
|
|
|
def authenticate_user(self):
|
|
|
|
"""Make sure the user has provided all of the authentication
|
|
|
|
info we need.
|
2012-05-01 08:37:38 -05:00
|
|
|
"""
|
2012-05-09 17:15:43 -05:00
|
|
|
self.log.debug('validating authentication options')
|
|
|
|
if self.options.os_token or self.options.os_url:
|
|
|
|
# Token flow auth takes priority
|
|
|
|
if not self.options.os_token:
|
|
|
|
raise exc.CommandError(
|
|
|
|
"You must provide a token via"
|
|
|
|
" either --os-token or env[OS_TOKEN]")
|
|
|
|
|
|
|
|
if not self.options.os_url:
|
|
|
|
raise exc.CommandError(
|
|
|
|
"You must provide a service URL via"
|
|
|
|
" either --os-url or env[OS_URL]")
|
|
|
|
|
|
|
|
else:
|
|
|
|
# Validate password flow auth
|
|
|
|
if not self.options.os_username:
|
|
|
|
raise exc.CommandError(
|
|
|
|
"You must provide a username via"
|
|
|
|
" either --os-username or env[OS_USERNAME]")
|
|
|
|
|
Keyring support for openstackclient.
Bug: 1030440
If password is defined in keyring, use it; otherwise, prompt for the
password. Keying is configured using command line switch,
--os-use-keyring or env(OS_USE_KEYRING).
* openstackclient/common/openstackkeyring.py
The abstract class for keyring, specifically for openstack. The
class is used to store encrypted password in keyring, without
prompting for keyring password. The encrypted password is
stored in ~/.openstack-keyring.cfg file.
* openstack-common.py
Update openstackkeyring library from openstack.common.
* openstackclient/shell.py
OpenStackClient.build_option_parser(): New boolean argument,
--os-use-keyring, default to env(OS_USE_KEYRING).
OpenStackClient.authenticate_user(): Get password from keyring,
if it is defined; otherwise, prompt for the password. If user
enter a password and keyring is enabled, store it in keyring.
OpenStackClient.init_keyring_backend(): New method to define
openstack backend for keyring.
OpenStackClient.get_password_from_keyring(): New method to
get password from keyring.
OpenStackClient.set_password_in_keyring(): New method go set
password in keyring.
* toos/pip-requires
Define keyring and pycrypto as one of dependent.
Change-Id: I36d3a63054658c0ef0553d68b38fefbc236930ef
2012-07-08 16:06:32 -07:00
|
|
|
self.get_password_from_keyring()
|
2012-05-09 17:15:43 -05:00
|
|
|
if not self.options.os_password:
|
2012-06-29 22:29:46 +00:00
|
|
|
# No password, if we've got a tty, try prompting for it
|
|
|
|
if hasattr(sys.stdin, 'isatty') and sys.stdin.isatty():
|
|
|
|
# Check for Ctl-D
|
|
|
|
try:
|
|
|
|
self.options.os_password = getpass.getpass()
|
Keyring support for openstackclient.
Bug: 1030440
If password is defined in keyring, use it; otherwise, prompt for the
password. Keying is configured using command line switch,
--os-use-keyring or env(OS_USE_KEYRING).
* openstackclient/common/openstackkeyring.py
The abstract class for keyring, specifically for openstack. The
class is used to store encrypted password in keyring, without
prompting for keyring password. The encrypted password is
stored in ~/.openstack-keyring.cfg file.
* openstack-common.py
Update openstackkeyring library from openstack.common.
* openstackclient/shell.py
OpenStackClient.build_option_parser(): New boolean argument,
--os-use-keyring, default to env(OS_USE_KEYRING).
OpenStackClient.authenticate_user(): Get password from keyring,
if it is defined; otherwise, prompt for the password. If user
enter a password and keyring is enabled, store it in keyring.
OpenStackClient.init_keyring_backend(): New method to define
openstack backend for keyring.
OpenStackClient.get_password_from_keyring(): New method to
get password from keyring.
OpenStackClient.set_password_in_keyring(): New method go set
password in keyring.
* toos/pip-requires
Define keyring and pycrypto as one of dependent.
Change-Id: I36d3a63054658c0ef0553d68b38fefbc236930ef
2012-07-08 16:06:32 -07:00
|
|
|
self.set_password_in_keyring()
|
2012-06-29 22:29:46 +00:00
|
|
|
except EOFError:
|
|
|
|
pass
|
|
|
|
# No password because we did't have a tty or the
|
|
|
|
# user Ctl-D when prompted?
|
|
|
|
if not self.options.os_password:
|
|
|
|
raise exc.CommandError(
|
|
|
|
"You must provide a password via"
|
|
|
|
" either --os-password, or env[OS_PASSWORD], "
|
|
|
|
" or prompted response")
|
2012-05-09 17:15:43 -05:00
|
|
|
|
|
|
|
if not (self.options.os_tenant_id or self.options.os_tenant_name):
|
|
|
|
raise exc.CommandError(
|
|
|
|
"You must provide a tenant_id via"
|
|
|
|
" either --os-tenant-id or via env[OS_TENANT_ID]")
|
|
|
|
|
|
|
|
if not self.options.os_auth_url:
|
|
|
|
raise exc.CommandError(
|
|
|
|
"You must provide an auth url via"
|
|
|
|
" either --os-auth-url or via env[OS_AUTH_URL]")
|
|
|
|
|
2012-05-02 17:02:08 -04:00
|
|
|
self.client_manager = clientmanager.ClientManager(
|
|
|
|
token=self.options.os_token,
|
|
|
|
url=self.options.os_url,
|
|
|
|
auth_url=self.options.os_auth_url,
|
|
|
|
tenant_name=self.options.os_tenant_name,
|
|
|
|
tenant_id=self.options.os_tenant_id,
|
|
|
|
username=self.options.os_username,
|
|
|
|
password=self.options.os_password,
|
|
|
|
region_name=self.options.os_region_name,
|
2012-05-10 15:47:59 -05:00
|
|
|
api_version=self.api_version,
|
2012-05-02 17:02:08 -04:00
|
|
|
)
|
2012-05-10 15:20:40 -04:00
|
|
|
return
|
|
|
|
|
Keyring support for openstackclient.
Bug: 1030440
If password is defined in keyring, use it; otherwise, prompt for the
password. Keying is configured using command line switch,
--os-use-keyring or env(OS_USE_KEYRING).
* openstackclient/common/openstackkeyring.py
The abstract class for keyring, specifically for openstack. The
class is used to store encrypted password in keyring, without
prompting for keyring password. The encrypted password is
stored in ~/.openstack-keyring.cfg file.
* openstack-common.py
Update openstackkeyring library from openstack.common.
* openstackclient/shell.py
OpenStackClient.build_option_parser(): New boolean argument,
--os-use-keyring, default to env(OS_USE_KEYRING).
OpenStackClient.authenticate_user(): Get password from keyring,
if it is defined; otherwise, prompt for the password. If user
enter a password and keyring is enabled, store it in keyring.
OpenStackClient.init_keyring_backend(): New method to define
openstack backend for keyring.
OpenStackClient.get_password_from_keyring(): New method to
get password from keyring.
OpenStackClient.set_password_in_keyring(): New method go set
password in keyring.
* toos/pip-requires
Define keyring and pycrypto as one of dependent.
Change-Id: I36d3a63054658c0ef0553d68b38fefbc236930ef
2012-07-08 16:06:32 -07:00
|
|
|
def init_keyring_backend(self):
|
|
|
|
"""Initialize openstack backend to use for keyring"""
|
|
|
|
return openstackkeyring.os_keyring()
|
|
|
|
|
|
|
|
def get_password_from_keyring(self):
|
|
|
|
"""Get password from keyring, if it's set"""
|
|
|
|
if self.options.os_use_keyring:
|
|
|
|
service = KEYRING_SERVICE
|
|
|
|
backend = self.init_keyring_backend()
|
|
|
|
if not self.options.os_password:
|
|
|
|
password = backend.get_password(service,
|
|
|
|
self.options.os_username)
|
|
|
|
self.options.os_password = password
|
|
|
|
|
|
|
|
def set_password_in_keyring(self):
|
|
|
|
"""Set password in keyring for this user"""
|
|
|
|
if self.options.os_use_keyring:
|
|
|
|
service = KEYRING_SERVICE
|
|
|
|
backend = self.init_keyring_backend()
|
|
|
|
if self.options.os_password:
|
|
|
|
password = backend.get_password(service,
|
|
|
|
self.options.os_username)
|
|
|
|
# either password is not set in keyring, or it is different
|
|
|
|
if password != self.options.os_password:
|
|
|
|
backend.set_password(service,
|
|
|
|
self.options.os_username,
|
|
|
|
self.options.os_password)
|
|
|
|
|
2012-05-10 15:20:40 -04:00
|
|
|
def initialize_app(self, argv):
|
|
|
|
"""Global app init bits:
|
|
|
|
|
|
|
|
* set up API versions
|
|
|
|
* validate authentication info
|
|
|
|
* authenticate against Identity if requested
|
|
|
|
"""
|
|
|
|
|
|
|
|
super(OpenStackShell, self).initialize_app(argv)
|
|
|
|
|
|
|
|
# stash selected API versions for later
|
|
|
|
# TODO(dtroyer): how do extenstions add their version requirements?
|
|
|
|
self.api_version = {
|
|
|
|
'compute': self.options.os_compute_api_version,
|
|
|
|
'identity': self.options.os_identity_api_version,
|
|
|
|
'image': self.options.os_image_api_version,
|
|
|
|
}
|
|
|
|
|
|
|
|
# If the user is not asking for help, make sure they
|
|
|
|
# have given us auth.
|
2012-05-14 10:50:25 -04:00
|
|
|
cmd_name = None
|
|
|
|
if argv:
|
|
|
|
cmd_info = self.command_manager.find_command(argv)
|
|
|
|
cmd_factory, cmd_name, sub_argv = cmd_info
|
|
|
|
if self.interactive_mode or cmd_name != 'help':
|
2012-05-10 15:20:40 -04:00
|
|
|
self.authenticate_user()
|
2012-05-02 17:02:08 -04:00
|
|
|
|
2012-05-01 08:37:38 -05:00
|
|
|
def prepare_to_run_command(self, cmd):
|
|
|
|
"""Set up auth and API versions"""
|
|
|
|
self.log.debug('prepare_to_run_command %s', cmd.__class__.__name__)
|
|
|
|
|
2012-05-02 17:02:08 -04:00
|
|
|
self.log.debug("api: %s" % cmd.api if hasattr(cmd, 'api') else None)
|
|
|
|
return
|
2012-04-27 12:25:25 -05:00
|
|
|
|
2012-04-25 16:48:19 -05:00
|
|
|
def clean_up(self, cmd, result, err):
|
|
|
|
self.log.debug('clean_up %s', cmd.__class__.__name__)
|
|
|
|
if err:
|
|
|
|
self.log.debug('got an error: %s', err)
|
|
|
|
|
|
|
|
|
|
|
|
def main(argv=sys.argv[1:]):
|
2012-05-14 10:50:25 -04:00
|
|
|
try:
|
|
|
|
return OpenStackShell().run(argv)
|
|
|
|
except:
|
|
|
|
return 1
|
2012-04-25 16:48:19 -05:00
|
|
|
|
2012-04-19 22:41:44 -05:00
|
|
|
|
|
|
|
if __name__ == "__main__":
|
2012-04-25 16:48:19 -05:00
|
|
|
sys.exit(main(sys.argv[1:]))
|