diff options
| author | Andrey Kurilin <akurilin@mirantis.com> | 2015-02-03 02:32:58 +0200 |
|---|---|---|
| committer | Andrey Kurilin <akurilin@mirantis.com> | 2015-02-04 17:40:46 +0200 |
| commit | 0a60aae852d2688861d0b4ba097a1a00529f0611 (patch) | |
| tree | b08ba9344b88e38767f54c5d5c7366c2ef306608 /doc | |
| parent | 4e76f9590b49c925703cbbf42d1e232725465eff (diff) | |
| download | python-novaclient-0a60aae852d2688861d0b4ba097a1a00529f0611.tar.gz | |
Rename v1_1 to v2
Module novaclient.v1_1 is used as implementation of V1.1, V2 and V3.
Since future development(microversioning) will be done across V2,
implementation should be done in appropriate module(to prevent misleading).
Despite the fact that implementation for all versions are equal, discover
method for contrib path worked only for v1.1. This patch fixes this bug and
modifies shell tests to check all versions.
Change-Id: Ib6798f4dfe177586302141f522dc593560ce6a5b
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/source/api.rst | 3 | ||||
| -rw-r--r-- | doc/source/conf.py | 6 | ||||
| -rw-r--r-- | doc/source/index.rst | 3 | ||||
| -rw-r--r-- | doc/source/shell.rst | 2 |
4 files changed, 4 insertions, 10 deletions
diff --git a/doc/source/api.rst b/doc/source/api.rst index e53f2a14..9db81724 100644 --- a/doc/source/api.rst +++ b/doc/source/api.rst @@ -60,5 +60,4 @@ For more information, see the reference: :maxdepth: 2 ref/index - ref/v1_1/index - ref/v3/index + ref/v2/index diff --git a/doc/source/conf.py b/doc/source/conf.py index d33aea26..61437fd7 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -71,17 +71,13 @@ def gen_ref(ver, title, names): "pkg": pkg, "name": name}) gen_ref(None, "Exceptions", ["exceptions"]) -gen_ref("v1_1", "Version 1.1, Version 2 API Reference", +gen_ref("v2", "Version 1.1, Version 2 API Reference, Version 3 API Reference", ["flavors", "images", "servers", "hosts", "agents", "aggregates", "availability_zones", "certs", "fixed_ips", "floating_ip_pools", "floating_ips", "hypervisors", "keypairs", "limits", "networks", "quota_classes", "quotas", "security_group_rules", "security_groups", "services", "virtual_interfaces", "volume_snapshots", "volumes", "volume_types"]) -gen_ref("v3", "Version 3 API Reference", - ["flavors", "hosts", "agents", "aggregates", "availability_zones", - "certs", "hypervisors", "images", "keypairs", "quotas", - "quotas_classes", "servers", "services"]) # -- General configuration ---------------------------------------------------- diff --git a/doc/source/index.rst b/doc/source/index.rst index eb551e1a..9bd302bc 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -25,8 +25,7 @@ Contents: shell api ref/index - ref/v1_1/index - ref/v3/index + ref/v2/index releases Contributing diff --git a/doc/source/shell.rst b/doc/source/shell.rst index f02c1597..52bcfb49 100644 --- a/doc/source/shell.rst +++ b/doc/source/shell.rst @@ -41,7 +41,7 @@ For example, in Bash you'd use:: export OS_PASSWORD=yadayadayada export OS_TENANT_NAME=myproject export OS_AUTH_URL=http://... - export OS_COMPUTE_API_VERSION=1.1 + export OS_COMPUTE_API_VERSION=2 From there, all shell commands take the form:: |