Commit Graph

184 Commits

Author SHA1 Message Date
Jenkins 094f8cd13f Merge "Change v3 shelve to v2.1" 2014-08-31 06:49:44 +00:00
Jenkins b7c63d2462 Merge "Convert v3 server diagnostics plugin to v2.1" 2014-08-31 04:30:03 +00:00
Eli Qiao 9daf3bdd87 Change v3 shelve to v2.1
This patch changes v3 shelve API to v2.1 and makes v2
unit tests share between v2 and v2.1.
The differences between v2 and v3 are described on the wiki page
https://wiki.openstack.org/wiki/NovaAPIv2tov3 .

Partially implements blueprint v2-on-v3-api
Change-Id: Ie4cd72d23592fe2bd1a66137b12bb84400ccfc18
2014-08-30 07:00:57 +00:00
Jenkins 8f49b1ed9f Merge "Change v3 keypairs API to v2.1" 2014-08-29 13:27:19 +00:00
Jenkins 62a8e4e47d Merge "Convert deferred_delete v3 plugin to v2.1 API" 2014-08-29 01:46:49 +00:00
Jenkins 3e4ef29cab Merge "Change V3 access_ips extension into v2.1" 2014-08-28 22:44:53 +00:00
Jenkins 0f7de506b3 Merge "Change v3 agents API to v2.1" 2014-08-28 22:03:42 +00:00
Jenkins 2a97e1afe6 Merge "Port simple_tenant_usage into v2.1" 2014-08-28 18:40:13 +00:00
Jenkins 4b4cf81350 Merge "Port os-server-groups extension to work in v2.1/v3 framework" 2014-08-28 13:22:16 +00:00
Jenkins 39a4f9b2bc Merge "Convert create_backup v3 plugin to v2.1 API" 2014-08-28 09:07:47 +00:00
Jenkins 989a54fe3b Merge "Convert multinic v3 plugin to v2.1" 2014-08-28 06:27:37 +00:00
He Jie Xu 65ef524d55 Port simple_tenant_usage into v2.1
The simple_tenant_usage extension is removed from v3 API. For now,
we need porting it back. And also try to share unittests between v2
and v2.1.

Partially implements blueprint v2-on-v3-api

Change-Id: Ie0c36fcd37fb188c1f1b57f04733bfa267b65201
2014-08-28 10:27:25 +08:00
Ghanshyam 3edfac2e86 Convert v3 server diagnostics plugin to v2.1
This patch changes v3 server diagnostics plugin to v2.1 and makes v2
unit tests share between v2 and v2.1.

This patch also delete the V3 server_diagnostics API tests.

The differences between v2 and v3 are described on the wiki page
https://wiki.openstack.org/wiki/NovaAPIv2tov3.

Partially implements blueprint v2-on-v3-api

Change-Id: If10615f3f119dda815d56cf8329619bab502e091
2014-08-27 16:19:17 +09:00
Ken'ichi Ohmichi 590e8abce4 Change v3 keypairs API to v2.1
This patch changes v3 keypairs API to v2.1 and makes v2 unit tests
share between v2 and v2.1.

The differences between v2 and v3 are described on the wiki page
https://wiki.openstack.org/wiki/NovaAPIv2tov3 .

Partially implements blueprint v2-on-v3-api

Change-Id: I1fcb93a00816eab2d87f251b7cf8a8992e920308
2014-08-27 05:46:04 +00:00
Jenkins 58e6eb857a Merge "Change ViewBuilder into v2.1 for servers" 2014-08-27 02:42:56 +00:00
Jenkins 7ff2baacb2 Merge "Change v3 admin-password to v2.1" 2014-08-26 16:11:25 +00:00
Eli Qiao f9930a85b0 Change v3 extended_status to v2.1
This patch changes v3 extended_status API to v2.1 and makes v2
unit tests share between v2 and v2.1.
Revert v3 changes back to v2.
os-extended-status:* -> OS-EXT-STS:*
The differences between v2 and v3 are descibed on the wiki page
https://wiki.openstack.org/wiki/NovaAPIv2tov3.
Partially implements blueprint v2-on-v3-api

Change-Id: Ieefca1d0e8da831830f43cc83eb50bc7e7f4a10c
2014-08-26 10:11:31 +08:00
Jenkins 44684b795f Merge "Change v3 attach_interface to v2.1" 2014-08-25 17:27:18 +00:00
Eli Qiao 5e6b6b044b Change v3 admin-password to v2.1
This patch changes v3 admin-password API to v2.1 and backport v3
unit test cases to v2.1.
The differences between v2 and v3 are described on the wiki page
https://wiki.openstack.org/wiki/NovaAPIv2tov3

