Commit Graph

373 Commits

Author SHA1 Message Date
jichenjc 6abb88befe Check flavor type before add tenant access
Currently we allow tenant access for public flavor, however,
we can't query it after that because flavor is public.
This patch adds check for add access function to raise exception
if the flavor is public.

Also, a nit change is use methods introduced in
793bcc07b9 to get flavor.

APIImpact: Adds new 2.7 API microversion due to new error condition
           in flavor access API
Implements blueprint check-flavor-type-before-add-tenant
Closes-Bug: #1361476

Change-Id: I461175e9969a0dd5b2b7ef75ea7d9f36f3a306d0
2015-07-24 15:36:29 +03:00
Jenkins 8bf7a0070c Merge "Merge availability_zone tests between v2 and v2.1" 2015-07-14 13:55:27 +00:00
ghanshyam 82ecfff114 Merge server password tests between v2 and v2.1
Currently v2 and v2.1 have separate functional tests and their
corresponding sample files. As v2 and v2.1 are supposed to be identical,
there is overhead to maintain two set of functional tests and sample files.
We can have one set of tests which can run for both v2 and v2.1.

This commit merges server password functional tests.
Previously there was no functional tests of server password in v2.1.

In V2.1 os-access-ip is separate plugin where in v2 it was mixed in server
plugin itself. So os-access-ip extension is enabled to run
merged functional tests for both v2 and v2.1.

Change-Id: Ibdc443c1274c26b6816639f37e72725f1487454f
2015-07-06 23:58:25 +00:00
ghanshyam 79c47a0919 Merge availability_zone tests between v2 and v2.1
Currently v2 and v2.1 have separate functional tests and their
corresponding sample files. As v2 and v2.1 are supposed to be identical,
there is overhead to maintain two set of functional tests and sample files.
We can have one set of tests which can run for both v2 and v2.1.

This commit merges availability_zone functional tests.

In V2.1 os-access-ip is separate plugin where in v2 it was mixed in server
plugin itself. So os-access-ip extension is enabled to run
merged functional tests for both v2 and v2.1.
Also enabling some required extension for v2 tests.

Change-Id: I82e7011da212cb4699c4c19b95523a54a6c2f259
2015-07-06 23:58:06 +00:00
Jenkins 6971e957cc Merge "Merge V2 and V2.1 keypair functional tests" 2015-07-06 20:30:56 +00:00
Radoslav Gerganov 578bafeda0 Consolidate the APIs for getting consoles
A new API is added with microversion 2.6:

POST /servers/<uuid>/remote-consoles
{
  "remote_console": {
    "protocol": ["vnc"|"rdp"|"serial"|"spice"],
    "type": ["novnc"|"xpvnc"|"rdp-html5"|"spice-html5"|"serial"]
  }
}

which supports all protocols and types for remote consoles.

Implements: blueprint consolidate-console-api

APIImpact

Change-Id: I175a778cede8fbeee9c47a502ab7a98f6d73c074
2015-07-03 11:03:36 +03:00
ghanshyam 7ad3f55c66 Merge V2 and V2.1 keypair functional tests
Currently v2 and v2.1 have separate functional tests and their
corresponding sample files. As v2 and v2.1 are supposed to be identical,
there is overhead to maintain two set of functional tests and sample files.
We can have one set of tests which can run for both v2 and v2.1.

This commit merges keypair functional tests.

Keypair has microversion v2.2. Their tests should not run for v2 code base.
So this commit also does the following to avoid running microversion tests
for v2:
- Override scenario in keypair v2.2 tests for microversion only not for v2 and v2.1
- Add logic in api_sample_base.py to run those tests on v2.1 code base.

Change-Id: Ifd39971625b035d817b2ccf0e5764682763acff9
2015-07-01 10:20:31 +09:00
Jenkins a95ba57591 Merge "Add microversion to allow server search option ip6 for non-admin" 2015-06-26 23:58:33 +00:00
Jenkins 53677ebba6 Merge "Merge SchedulerHints functional tests of v2 and v2.1" 2015-06-25 13:27:45 +00:00
Jenkins f5efee0e0b Merge "Merge server rescue tests between v2 and v2.1" 2015-06-25 13:23:49 +00:00
Madhuri Kumari 3f50431712 Merge SchedulerHints functional tests of v2 and v2.1
Currently v2 and v2.1 have separate functional tests and their
corresponding sample files. As v2 and v2.1 are supposed to be identical,
there is overhead to maintain two set of functional tests and sample files.
We can have one set of tests which can run for both v2 and v2.1.

