Commit Graph

530 Commits

Author SHA1 Message Date
parklong 2ca2236b83 Merge flavor_rxtx 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 flavor_rxtx functional tests.

Change-Id: I82b183f95cd5a8e9981d2969b96204f11ab48c8f
2015-04-07 13:00:49 +08:00
parklong edcc7ab360 Merge fixed_ips 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 fixed_ips functional tests.

Change-Id: Ia7d709adb90bf91adb92a3550584a30347d2f32d
2015-04-07 11:54:17 +08:00
ghanshyam f713c7c7b5 Merge 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 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: I3dda5820cf8e1897c7a3895edb43bc708db9073d
2015-04-07 02:05:32 +00:00
parklong c9434e2b56 Merge flavor_extraspecs 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 flavor_extraspecs functional tests.

Change-Id: Iab41188b8e511a1a41dabee8bad48fd18cbd2b06
2015-04-07 09:21:15 +08:00
Jenkins cd24e140c6 Merge "Merge baremetal_nodes func tests between V2 and V2.1" 2015-04-06 23:39:15 +00:00
Jenkins 6c1b8e077c Merge "Share V2 and V2.1 tenant-networks functional tests" 2015-04-06 23:38:52 +00:00
Jenkins a175a0781c Merge "Merge sec grp default rules tests between V2 and V2.1" 2015-04-06 23:38:30 +00:00
Jenkins 983543cf42 Merge "Merge instance_usage_audit_log tests between V2 and V2.1" 2015-04-06 23:38:07 +00:00
Jenkins 7e77ee309d Merge "Share V2 and V2.1 hosts functional tests" 2015-04-06 23:37:37 +00:00
Jenkins 300f1fccbc Merge "Share migrations tests between V2 and V2.1" 2015-04-06 23:37:13 +00:00
Jenkins 9b674fc7c4 Merge "Merging instance_actions tests between V2 and V2.1" 2015-04-06 23:36:49 +00:00
Jenkins 62828ad7c0 Merge "Merge certificates functional tests of v2 and v2.1" 2015-04-06 23:36:24 +00:00
parklong 5fb5170adf Merge flavor_manage 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 flavor_manage functional tests.

This commit also tags FlavorManageSampleJsonTests as ADMIN_API to avoid
AuthenticationException when create a test flavor

Change-Id: I5fe68870285cfee2b3254184209a7111b24f7223
2015-04-03 16:55:29 +08:00
Jenkins d56cac321f Merge "Add json-schema for v2.1 fixed-ips" 2015-04-02 17:42:46 +00:00
He Jie Xu 8423a9cd15 Add json-schema for v2.1 fixed-ips
This patch adds json-schema for v2.1 fixed-ips. The json-schame limits
the input for actions reserve/unreserve. Also fixed the API sample
file at same time and add parameter_type none.

Co-Authored-By: Ken'ichi Ohmichi <ken1ohmichi@gmail.com>
Change-Id: Id2d0416c3ccc2a50d3cb66bed8747082f98fb194
Closes-Bug: #1438480
2015-04-01 18:39:16 +08:00
ghanshyam c6f1db668c Merge baremetal_nodes 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 baremetal_nodes functional tests.

Change-Id: Ifb42121727ae8ad1eebbdff3e52f2af816ccae28
2015-04-01 14:53:11 +09:00
ghanshyam dd09e57a1c Share V2 and V2.1 tenant-networks 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 tenant-networks functional tests.

Change-Id: I470ce6d26cd0865d2645ef269aa419b2b200ac37
2015-04-01 02:32:35 +00:00
ghanshyam 6ef5020183 Merge sec grp default rules 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 sec grp default rules functional tests.

Change-Id: I3a00d86c3c5451473601bd330015ccef4cf5c2a2
2015-04-01 02:32:14 +00:00
ghanshyam fa6ce70b72 Share migrations 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 migrations functional tests.

Change-Id: Iae29b8df04b43cc3b8cf56c1f51d73b62c7ca2bc
2015-04-01 02:32:00 +00:00
ghanshyam 651767b5f9 Merge instance_usage_audit_log 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 instance_usage_audit_log functional tests.

Change-Id: I08bca29e48fdf00f02d77f5332a93c2db14a3551
2015-04-01 02:31:43 +00:00
ghanshyam ed91ab06af Merging instance_actions 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 instance_actions functional tests.

Change-Id: I0773458cdeeca2f1eeac19d579cb8228769e1e18
2015-04-01 11:29:51 +09:00
ghanshyam 0dc7b09514 Share V2 and V2.1 hosts 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 all hosts functional tests.

Change-Id: Ibd53a7ddd4792942fe2dc45121dcc25fc9864903
2015-04-01 11:20:59 +09:00
ghanshyam 5228c9fd95 Merge certificates 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 certificates functional tests.