Partially implements blueprint v2-on-v3-api
Change-Id: I167753eddd188120236c51bade549c907c8a8466
2014-08-25 22:09:54 +08:00
Jenkins 85a04f7ee1 Merge "Change v3 extended_server_attibutes to v2.1" 2014-08-25 10:13:16 +00:00
He Jie Xu 0063d17d74 Change V3 access_ips extension into v2.1
This patch changes v3 access_ips API to v2.1 and makes v2
unit tests share between v2 and v2.1.
The differences between v2 and v3 are described on the wiki page
https://wiki.openstack.org/wiki/NovaAPIv2tov3 .

Partially implements blueprint v2-on-v3-api

Change-Id: Id464cbe4a8b7a7749c4f14e4531e4494dd315857
2014-08-25 15:34:15 +08:00
Jenkins 39b3183539 Merge "Convert v3 config drive plugin to v2.1" 2014-08-25 02:43:16 +00:00
Chris Yeoh 07ad7689ee Convert multinic v3 plugin to v2.1
Changes required to have v3 plugin natively support
the v2.1 API.

add_fixed_ip -> addFixedIp
remove_fixed_ip -> removeFixedIp

Removes v3 version of the multinic test and changes to
share use of the v2 unittests code. Backports a v2.1 specific
test.

Partially implements blueprint v2-on-v3-api

Change-Id: Ie01eddf1e772092c291b1475404f87e6e6f47c71
2014-08-25 11:57:48 +09:30
He Jie Xu 73c2c2db69 Change ViewBuilder into v2.1 for servers
This patch changes v3 servers' ViewBuilder to v2.1. And also
change related unittests and api sample tests.

The differences between v2 and v3 are described on the wiki page
https://wiki.openstack.org/wiki/NovaAPIv2tov3.

Partially implements blueprint v2-on-v3-api

Change-Id: Ie68d46daa91ef43c84eeef479c0986d5e7f15719
2014-08-25 10:06:41 +08:00
Ken'ichi Ohmichi 830816cdef Change v3 agents API to v2.1
This patch changes v3 agents API to v2.1 and makes v2 unit tests
share between v2 and v2.1.

The differences between v2 and v3 are described on the wiki page
https://wiki.openstack.org/wiki/NovaAPIv2tov3 .

Partially implements blueprint v2-on-v3-api

Change-Id: I96dd9cd3672c6d584bd0019c385544c08f687e7f
2014-08-25 01:58:23 +00:00
He Jie Xu 69df608fbe Change v3 attach_interface to v2.1
This patch changes v3 attach_interface API to v2.1 and makes v2
unit tests share between v2 and v2.1.

The differences between v2 and v3 are described on the wiki page
https://wiki.openstack.org/wiki/NovaAPIv2tov3.

Partially implements blueprint v2-on-v3-api

Change-Id: If18676604edc8fea41d7888eb6546245163e91c2
2014-08-25 09:55:29 +08:00
Chris Yeoh 09cd943214 Convert create_backup v3 plugin to v2.1 API
Changes required to have v3 plugin natively support the V2.1
API

The create_backup action is reverted back to createBackup

Partially implements blueprint v2-on-v3-api

Change-Id: Ibac7eb2644629f4b9cf0581d9859b97f263972c8
2014-08-25 09:21:01 +09:30
Jenkins d60fce4ac2 Merge "Convert v3 server SchedulerHints plugin to v2.1" 2014-08-24 14:42:39 +00:00
Eli Qiao 409555530a Change v3 extended_server_attibutes to v2.1
This patch changes v3 extended_server_attibutes API to v2.1 and makes v2
unit tests share between v2 and v2.1.
Revert v3 changes back to v2.
os-extended-server-attributes:* -> OS-EXT-SRV-ATTR:*
The differences between v2 and v3 are described on the wiki page
https://wiki.openstack.org/wiki/NovaAPIv2tov3.

Partially implements blueprint v2-on-v3-api

Change-Id: I02b203b62b9e675f71d0ff3880bc9ee051a3b80d
2014-08-24 09:09:58 +08:00
Jenkins c0eae77483 Merge "Change 'image_ref'/'flavor_ref' into v2 style for servers" 2014-08-22 07:17:47 +00:00
Jenkins 7d9ec7fd6e Merge "Change 'admin_password' into v2 style for servers extension" 2014-08-22 07:16:30 +00:00
Ghanshyam 3792bd0e43 Convert v3 server SchedulerHints plugin to v2.1
This patch converts v3 server SchedulerHints plugin to v2.1 and makes v2
unit tests share between v2 and v2.1.

