2032 Commits

Author SHA1 Message Date
sunyajing
c45b1d7b23 Fix error for find_service() in identity
if there are more than one services be found with one
name, a NoUniqueMatch exception should be raised but
we can see a NotFound Exception raised instead. It is
because in "find_service()", we use "find_resource()"
first, if "find_resource()" return a exception, we just
think it is a NotFound Exception and continue to find
by type but ignore a NoUniqueMatch exception of
"find_resource()". This patch refactor the "find_service()"
method to solve this problem.

Change-Id: Id4619092c57f276ae0698c89df0d5503b7423a4e
Co-Authored-By: Huanxuan Ao <huanxuan.ao@easystack.cn>
Closes-Bug:#1597296
2016-07-22 19:40:50 +08:00
Huanxuan Ao
60639d76a7 Support bulk deletion for delete commands in identityv3
Support bulk deletion for delete commands in the list below
identity/v3/consumer
identity/v3/credential
identity/v3/domain
identity/v3/ec2creds
identity/v3/endpoint
identity/v3/federation_protocol
identity/v3/identity_provider
identity/v3/mapping
identity/v3/policy
identity/v3/region
identity/v3/service_provider
identity/v3/service

The unit test in identityv3 need to be refactored, so I add
some functional tests instead. I will add all unit tests at
one time after the refactor completed.

Change-Id: I82367570f59817b47c87b6c7bfeae95ccfe5c50e
Closes-Bug: #1592906
2016-07-19 09:49:36 +08:00
Jenkins
5b0f87ff1f Merge "Add create_one_image_member() in FakeImage class and update test" 2016-07-18 22:54:30 +00:00
Jenkins
6ce53fed83 Merge "Support error handling for delete commands in volumev2" 2016-07-18 22:41:07 +00:00
Jenkins
13f1aa9b81 Merge "Make set/unset commands pass normally when nothing specified in identityv3" 2016-07-18 22:15:31 +00:00
Jenkins
099c3bbd82 Merge "Add "--project" option to "volume type create" command" 2016-07-18 19:38:02 +00:00
Jenkins
ba0e1b6ef5 Merge "image list: Add Checksum column" 2016-07-18 18:38:49 +00:00
Jenkins
beaa06138e Merge "Pass security group id to novaclient" 2016-07-18 18:35:15 +00:00
Huanxuan Ao
50dd4a1a1e Add create_one_image_member() in FakeImage class and update test
Usually we use a fake object in unit test. To match the other
test, add create_one_image_member() in FakeImage class in imagev2
to create a fake image member, delete the old data and update
the unit test of image.

Change-Id: I062a362b15db7e8bc89ec48c540d310199fd6c0b
2016-07-15 20:05:04 +08:00
Jenkins
1c745700d9 Merge "Change to plural form of object in multi delete error message in networkv2" 2016-07-14 22:41:11 +00:00
Huanxuan Ao
5e06d6a3a6 Change to plural form of object in multi delete error message in networkv2
Usually, the error message of multi delete is:
"'result' of 'total' 'objects' failed to delete"
the objects is a plural form.
To match the other multi delete error messages
in OSC, change the object in delete error message
in networkv2 to a plural form. Just add a 's' in
the message.

Change-Id: I17e0735d025bb61014db709d2639813565015b3d
2016-07-14 18:34:19 +08:00
Huanxuan Ao
9b51127ecc Support error handling for delete commands in volumev2
Some delete conmmands in volumev2 did not support
error handling, this patch add them and also add
the unit tests for bulk deletion

Change-Id: I56ade6f9c7396c78fb989547476c4d94ccd76eae
2016-07-14 17:49:26 +08:00
Jenkins
52cb503fb0 Merge "Modify compute agent set command" 2016-07-14 09:22:21 +00:00
Jenkins
63a6789add Merge "Use FakeProject and FakeDomain classes in unit tests of networkv2" 2016-07-14 06:25:39 +00:00
Huanxuan Ao
e5a3c403e5 Make set/unset commands pass normally when nothing specified in identityv3
Change-Id: I554b41969f96b62a2c6d37024caa56b1441d5ed1
Partial-bug: #1588588
2016-07-14 14:12:30 +08:00
Jenkins
56a232c79f Merge "Change the wrong import order" 2016-07-14 05:13:09 +00:00
Jenkins
1620964cfe Merge "Remove useless dest of option in volume v1&v2" 2016-07-14 04:06:56 +00:00
Dean Troyer
067647b6a4 Temp work around for missing select_auth_plugin()
These were removed prematurely from osc-lib (by me) but the real fix in
https://review.openstack.org/329189 is having racy functional test issues
that may be related to osc-lib, so let's clear this up while we fix that...