Change-Id: I3439eb50bf5d64f2101681dc523def9c586f893d
2015-04-01 11:05:21 +09:00
ghanshyam 0012f8bde2 Merge V2 and V2.1 Agent 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 Agent functional tests.

Change-Id: Ibfbe20f6c0b773ec7cf39d532074075c722deb63
2015-04-01 10:57:38 +09:00
Jenkins 9d20132a1d Merge "Merge quota_classes functional tests of v2 and v2.1" 2015-03-27 18:51:16 +00:00
Jenkins 15fae605ca Merge "Merge cell functional tests for V2 and V2.1" 2015-03-26 19:48:35 +00:00
Jenkins a46c460075 Merge "Merge V2 and V2.1 aggregate functional tests" 2015-03-26 19:48:09 +00:00
parklong 1648a5a598 Merge flavor_access 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 flavor_acess functional tests.

In V2 flavor_access has following extensions
- os-flavor-access
- os-flavor-manage
- OS-FLV-DISABLED
- OS-FLV-EXT-DATA
- os-flavor-swap

Change-Id: Ie552312079233ddacf3fdce5903a11ba280be2fd
2015-03-26 18:33:26 +08:00
parklong 860c481503 Merge quota_classes 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_classes functional tests.

In V2 quota_classes has following extensions
- os-server-group-quotas
- os-quota-class-sets

In V2.1, os-server-group-quotas extensions have been moved to extensions
limits, and there is no functional test for it.

so we merge os-quota-class-sets between V2 and V2.1, and delete
os-server-group-quotas

Partially implements merge_sample_tests

Change-Id: I46838ddffdb0c950781502716acaa01925ff9f67
2015-03-25 17:26:30 +08:00
ghanshyam d98aa4fadc Merge V2 and V2.1 floating ips 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 all floating ip functional tests.
Below APIs tests are megred-
-floating_ip_dns
-floating-ips-bulk
-floating-ips
-floating-ip-pools

Change-Id: Ibde0b152949559dec90ea0e7ee6668ab05b4927f
2015-03-25 15:42:35 +09:00
ghanshyam 6a16798b59 Merge cell functional tests for 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 cell functional tests.

In V2 cell has following extensions
- os-cells
- os-cell-capacities

In V2.1 above extensions have been merged together in os-cell plugins

Change-Id: I42adfa5de21e3af03761fc12d04498de5112f385
2015-03-24 16:18:24 +09:00
ghanshyam 0f3abb7fdf Merge V2 and V2.1 aggregate 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 aggregate functional tests.

Change-Id: I6d6ffd797d6015cebac3b21fc073b2297e5f67f2
2015-03-24 15:20:15 +09:00
ghanshyam e24c2239fb Merge V2 and V2.1 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 use the testscenearios to generate the tests one for v2 and one for v2.1
and make v2.1 tests to run against v2.1 plugins by redirecting /v2 endpoint to v2.1
plugins in api-paste.ini

As example this commit merge flavor APIs functional tests between v2 & v2.1.
In V2 flavor API has following extensions
- Flavor_swap
- Flavor_disabled
- Flavorextradata
In V2.1 above extensions have been merged together in flavor plugins

NOTE- As testscenarios is applied in base class. v2 tests will be generated
for all the existing tests but for tests which are not merged yet
their v2 generated tests will be skipped till they gets
merged. After merge, both version tests are expected to pass like
flavor tests in this patch. So you may see lot of skipped tests
which is expected and will gets disappear as tests gets merged.

Change-Id: I0e0262f818c7d7fb15528b16d3225b9578910996
2015-03-23 17:27:55 +09:00
Jenkins 59356a4d80 Merge "Fix V2 hide server address functional tests" 2015-03-20 02:19:40 +00:00
ghanshyam f2cc1bd7bc Move V2 sample files to respective directory
Some sample files like server, images etc are kept under api_samples/
directory.
As plan is to create clean directory structure for sample files for
V2, V2.1 and microversion, moving these sample files to respective directory
will help to achieve that.

Change-Id: I284d035f6fadb26a94bcb3586f4a8c72942ee423
2015-03-11 07:22:36 +00:00
ghanshyam 83be099a7a V2 tests -Reuse server post req/resp sample file
There are lot of duplicate sample files for server POST req/resp
in functional tests.

This patch reuse the server post req/resp sample file for V2
functional tests.

Change-Id: I4fc5771af9407b9e75cf07682ee1706935a87709
2015-03-11 16:19:40 +09:00
yunhong jiang ab437c0e90 API: Change the API cpu_info to be meaning ful.
Currently the API sample get '?' for the cpu_info, this is really
confusing, it even does not tell the type of the return.

Change it to be more meaningful.

Change-Id: I791beb7502f47dff646a46c08e818c29f9e6cd79
2015-02-24 13:57:49 -08:00
Jenkins 10a7974b3a Merge "Change v2.1 API status to CURRENT" 2015-02-24 08:37:02 +00:00
ghanshyam 30941b211a Fix V2 hide server address functional tests
In V2 hide server address extension functional tests, created instance
state does not belong to configured hide server address state. Due to
that address never got hidden from server.

