diff options
| -rw-r--r-- | .zuul.yaml | 1 | ||||
| -rw-r--r-- | doc/requirements.txt | 3 | ||||
| -rw-r--r-- | doc/source/contributor/testing.rst | 8 | ||||
| -rw-r--r-- | doc/source/index.rst | 2 | ||||
| -rw-r--r-- | lower-constraints.txt | 1 | ||||
| -rw-r--r-- | novaclient/base.py | 4 | ||||
| -rw-r--r-- | novaclient/v2/flavors.py | 3 | ||||
| -rw-r--r-- | novaclient/v2/hypervisors.py | 3 | ||||
| -rw-r--r-- | novaclient/v2/instance_action.py | 3 | ||||
| -rw-r--r-- | novaclient/v2/keypairs.py | 3 | ||||
| -rw-r--r-- | novaclient/v2/migrations.py | 6 | ||||
| -rw-r--r-- | novaclient/v2/server_groups.py | 3 | ||||
| -rw-r--r-- | novaclient/v2/servers.py | 4 | ||||
| -rw-r--r-- | novaclient/v2/usage.py | 8 | ||||
| -rw-r--r-- | setup.cfg | 1 | ||||
| -rw-r--r-- | test-requirements.txt | 1 | ||||
| -rw-r--r-- | tox.ini | 7 |
17 files changed, 43 insertions, 18 deletions
@@ -17,7 +17,6 @@ - openstack-cover-jobs - openstack-lower-constraints-jobs - openstack-python-jobs - - openstack-python35-jobs - openstack-python36-jobs - openstack-python37-jobs - publish-openstack-docs-pti diff --git a/doc/requirements.txt b/doc/requirements.txt index 27cc8b9f..26ec8743 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,7 +1,8 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD openstackdocstheme>=1.18.1 # Apache-2.0 reno>=2.5.0 # Apache-2.0 sphinxcontrib-apidoc>=0.2.0 # BSD diff --git a/doc/source/contributor/testing.rst b/doc/source/contributor/testing.rst index f4f93021..ef1a31c9 100644 --- a/doc/source/contributor/testing.rst +++ b/doc/source/contributor/testing.rst @@ -11,14 +11,14 @@ test targets that can be run to validate the code. ``tox -e py27`` Traditional unit testing (Python 2.7). -``tox -e py35`` - Traditional unit testing (Python 3.5). +``tox -e py36`` + Traditional unit testing (Python 3.6). ``tox -e functional`` Live functional testing against an existing OpenStack instance. (Python 2.7) -``tox -e functional-py35`` - Live functional testing against an existing OpenStack instance. (Python 3.5) +``tox -e functional-py36`` + Live functional testing against an existing OpenStack instance. (Python 3.6) ``tox -e cover`` Generate a coverage report on unit testing. diff --git a/doc/source/index.rst b/doc/source/index.rst index 4ee0122c..aeb2f268 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -2,7 +2,7 @@ Python bindings to the OpenStack Nova API =========================================== -This is a client for OpenStack Nova API. There's :doc:`a Python API +This is a client for OpenStack Nova API. There's a :doc:`Python API <reference/api/index>` (the :mod:`novaclient` module), and a :doc:`command-line script </user/shell>` (installed as :program:`nova`). Each implements the entire OpenStack Nova API. diff --git a/lower-constraints.txt b/lower-constraints.txt index 350574be..b87fcaf0 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -33,7 +33,6 @@ jmespath==0.9.0 jsonpatch==1.16 jsonpointer==1.13 jsonschema==2.6.0 -keyring==5.5.1 keystoneauth1==3.5.0 kombu==4.0.0 linecache2==1.0.0 diff --git a/novaclient/base.py b/novaclient/base.py index 431ac7d6..821e19bd 100644 --- a/novaclient/base.py +++ b/novaclient/base.py @@ -307,8 +307,8 @@ class Manager(HookableMixin): # endpoint pair username = utils.env('OS_USERNAME', 'NOVA_USERNAME') url = utils.env('OS_URL', 'NOVA_URL') - uniqifier = hashlib.md5(username.encode('utf-8') + - url.encode('utf-8')).hexdigest() + uniqifier = hashlib.sha256(username.encode('utf-8') + + url.encode('utf-8')).hexdigest() cache_dir = os.path.expanduser(os.path.join(base_dir, uniqifier)) diff --git a/novaclient/v2/flavors.py b/novaclient/v2/flavors.py index 9cc2b643..803e226a 100644 --- a/novaclient/v2/flavors.py +++ b/novaclient/v2/flavors.py @@ -116,6 +116,9 @@ class FlavorManager(base.ManagerWithFind): :param min_disk: Filters the flavors by a minimum disk space, in GiB. :param min_ram: Filters the flavors by a minimum RAM, in MiB. :param limit: maximum number of flavors to return (optional). + Note the API server has a configurable default limit. + If no limit is specified here or limit is larger than + default, the default limit will be used. :param sort_key: Flavors list sort key (optional). :param sort_dir: Flavors list sort direction (optional). :returns: list of :class:`Flavor`. diff --git a/novaclient/v2/hypervisors.py b/novaclient/v2/hypervisors.py index f457fa08..4b26bfc5 100644 --- a/novaclient/v2/hypervisors.py +++ b/novaclient/v2/hypervisors.py @@ -70,6 +70,9 @@ class HypervisorManager(base.ManagerWithFind): marker must be a UUID hypervisor ID. (optional). :param limit: maximum number of hypervisors to return (optional). + Note the API server has a configurable default limit. + If no limit is specified here or limit is larger than + default, the default limit will be used. """ return self._list_base(detailed=detailed, marker=marker, limit=limit) diff --git a/novaclient/v2/instance_action.py b/novaclient/v2/instance_action.py index 79f1b617..d84c50f9 100644 --- a/novaclient/v2/instance_action.py +++ b/novaclient/v2/instance_action.py @@ -53,6 +53,9 @@ class InstanceActionManager(base.ManagerWithFind): list than that represented by this action request id (optional). :param limit: Maximum number of actions to return. (optional). + Note the API server has a configurable default limit. + If no limit is specified here or limit is larger than + default, the default limit will be used. :param changes_since: List only instance actions changed later or equal to a certain point of time. The provided time should be an ISO 8061 formatted time. diff --git a/novaclient/v2/keypairs.py b/novaclient/v2/keypairs.py index 08c5ea39..9b2e73b7 100644 --- a/novaclient/v2/keypairs.py +++ b/novaclient/v2/keypairs.py @@ -185,6 +185,9 @@ class KeypairManager(base.ManagerWithFind): keypair list than that represented by this keypair name (optional). :param limit: maximum number of keypairs to return (optional). + Note the API server has a configurable default limit. + If no limit is specified here or limit is larger than + default, the default limit will be used. """ params = {} if user_id: diff --git a/novaclient/v2/migrations.py b/novaclient/v2/migrations.py index f1954f1a..ab62f2c5 100644 --- a/novaclient/v2/migrations.py +++ b/novaclient/v2/migrations.py @@ -70,6 +70,9 @@ class MigrationManager(base.ManagerWithFind): migrations list than that represented by this migration UUID (optional). :param limit: maximum number of migrations to return (optional). + Note the API server has a configurable default limit. If no limit is + specified here or limit is larger than default, the default limit will + be used. :param changes_since: only return migrations changed later or equal to a certain point of time. The provided time should be an ISO 8061 formatted time. e.g. 2016-03-04T06:27:59Z . (optional). @@ -92,6 +95,9 @@ class MigrationManager(base.ManagerWithFind): migrations list than that represented by this migration UUID (optional). :param limit: maximum number of migrations to return (optional). + Note the API server has a configurable default limit. If no limit is + specified here or limit is larger than default, the default limit will + be used. :param changes_since: Only return migrations changed later or equal to a certain point of time. The provided time should be an ISO 8061 formatted time. e.g. 2016-03-04T06:27:59Z . (optional). diff --git a/novaclient/v2/server_groups.py b/novaclient/v2/server_groups.py index e8839ae5..bc66b01a 100644 --- a/novaclient/v2/server_groups.py +++ b/novaclient/v2/server_groups.py @@ -51,6 +51,9 @@ class ServerGroupsManager(base.ManagerWithFind): :param all_projects: Lists server groups for all projects. (optional) :param limit: Maximum number of server groups to return. (optional) + Note the API server has a configurable default limit. + If no limit is specified here or limit is larger than + default, the default limit will be used. :param offset: Use with `limit` to return a slice of server groups. `offset` is where to start in the groups list. (optional) diff --git a/novaclient/v2/servers.py b/novaclient/v2/servers.py index e5a33fb6..3f003c93 100644 --- a/novaclient/v2/servers.py +++ b/novaclient/v2/servers.py @@ -843,6 +843,10 @@ class ServerManager(base.BootingManagerWithFind): :param marker: Begin returning servers that appear later in the server list than that represented by this server id (optional). :param limit: Maximum number of servers to return (optional). + Note the API server has a configurable default limit. + If no limit is specified here or limit is larger than + default, the default limit will be used. + If limit == -1, all servers will be returned. :param sort_keys: List of sort keys :param sort_dirs: List of sort directions diff --git a/novaclient/v2/usage.py b/novaclient/v2/usage.py index abbeca69..32fc5508 100644 --- a/novaclient/v2/usage.py +++ b/novaclient/v2/usage.py @@ -87,7 +87,9 @@ class UsageManager(base.ManagerWithFind): later in the instance list than that represented by this instance UUID (optional). :param limit: Maximum number of instances to include in the usage - (optional). + (optional). Note the API server has a configurable + default limit. If no limit is specified here or limit + is larger than default, the default limit will be used. :rtype: list of :class:`Usage`. """ query_string = self._usage_query(start, end, marker, limit, detailed) @@ -120,7 +122,9 @@ class UsageManager(base.ManagerWithFind): later in the instance list than that represented by this instance UUID (optional). :param limit: Maximum number of instances to include in the usage - (optional). + (optional). Note the API server has a configurable + default limit. If no limit is specified here or limit + is larger than default, the default limit will be used. :rtype: :class:`Usage` """ query_string = self._usage_query(start, end, marker, limit) @@ -19,7 +19,6 @@ classifier = Programming Language :: Python :: 2 Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 [files] diff --git a/test-requirements.txt b/test-requirements.txt index 83326f07..998e89a8 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,7 +7,6 @@ bandit>=1.1.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 ddt>=1.0.1 # MIT fixtures>=3.0.0 # Apache-2.0/BSD -keyring>=5.5.1 # MIT/PSF mock>=2.0.0 # BSD python-keystoneclient>=3.8.0 # Apache-2.0 python-cinderclient>=3.3.0 # Apache-2.0 @@ -1,6 +1,5 @@ -# noted to use py35 you need virtualenv >= 1.11.4 [tox] -envlist = py35,py27,pep8,docs +envlist = py36,py27,pep8,docs minversion = 2.0 skipsdist = True @@ -66,8 +65,8 @@ commands = stestr --test-path=./novaclient/tests/functional run --concurrency=1 {posargs} python novaclient/tests/functional/hooks/check_resources.py -[testenv:functional-py35] -basepython = python3.5 +[testenv:functional-py36] +basepython = python3.6 passenv = OS_NOVACLIENT_TEST_NETWORK commands = stestr --test-path=./novaclient/tests/functional run --concurrency=1 {posargs} |