This commit merges scheduler_hints functional tests.

Change-Id: Ieef59465547b2bb4a76a98712ed5325286b2e3d9
2015-06-25 05:35:53 +00:00
Jenkins 1b26babb2f Merge "Merge security groups tests between v2 and v2.1" 2015-06-24 12:29:53 +00:00
ghanshyam 54fb6a4628 Merge security groups tests between v2 and v2.1
Currently v2 and v2.1 have separate functional tests and their
corresponding sample files. As v2 and v2.1 are supposed to be identical,
there is overhead to maintain two set of functional tests and sample files.
We can have one set of tests which can run for both v2 and v2.1.

This commit merges security groups functional tests.

In V2.1 os-access-ip is separate plugin where in v2 it was mixed in server
plugin itself. So os-access-ip extension is enabled to run
merged functional tests for both v2 and v2.1.

Change-Id: I45bc8a6ab4b48bff6ed28b4c779b575252161ed1
2015-06-24 04:50:36 +00:00
ghanshyam 48264179fa Merge preserve_ephemeral_rebuild tests between v2 & v2.1
Currently v2 and v2.1 have separate functional tests and their
corresponding sample files. As v2 and v2.1 are supposed to be identical,
there is overhead to maintain two set of functional tests and sample files.
We can have one set of tests which can run for both v2 and v2.1.

This commit merges preserve_ephemeral_rebuild functional tests.
Also verifying the response with sample file.

In V2.1 os-access-ip is separate plugin where in v2 it was mixed in server
plugin itself. So os-access-ip extension is enabled to run
merged functional tests for both v2 and v2.1.

Change-Id: Id4a2f6d27bb0c1f1930186f97af208a2b20fc542
2015-06-24 13:32:17 +09:00
Jenkins 5115a8d219 Merge "Merge disk-config func test between v2 and v2.1" 2015-06-24 03:45:54 +00:00
Jenkins bc338f599d Merge "Merge config_drive functional tests between v2 and v2.1" 2015-06-23 20:20:31 +00:00
Jenkins 842a9305a4 Merge "Merge extension-info functional tests of v2 and v2.1" 2015-06-23 20:11:24 +00:00
Jens Rosenboom 56feb2b649 Add microversion to allow server search option ip6 for non-admin
Currently the command "nova list --ip6 xxx" will return all servers for
non-admins, as the filter option is silently discarded. There is no
reason to treat ip6 different from ip, though, so we add a new
microversion that will allow this filter to be applied.

APIImpact: Filtering by ip6 will now be allowed for non-admin
DocImpact: Filtering by ip6 will now be allowed for non-admin
Implements blueprint allow-ip6-search-for-non-admin
Partial-Bug: 1450859
Change-Id: I26a0b576636bd7e6b4dd7d53ded05907397d2f26
2015-06-22 10:29:54 +02:00
parklong 8e312e96d7 Merge quota_sets functional tests of v2 and v2.1
Currently v2 and v2.1 have separate functional tests and their
corresponding sample files. As v2 and v2.1 are supposed to be identical,
there is overhead to maintain two set of functional tests and sample files.
We can have one set of tests which can run for both v2 and v2.1.

This commit merges quota_sets functional tests.

In V2 quota has following extensions
- os-server-group-quotas
- os-quota-sets
- os-extended-quotas
- os-user-quotas

In V2.1, all the extensions from V2 are merged into os-quota-sets.

Change-Id: Ic54a5745608cec3fe7a5b035f232f3a04d2d1e77
2015-06-16 09:43:03 +08:00
ghanshyam 3f2d390c3b Merge server rescue tests between v2 and v2.1
Currently v2 and v2.1 have separate functional tests and their
corresponding sample files. As v2 and v2.1 are supposed to be identical,
there is overhead to maintain two set of functional tests and sample files.
We can have one set of tests which can run for both v2 and v2.1.

This commit merges servers rescue functional tests.

V2 has two extensions
- os-rescue
- os-extended-rescue-with-image
which are merged in single rescue plugins in v2.1

In rescue tests, enabling some more v2 extension which are required for
POST/GET sevrer.

Change-Id: I3a38b1a6cf21a3e5774e5704303ba64979c04e56
2015-06-15 08:48:02 +00:00
ghanshyam cea246b0ab Merge disk-config func test between v2 and v2.1
Currently v2 and v2.1 have separate functional tests and their
corresponding sample files. As v2 and v2.1 are supposed to be identical,
there is overhead to maintain two set of functional tests and sample files.
We can have one set of tests which can run for both v2 and v2.1.