Change-Id: I8f67466967751fdf6fd24ae1b16ccee2aec52323
2016-07-13 10:33:19 -05:00
Huanxuan Ao
e310682235 Add "--project" option to "volume type create" command
Add "--project" and "--project-domain" options to
"volume type create" command. We can use these options
to add the type access to a given project when we
create the volume type.

Change-Id: I483a6b61dae137682c3d1f7527531b40e508ba92
Closes-Bug: #1602169
2016-07-12 19:23:47 +08:00
Huanxuan Ao
f79f671338 Change the wrong import order
Change-Id: Ia48f0aae0250a5d29c0f6fa46386465e118f760f
2016-07-12 16:51:21 +08:00
Marc Abramowitz
8bbf30498e image list: Add Checksum column
The checksum could potentially be useful for spotting duplicated images or
checking if images with the same name are identical or different.

Closes-Bug: #1602073

Change-Id: Ia0c41970c846d550de14297e18bc738e847e5a3b
2016-07-11 20:31:13 -07:00
Jenkins
5a21eb2555 Merge "Add "--incremental" option to "backup create" command in volume v2" 2016-07-11 20:15:15 +00:00
Jenkins
357d7e75f3 Merge "Unskip tests caused by bug 1599333" 2016-07-11 19:40:14 +00:00
Paul Bourke
34812655a5 Add "--incremental" option to "backup create" command in volume v2
Cinder V2 API supports creating volume backup with "--incremental"
option. However, OSC doesn't support this argument. So this patch adds
the "--incremental" option to allow users to create incremental style
backups.

Change-Id: Iefac5f1a6c9ef006ad9c22d4250ae6df50504781
Closes-Bug: 1600196
2016-07-11 13:29:59 -04:00
Rajasi Kulkarni
8405db900f Pass security group id to novaclient
In RemoveServerSecurityGroup we currently pass the entire security
group object, which results in TypeError in novaclient.
Added unit test case to test command 'openstack server remove
security group -h <server> <group>'

Change-Id: I6d486403a83804c3a30d6f89d2cf7f64f09797c6
Closes-Bug: 1590883
2016-07-11 22:34:35 +05:30
sunyajing
25bdf6811c Modify compute agent set command
Migrate ``compute agent set`` arguments: version, url, md5hash
to be optional.

BackwardsIncompatibleImpact

Change-Id: I092b7ed24274bafa548f0537c4586504be3a2825
Co-Authored-By: Huanxuan Ao <huanxuan.ao@easystack.cn>
2016-07-11 18:07:34 +08:00
Huanxuan Ao
6825263609 Use FakeProject and FakeDomain classes in unit tests of networkv2
FakeProject and FakeDomain classes have been completed
in identityv2_0 and v3, Now we can use these classes
instead of old test data in networkv2.

Change-Id: I2f698e54ff35e24ffbdcaba29da6f96eb263cc0a
Partially-Implements: blueprint use-fake-project
2016-07-11 15:07:03 +08:00
Jenkins
00a15351eb Merge "Add notes, modify notes in fakes docstring" 2016-07-11 03:44:27 +00:00
Huanxuan Ao
cd189860e5 Remove useless dest of option in volume v1&v2
some "dest" argument is useless because they are
the same as the option name. So remove them.

Change-Id: Idd37e8816cf8b0833c94a5e741fdfe56602551f9
2016-07-11 10:10:59 +08:00
ji-xuepeng
17f177bb71 remove unused LOG
This is to remove unused LOG to keep code clean.

Change-Id: Ic544157b19cefb4120381f3314334c60a9020baf
2016-07-09 23:23:38 +08:00
zheng yin
94f654b010 Remove FakeService.get_services
FakeService.get_services is useless in other test files, so remove it

Change-Id: If90b8742be97697f285750a05896b574c45f3504
2016-07-09 05:37:55 +08:00
zheng yin
527b2030fb Add notes, modify notes in fakes docstring
Some code has no notes, then add them
Some code notes are not perfect, then improve them
Some code notes are incorrect, then modify them