The differences between v2 and v3 are described on the wiki page
https://wiki.openstack.org/wiki/NovaAPIv2tov3.

Note- to make V2.1 SchedulerHints extension work in V3 framework,
an extra parameter (request body) is being passed in server_create
function of each extensions.

Partially implements blueprint v2-on-v3-api

Change-Id: I8a0d50efcda6fcd12971a41505127de5987eec18
2014-08-22 14:15:28 +09:00
Chris Yeoh 2c8685b07f Convert deferred_delete v3 plugin to v2.1 API
Changes required to have v3 plugin natively support the V2.1
API

The force_delete action is reverted back to forceDelete

Partially implements blueprint v2-on-v3-api

Change-Id: I0b050d3328338923cf05521b9ef5cc3b1c50a586
2014-08-22 14:23:12 +09:30
Ghanshyam 5482e388fa Convert v3 config drive plugin to v2.1
This patch changes v3 config drive plugin to v2.1 and makes v2
unit tests share between v2 and v2.1.

The differences between v2 and v3 are described on the wiki page
https://wiki.openstack.org/wiki/NovaAPIv2tov3.

Partially implements blueprint v2-on-v3-api

Change-Id: Ieed7619f3cb310b25d157ebb07f24468aea1af9d
2014-08-21 16:55:43 +09:00
Chris Yeoh 89a02bed57 Port os-server-groups extension to work in v2.1/v3 framework
Ports v2 os-server-groups extension and adapts it to the v2.1/v3 API
framework. API behaviour is identical with the exception
that there is no support for XML. Also

- unittest code modified to share testing with both v2/v2.1
- Adds expected error decorators for API methods
- Adds api sample tests

Partially implements blueprint v2-on-v3-api

Change-Id: I52e49e6e85a7516e3b184601374e5c987f60a9a0
2014-08-20 17:29:01 +09:30
Ian Cordasco 86356bf6f1 Use rfc3986 library to validate URL paths and URIs
More work needs to be done in rfc3986 to give the user more control over what
they consider to be a valid URI in the context of RFC 3986. For example, a
previous incarnation of these tests checked that "1" and "abc" were invalid
when according to the RFC they are.

Update the API samples and tests to use valid URIs

DocImpact

Change-Id: I288fbaead64990db1053b7a11e82904611b8498f
2014-08-19 11:58:39 -05:00
He Jie Xu 5ed82cf7ed Change 'image_ref'/'flavor_ref' into v2 style for servers
This patch changes 'image_ref'/'flavor_ref' to 'imageRef'/'flavorRef'
that same with v2 api. And also change the related unittest.
The differences between v2 and v3 are described on the wiki page

https://wiki.openstack.org/wiki/NovaAPIv2tov3.

Partially implements blueprint v2-on-v3-api

Change-Id: Ic17334e0a9de89488d5e0c8b75950027d51a3cd4
2014-08-18 09:57:34 +08:00
He Jie Xu af8f401eb5 Change 'admin_password' into v2 style for servers extension
This patch changes 'admin_password' to 'adminPass' that same
with v2 api. And also change the related unittest.

The differences between v2 and v3 are described on the wiki page
https://wiki.openstack.org/wiki/NovaAPIv2tov3.

Partially implements blueprint v2-on-v3-api

Change-Id: Ie5675f98bb15c55a191a207171e2ffe3be8e6deb
2014-08-18 09:55:30 +08:00
Yunhong Jiang 7d8a78a291 Return status for compute node
Currently when return compute node information, there is no status returned.

When the corresponding service is disabled or down and users try to
do 'hypervisor-list' or 'hypervisor-show', they will have no idea of it.

Implements: blueprint return-status-for-hypervisor-node
Closes-Bug: #1285259

DocImpact

Change-Id: I17c53b454ccef023f298f1b8875daef965d2325d
2014-07-22 10:44:05 -07:00
Jenkins f48f8edb9b Merge "Make hypervisor_version an int in fakeVirt driver" 2014-07-22 05:27:51 +00:00
Jenkins 72aface875 Merge "Add APIv3 support to make host optional on evacuate." 2014-07-21 10:39:21 +00:00
Gary Kotton 8b54c4a061 VM diagnostics (v3 API only)
There is no formal definition for the VM diagnostics. For the
V2 API the diagnostics will be returned as they are today.

This will continue to use the driver function get_diagnostics.

This change will be implemented by a new virt driver method called
get_instance_diagnostics.

This will support backward compatibility with the existing API's.