This commit merges disk-config functional tests.

In V2.1 os-access-ip is separate plugin where in v2 it was mixed in server
plugin itself. So os-access-ip extension is enabled to run
merged functional tests for both v2 and v2.1.
Also enabling some required extension for v2 tests.

Change-Id: Ic13d5e67ec992936e3899904b8a7ec7e4488716f
2015-06-15 08:47:45 +00:00
ghanshyam 8975dab649 Merge config_drive functional tests between v2 and v2.1
Currently v2 and v2.1 have separate functional tests and their
corresponding sample files. As v2 and v2.1 are supposed to be identical,
there is overhead to maintain two set of functional tests and sample files.
We can have one set of tests which can run for both v2 and v2.1.

This commit merges config drive functional tests.

In V2.1 os-access-ip is separate plugin where in v2 it was mixed in server
plugin itself. So os-access-ip extension is enabled for server tests to run
merged functional tests for both v2 and v2.1.

Change-Id: I17d3a057f1cf97241ec7c259c6ce943e7523f0d9
2015-06-15 17:45:46 +09:00
Jenkins 9b37a9c1a5 Merge "Merge V2 and V2.1 hypervisor functional tests" 2015-06-15 07:48:34 +00:00
Jenkins dac070b2b3 Merge "Show 'reserved' status in os-fixed-ips" 2015-06-10 16:48:56 +00:00
ghanshyam 7b3a32492c Merge V2 and V2.1 hypervisor functional tests
Currently v2 and v2.1 have separate functional tests and their
corresponding sample files. As v2 and v2.1 are supposed to be identical,
there is overhead to maintain two set of functional tests and sample files.
We can have one set of tests which can run for both v2 and v2.1.

This commit merges hypervisor functional tests.
Also adding test for hypervisor servers.

In V2 hypervsior API has following extensions
- os-extended-hypervisors
- os-hypervisor-status
In V2.1 above extensions have been merged together in hypervisor plugins

Change-Id: I5ddf3c54dd80a67f71762769d6130db41e772b01
2015-06-10 09:54:51 +09:00
ghanshyam ea5b9626a0 Merge console_auth_tokens tests between v2 and v2.1
Currently v2 and v2.1 have separate functional tests and their
corresponding sample files. As v2 and v2.1 are supposed to be identical,
there is overhead to maintain two set of functional tests and sample files.
We can have one set of tests which can run for both v2 and v2.1.

This commit merges console_auth_tokens functional tests.

In V2.1 os-access-ip is separate plugin where in v2 it was mixed in server
plugin itself. So os-access-ip extension is enabled to run
merged functional tests for both v2 and v2.1.

Change-Id: If2a7d27f0c9d6bd6ffa4748aeb6b2f0a57f6f739
2015-06-09 18:31:27 +09:00
ghanshyam 22462ed443 Merge V2 and V2.1 cloudpipe functional tests
Currently v2 and v2.1 have separate functional tests and their
corresponding sample files. As v2 and v2.1 are supposed to be identical,
there is overhead to maintain two set of functional tests and sample files.
We can have one set of tests which can run for both v2 and v2.1.

This commit merges cloudpipe functional tests.

In V2 hypervsior API has following extensions
- os-cloudpipe
- os-cloudpipe-update

In V2.1 above extensions have been merged together in cloudpipe plugins

Change-Id: Idf76e584fc2ec9508d93edead48ffc90a8c25257
2015-06-09 17:09:33 +09:00
Jenkins 084b8c79f2 Merge "Share admin password func test between v2 and v2.1" 2015-06-09 07:46:48 +00:00
Jenkins 4630310974 Merge "Merge fping functional tests between v2 and v2.1" 2015-06-09 07:46:30 +00:00
Jenkins e343228414 Merge "Merge simple tenant usage tests between v2 and v2.1" 2015-06-09 07:46:12 +00:00
Jenkins e2e54133ca Merge "Share assisted vol snapshots test between v2 and v2.1" 2015-06-09 07:45:49 +00:00
Jenkins 0b7f5bba56 Merge "Share deferred_delete func tests between v2 and v2.1" 2015-06-09 07:45:10 +00:00
Jenkins a31ffb47b4 Merge "Merge test_admin_actions between v2 and v2.1" 2015-06-09 07:44:31 +00:00
parklong 6ccc90ec1a Merge extension-info functional tests of v2 and v2.1
Currently v2 and v2.1 have separate functional tests and their
corresponding sample files. As v2 and v2.1 are supposed to be identical,
there is overhead to maintain two set of functional tests and sample files.
We can have one set of tests which can run for both v2 and v2.1.