Sample files used in those tests are wrong which makes those tests
pass.

This patch fix the tests by overriding the conf value and fix the
sample files accordingly.

Change-Id: I60e502941bb4b2634a542ead02465a186a22d9ae
2015-02-20 06:26:44 +00:00
Jenkins 009874f4c8 Merge "Add missing api samples for floating-ips api(v2)" 2015-02-16 14:56:12 +00:00
Eli Qiao c4a632a8f4 Add missing api samples for floating-ips api(v2)
floating-ips api missing floating-ips-get-resp sample file,
and the integrated test cases use a wrong sample file(algouth
the contents are same).
This patch addes missing api samples file and correct the
integrated test case.

Change-Id: Icadcabad369cb6a9c3270915aa3bc9545d5348e8
2015-02-15 18:23:58 +08:00
Chris Yeoh 9b794005fe Implement api samples test for os-baremetal-nodes Part 2
Implements an API sample test for a GET request for os-baremetal-nodes
which was previously manually generated and wrong. Removes api samples
for add-interface, create, and remove-interface which were removed
for os-baremetal-nodes at some point.

This should bring the os-baremetal-nodes plugin in sync with reality
for both v2 and v2.1

Partially implements blueprint v2-on-v3-api

Change-Id: Ibd55b43368485b7f460ef6564f611df136275562
2015-02-11 14:48:53 +10:30
Chris Yeoh e11a6de1d9 Implement api samples test for os-baremetal-nodes
Looks like the api samples for os-baremetal-noes were added manually
and so either weren't correct in the first place or the api output
has changed since the first merge. This patch implements tests
for index method. More to follow in later patches

Partially implements bp v2-on-v3-api

Change-Id: I3bd421b9a8b9eb49d274c190d124aaac6fbd361f
2015-02-10 22:06:18 +10:30
Ken'ichi Ohmichi c2d863578a Change v2.1 API status to CURRENT
Most v2.1 API patches are merged and the v2.1 API gate jobs are stable
now. This patch changes v2.1 API status to CURRENT from EXPERIMENTAL,
and does v2 one to SUPPORTED for making developers concentrate on v2.1
API instead of v2 API.
We will replace /v2 endpoint with v2.1 code because users will be able
to continue using /v2 endpoint without any changes, and /v2 endpoint
status becomes

  CURRENT -> SUPPORTED -> CURRENT

Partially implements blueprint v2-on-v3-api

Change-Id: I2c5e6612db4a792f1950f53c0bc69617e47b0fff
Depends-On: I8e63a684093dfe3a643c07b20e8080c1e950ed5a
2015-02-09 05:27:56 +00:00
Ken'ichi Ohmichi 46bd4e4292 Apply v2.1 API to href of version API
Now Nova contains v2 and v2.1 APIs, but version API returns the same
href between v2 and v2.1 like:
  {"href": "http://192.168.11.62:8774/v2/", "rel": "self"}
in a response.
In addition, current generate_href() handles v3 API case also. However
v3 API has disappeared, so the code is meaningless now.
This patch fixes the problem for returning a right href.

Change-Id: Ie3ac1223a9c88a33bcc037c7a50ac308bcebea2d
Closes-Bug: #1373741
2015-01-29 12:12:14 +00:00
Davanum Srinivas aff3e8699a Cleanup bad JSON files
- Add missing commas
- Replace single quote with double quote
- events field contains a list of events (event-create-req.json)
- Remove empty files
- Adds a JSON validation test to the docs pipeline

Co-Authored-By: Nicolas Simonds <nic@metacloud.com>
Change-Id: I9a4a9b6b8e2da73b5f25145be3b2faa44ebdb340
2015-01-22 11:46:05 -08:00
Davanum Srinivas 417704816e Nuke XML support from Nova REST API - Phase 1
In I5a580fc323c3809790b4a68a9f8f8129ecdc2cf0 we switched off XML support. In
this review we entirely remove all the testcases and supporting files.

Change-Id: I83827d438753fd3899053dd6e09bc77c997c7406
2015-01-05 12:46:04 -05:00
Jenkins 7aa8fdde66 Merge "Remove blanks before ':'" 2014-12-02 13:43:46 +00:00
Jenkins 1277c12209 Merge "Fix API samples/templates of multinic-add-fixed-ip" 2014-12-02 13:05:15 +00:00
jichenjc 55aa1ff1b6 Remove blanks before ':'
A space before ":" is unnecessary because of JSON.
So this patch removes the blanks before ':' for
v2 os-virtual-interfaces integrated test.

Change-Id: I20965a183a6a00e263cd0fdd91a3337162ecbe9b
2014-12-01 11:06:48 +08:00