Part of the blueprint v3-diagnostics

This patch set is for the API's. Virt driver support in additional
patches.

DocImpact

Change-Id: Id722f38fb134b322413d2b5c3459c8fc0af7bd36
2014-07-09 11:45:58 -07:00
Leandro I. Costantino 6ca97b1cc1 Add APIv3 support to make host optional on evacuate.
DocImpact: The evacuate target host is now optional. If
'host' field is not sent in the request, the scheduler
will determine the target host. This will include
nova client changes ( on the proper commit ) to support
this new optional parameter.

Implements: blueprint find-host-and-evacuate-instance

Change-Id: I907ea4ef39cfad50a48cb80bceba217fdf482f6e
Co-Authored-By: Juan M. Olle <juan.m.olle@intel.com>
Co-Authored-By: Andres Buraschi <andres.buraschi@intel.com>
Co-Authored-By: Anuj Mathur <anujm@thoughtworks.com>
Co-Authored-By: Navneet Kumar <navneetk@thoughtworks.com>
Co-Authored-By: Claxton Correya <claxton@gmail.com>
2014-07-01 13:11:16 -03:00
He Jie Xu 8bc56d8bf2 Fix update agent return agent_id with string for os-agents v3
Currently the agent update return agent_id with integer, that is
inconsistent with the response of agent create and index. It because
agent update use the agent_id that passed from url as the response.
This problem is fixed by converting the agent id as integer.

And the API sample tests provide agent_id with string type in the fake
data. This patch fix this problem for API sample files and tests.

And for back-compatibility, we should add translator for v2.1 API later.
Then this fix will be exposed after v3 API feature exposed by microversion
in the future.

DocImpact: The agent_is is changed to integer type for agents'update action.

Change-Id: Ia9c1034a325b77a2057934cc80b6eab679ff1d2b
Partial-Bug: #1333494
2014-06-26 08:46:41 -07:00
Jenkins 7b1dada7fe Merge "Allow user to specify image to use during rescue - V3 API changes" 2014-06-20 05:38:22 +00:00
Yunhong Jiang df60f2cd33 Fix doc for service list
If a service is enabled, the "disabled_reason" field in response
for /v2/.{tenant_id}./os-services/detail is null, however, currently
it's specified as "" in the doc, thus may be confusing to users.

This patch change the template and doc, it should not cause issue to
existing applications.

Change-Id: Ia71ec4c97a355bcc1a7b63e6107db77f80a5d843
Close-bug: 1328382
2014-06-16 16:57:23 +00:00
Aditi Raveesh 001f865c3c Allow user to specify image to use during rescue - V3 API changes
This commit includes the V3 changes.
Making changes in V3 API to take an extra parameter rescue_image_ref
as part of the rescue action API.
If specified, this image_ref will be used to rescue the instance.
If the image is not specified, then the base image ref is used by
default.

Partially Implements: blueprint allow-image-to-be-specified-during-rescue

DocImpact

Change-Id: I7a9d88bf4dfe73879247f5b82a52928fdde76510
2014-06-02 08:15:51 +00:00
Juerg Haefliger 8f299f5545 Remove spaces from SSH public key comment
An SSH key generated by Nova contains the comment 'Generated by Nova'. Older
versions (prior to 0.7.2) of cloud-init trip over the spaces in the comment
and as a result of that the key injected into the root account is not disabled
by cloud-init. Yes, it's a cloud-init bug but it's also a regression in the
sense that older OpenStack installations (Essex and older) don't contain
spaces in Nova generated key comments and thus older cloud-init's are not
affected in these environments.

This patch replaces the spaces with dashes, i.e., 'Generated-by-Nova'.

Spaces were introduced by commit: 114109dbf4
Ubuntu cloud images with cloud-init < 0.7.2: 10.04 LTS and 12.04 LTS
cloud-init bug report: https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/1220273

Closes-Bug: #1297685
Change-Id: I1761f61dfbba58be98351ae4a51884b03268cf09
2014-05-20 12:08:07 +02:00
Jenkins 3952c77049 Merge "Add Nova API Sample file & test for get keypair" 2014-05-09 17:38:45 +00:00
Ghanshyam c3cb44d688 Add Nova API Sample file & test for get keypair
This patch adds the new API Sample file and its test for Nova V2 and V3
get keypair APIs.

This patch extend the timstamps reg exp to allow the combination
of TZ and microsecond/

Closes-Bug: 1298769
Closes-Bug: 1298818

Change-Id: If695a23cf95862b7bec6fbc5bdf7fc1733d08d4a
2014-05-07 21:06:37 +09:00