This commit merges extension-info functional tests.

ExtensionInfoSamplesJsonTest is v3 only, leave it as before.

ExtensionInfoAllSamplesJsonTest, the response data is different,
tag the template files with version.

Change-Id: Id7b7bf08cda58d606325ddb82568a73f0bb99f60
2015-06-09 14:48:19 +08:00
parklong f036a54801 Merge extended-volume functional tests of v2 and v2.1
Currently v2 and v2.1 have separate functional tests and their
corresponding sample files. As v2 and v2.1 are supposed to be identical,
there is overhead to maintain two set of functional tests and sample files.
We can have one set of tests which can run for both v2 and v2.1.

This commit merges extended-volume functional tests.

Change-Id: I18f3c9f3e3b253006b1a34b4739716aa21275d66
2015-06-08 10:08:04 +08:00
ghanshyam 28a5f93b1b Merge simple tenant usage tests between v2 and v2.1
Currently v2 and v2.1 have separate functional tests and their
corresponding sample files. As v2 and v2.1 are supposed to be identical,
there is overhead to maintain two set of functional tests and sample files.
We can have one set of tests which can run for both v2 and v2.1.

This commit merges simple tenant usage functional tests.

In V2.1 os-access-ip is separate plugin where in v2 it was mixed in server
plugin itself. So os-access-ip extension is enabled to run
merged functional tests for both v2 and v2.1.

Change-Id: I435272874d63c63052e8ac72ff16b0459e854a61
2015-05-26 15:19:11 +09:00
ghanshyam 1eb49afbba Merge fping functional tests between v2 and v2.1
Currently v2 and v2.1 have separate functional tests and their
corresponding sample files. As v2 and v2.1 are supposed to be identical,
there is overhead to maintain two set of functional tests and sample files.
We can have one set of tests which can run for both v2 and v2.1.

This commit merges fping functional tests.

In V2.1 os-access-ip is separate plugin where in v2 it was mixed in server
plugin itself. So os-access-ip extension is enabled tests to run
merged functional tests for both v2 and v2.1.

Change-Id: I1dd91402c38736accea0e9b73be66a9aaa72c4f3
2015-05-26 11:59:43 +09:00
ghanshyam 90312d9480 Share admin password func test between v2 and v2.1
Currently v2 and v2.1 have separate functional tests and their
corresponding sample files. As v2 and v2.1 are supposed to be identical,
there is overhead to maintain two set of functional tests and sample files.
We can have one set of tests which can run for both v2 and v2.1.

This commit merges admin password functional tests.

In V2.1 os-access-ip is separate plugin where in v2 it was mixed in server
plugin itself. So os-access-ip extension is enabled for v2.1 tests to run
successfully.

Change-Id: Icfb9253ffb0852d15e685045a31b9fe811722733
2015-05-26 10:51:29 +09:00
Jenkins 6c8adefb9d Merge "Merge user_data functional tests of v2 and v2.1" 2015-05-22 22:50:42 +00:00
Jenkins 37991ef9c3 Merge "Merge V2 and V2.1 services functional tests" 2015-05-21 18:10:02 +00:00
Matt Riedemann 8886590f30 Show 'reserved' status in os-fixed-ips
Adds a new microversion to show the 'reserved' status on a FixedIP in
the os-fixed-ips extension.

Closes-Bug: #1249526

Implements blueprint show-reserved-status-in-os-fixed-ips-api

Change-Id: Iadaae393fce0c78dbdfd3b02958ddfd6276edb94
2015-05-15 10:38:47 -07:00
parklong d4db3bde66 Merge user_data functional tests of v2 and v2.1
Currently v2 and v2.1 have separate functional tests and their
corresponding sample files. As v2 and v2.1 are supposed to be identical,
there is overhead to maintain two set of functional tests and sample files.
We can have one set of tests which can run for both v2 and v2.1.

This commit merges user_data functional tests.

Change-Id: I31aeb01864c9e67e0bc20f2ba3b1a8bf01e8104d
2015-05-14 08:25:02 +00:00
ghanshyam c54638e178 Merge test_admin_actions between v2 and v2.1
Currently v2 and v2.1 have separate functional tests and their
corresponding sample files. As v2 and v2.1 are supposed to be identical,
there is overhead to maintain two set of functional tests and sample files.
We can have one set of tests which can run for both v2 and v2.1.