Change-Id: I43f9a8663ae138bdd494bc234c1fac00c2dd6c95
2016-07-08 18:36:11 +08:00
Steve Martinelli
9f09d8c5d4 Unskip tests caused by bug 1599333
There is now a second .get() call in osc_lib.utils.find_resources.
These tests were failing because they only mocked a single access
call to .get(). Ensure there are two calls to .get(), with the
first one raising an exception.

Change-Id: Idd2ad4a27a6db5bee633cc37a1042dbb0a57aa71
Closes-Bug: #1599333
2016-07-07 22:54:23 -04:00
Jenkins
ffb232a90e Merge "Correct reraising of exception" 2016-07-07 20:56:18 +00:00
Jenkins
2adeac2bc2 Merge "osc-lib: api.auth" 2016-07-07 19:49:06 +00:00
Jenkins
bca1851911 Merge "modify notes in the FakeHypervisorStats docstring" 2016-07-07 17:35:55 +00:00
qinchunhua
6f36385cb8 Correct reraising of exception
When an exception was caught and rethrown,
it should call 'raise' without any arguments
because it shows the place where an exception
occured initially instead of place where the exception re-raised.

Change-Id: I5fb6dea5da7fb6e1e2b339a713c7d37f8c99e407
2016-07-07 15:05:58 +00:00
zheng yin
cc9efea9e0 modify notes in the FakeHypervisorStats docstring
The arugments should be: count and current_workload

Change-Id: I445d1d72d1f1b86a626bb4c9512cdb8311b2ebc9
2016-07-07 14:10:32 +00:00
zhengsenyan
1e895f3286 fix one spelling mistake and two help messages
I checked all the 70 rst files in doc/source/command-objects and
found that:
 -one spelling mistake as:rescure should be rescue(server.rst)
 -two help messages:xpvnc should be xvpvnc(console-url.rst and
  console.py)

Change-Id: I6f46c79983eaf5650bd3aa0ab448c19f5c6527a9
2016-07-07 14:19:04 +08:00
Jenkins
e0b63e64c1 Merge "Add "--property" option to "snapshot create" command in volumev2" 2016-07-06 15:31:39 +00:00
Jenkins
f1a27a73d6 Merge "Add '--force' option to 'backup delete' command in volumev2" 2016-07-06 14:59:53 +00:00
Jenkins
7f8999bf54 Merge "Transfer "ip fixed add/remove" to "server add/remove fixed ip"" 2016-07-06 13:59:32 +00:00
Jenkins
2b8213df88 Merge "Transfer "ip floating add/remove" to "server add/remove floating ip"" 2016-07-06 13:59:06 +00:00
Jenkins
8d5a0fd86e Merge "Transfer "ip floating pool list" to "floating ip pool list"" 2016-07-06 13:50:32 +00:00
Jenkins
472d4532e6 Merge "Add command to unset information from ports" 2016-07-06 13:08:04 +00:00
Huanxuan Ao
f5aef9ac36 Add '--force' option to 'backup delete' command in volumev2
Add '--force' option to 'backup delete' command in
volumev2 (v2 only) to allow delete in state other
than error or available.

Change-Id: I661ea0d465db227e374cbacdde0206fa1a6dd3d5
Closes-Bug: #1597188
2016-07-06 20:51:01 +08:00
Huanxuan Ao
3222ffc157 Add "--property" option to "snapshot create" command in volumev2
Add "--property" option to "snapshot create" command
in volumev2 (v2 only) to support adding properties to
a new snapshot.

Change-Id: Ie0e90c9ccc2ac89b3b7b0ac89751fd864aada9a4
Closes-Bug: #1597192
2016-07-06 20:46:31 +08:00
Jenkins
4ce7dd53e8 Merge "Refactor unit tests for project and domain with fake classes in identityv3" 2016-07-06 04:08:03 +00:00
Steve Martinelli
72a82b2794 skip failing tests due to bug 1599333 is fixed
latest osc-lib breaks some of the tests, skip them for now
so we can continue to merge patches that are already approved.

Change-Id: I433190e9f763bea1df3135612b281d925745f884
Related-Bug: 1599333
2016-07-05 20:24:31 -04:00
Jenkins
44d4188149 Merge "fix a few spelling mistakes" 2016-07-04 17:19:59 +00:00