This commit merges admin actions functional tests.

In V2.1 os-access-ip is separate plugin where in v2 it was mixed in server
plugin itself. So os-access-ip extension is enabled for v2.1 tests to run
successfully.

Change-Id: I0b942e038ae6b50837e246f76c1e592539f1761a
2015-05-13 14:38:28 +09:00
ghanshyam c1517c3a92 Merge migrate server tests between v2 and v2.1
Currently v2 and v2.1 have separate functional tests and their
corresponding sample files. As v2 and v2.1 are supposed to be identical,
there is overhead to maintain two set of functional tests and sample files.
We can have one set of tests which can run for both v2 and v2.1.

This commit merges servers actions migrate, live migrate server
functional tests.

In V2.1 os-access-ip is separate plugin where in v2 it was mixed in server
plugin itself. So os-access-ip extension is enabled to run
merged functional tests for both v2 and v2.1.

Change-Id: Ie02bb74b9e9a33d18f984f9821171d91972c4f20
2015-05-12 15:01:43 +09:00
Jenkins e8707aa3b5 Merge "Merge server metadata tests between v2 and v2.1" 2015-05-12 05:02:51 +00:00
ghanshyam 0efe94670d Share deferred_delete func tests between v2 and v2.1
Currently v2 and v2.1 have separate functional tests and their
corresponding sample files. As v2 and v2.1 are supposed to be identical,
there is overhead to maintain two set of functional tests and sample files.
We can have one set of tests which can run for both v2 and v2.1.

This commit merges deferred delete functional tests.

In V2.1 os-access-ip is separate plugin where in v2 it was mixed in server
plugin itself. So os-access-ip extension is enabled to run
merged functional tests for both v2 and v2.1.

Change-Id: Ice79473ec5640f87de659d32a094c321e4b1f0db
2015-05-12 11:50:26 +09:00
ghanshyam 09a044cb7d Share assisted vol snapshots test between v2 and v2.1
Currently v2 and v2.1 have separate functional tests and their
corresponding sample files. As v2 and v2.1 are supposed to be identical,
there is overhead to maintain two set of functional tests and sample files.
We can have one set of tests which can run for both v2 and v2.1.

This commit merges assisted volume snapshots functional tests.

Change-Id: Idf2dd3c875a89b65865a8e3621429dfb7d62af15
2015-05-12 11:18:05 +09:00
ghanshyam 3e1275c6fd Merge V2 and V2.1 services functional tests
Currently v2 and v2.1 have separate functional tests and their
corresponding sample files. As v2 and v2.1 are supposed to be identical,
there is overhead to maintain two set of functional tests and sample files.
We can have one set of tests which can run for both v2 and v2.1.

This commit merges services functional tests.

In V2 services API has following extensions
- os-services
- os-extended-services-delete
- os-extended-services

In V2.1 above extensions have been merged together in services plugins

Change-Id: I498e80aef9c05b125d396f40fcb0e6ae4bef8da6
2015-05-12 11:09:40 +09:00
ghanshyam 4aa5ca5424 Merge lock/pause server tests between v2 and v2.1
Currently v2 and v2.1 have separate functional tests and their
corresponding sample files. As v2 and v2.1 are supposed to be identical,
there is overhead to maintain two set of functional tests and sample files.
We can have one set of tests which can run for both v2 and v2.1.

This commit merges servers actions lock/unlock, pause/unpause server
functional tests.

In V2.1 os-access-ip is separate plugin where in v2 it was mixed in server
plugin itself. So os-access-ip extension is enabled to run
merged functional tests for both v2 and v2.1.

Change-Id: I7e6c9d414959019eb6d29b2e87e1d8104c801903
2015-05-12 10:30:28 +09:00
ghanshyam 072944f454 Merge server metadata tests between v2 and v2.1
Currently v2 and v2.1 have separate functional tests and their
corresponding sample files. As v2 and v2.1 are supposed to be identical,
there is overhead to maintain two set of functional tests and sample files.
We can have one set of tests which can run for both v2 and v2.1.

This commit merges servers metadata functional tests.

In V2.1 os-access-ip is separate plugin where in v2 it was mixed in server
plugin itself. So os-access-ip extension is enabled to run
merged functional tests for both v2 and v2.1.

Change-Id: I6726ea5515db0c25e9a9a4356a50ddb03be92541
2015-05-12 10:17:33 +09:00