Commit graph

1192 commits

Author SHA1 Message Date
Steve Martinelli
c14d3efe61 move all functional tests to tests module
functional tests should be grouped with other tests (unit and
integration tests). as part of this commit the "common" module
was renamed to just "base", this was done for simplicity.

the post_test_hook.sh file was also copied to the functional module
since it should live there. a separate change to the infra repo
will be made to call the new location, once that is merged we
can remove the old one (a new change will also be posted for that)

Needed-By: I49d54f009021d65c1ae49faf6b3f0a7acdadd7b3
Change-Id: Ie8c334f6223373b8e06df8bd8466500d2a2c8ede
2016-09-09 03:29:47 +00:00
Steve Martinelli
39839def2e move unit tests to new "unit" test module
this will better isolate the unit tests from the functional tests.
unfortunately, the "integration" tests had to be lumped into the
"unit" tests since we need the separation in testr.conf

Change-Id: Ifd12198c1f90e4e3c951c73bfa1884ab300d8ded
2016-09-08 15:19:50 -07:00
Jenkins
7d1a5d0854 Merge "format token expires time to prevent json loading datetime data" 2016-09-08 20:58:20 +00:00
Jenkins
b4307b1ef6 Merge "Add Subnet service-types to subnets" 2016-09-08 20:54:36 +00:00
Jenkins
55378953e2 Merge "Clean up FakeClient classes in volume fakes" 2016-09-06 14:03:38 +00:00
Jenkins
f7f0f770af Merge "Use assertIn(A, B) instead of assertTrue(A in B )" 2016-09-06 13:53:17 +00:00
Jenkins
20ad61b9d4 Merge "Add "volume service set" command" 2016-09-06 03:40:31 +00:00
Steve Martinelli
24c8b94baf format token expires time to prevent json loading datetime data
When output to shell, the token issue time is fine; however when
selecting the json formatter (via the --format json) option, an
exception is raised when formatting the dataetime data.

Rather than pass in the datetime data, we should format the data
with the ISO 8601 formatting.

Closes-Bug: 1619937
Change-Id: Iffebb2d5413fabfd283dfa94fc560fc37270f9dd
2016-09-05 17:23:42 +00:00
Bin Zhou
1626b63f56 Use assertIn(A, B) instead of assertTrue(A in B )
Developers should use assertIn(A, B) instead of assertTrue(A in B ).

TrivialFix

Change-Id: I0d7c542272315590536c427a8865e49660361e55
2016-09-02 12:48:41 +08:00
Dean Troyer
ca15cd434b Rearrange integration tests
Move the integration tests into their final home...

* Create tests/integ to hold the integration tests
* Split tests/test_shell_integ.py into tests/integ/base.py and
  tests/integ/cli/test_shell.py
* Rename TestXXXXInteg classes to TestIntegXXXX
* Adds tests/integ/cli/test_project.py for some simple project argument tests

Change-Id: I2cdd340d1d446d61784eae35dd5aa09d40d5899d
2016-08-31 14:59:36 -05:00
Dean Troyer
bec206fa0a Fix auth prompt brokenness
We start by fixing this in the already-present OSC_Config class so OSC
can move forward.  This change needs to get ported down into
os-client-config in the near future, maybe even soon enough to make the
client library freeze this week.

* Add the pw-func argument to the OSC_Config (or OpenStackConfig) __init__()
* When looping through the auth options from the KSA plugin look for any
  that have a prompt defined and do not have a value already, so ask for one.

Closes-bug: #1617384
Change-Id: Ic86d56b8a6844516292fb74513712b486fec4442
2016-08-29 11:58:49 -05:00
Huanxuan Ao
8f07fec3f2 Clean up FakeClient classes in volume fakes
Put FakeTransferClient and FakeServiceClient classes
into FakeVolumeClient class, I think we need not to
create FakeClient classes for every objects, we can use
only FakeVolumeClient for all volume objects. This can
reduce repetition, unified codes and make codes look
cleaner and easier.

Change-Id: I2729ef0e80166f4d49ccd9a48b653e2f215e3bfe
2016-08-23 10:31:24 +08:00
Jenkins
90b89acf60 Merge "Integ test cleanup" 2016-08-21 02:37:11 +00:00
Brian Haley
cf9ad08ab6 Add Subnet service-types to subnets
Add '--service-type' to subnet arguments to support
Subnet service-types.

Change-Id: I215d83e4d4cf53e03fa35041c5e41a328641b3a9
Partially-implements: blueprint service-subnets
2016-08-19 11:05:33 -04:00
Jenkins
8f63da4621 Merge "Fix errors in volume set/unset image properties unit tests" 2016-08-19 02:48:08 +00:00
Jenkins
7489fa36aa Merge "Add support for domain specific roles" 2016-08-18 23:30:54 +00:00
Dean Troyer
06721ea889 Integ test cleanup
Change-Id: Ie58a7bec569421097e92a7ddf3cb164fc3f07413
2016-08-18 17:45:29 -05:00
Jenkins
8cef12ce08 Merge "Add shell integration test" 2016-08-18 22:31:08 +00:00
Dean Troyer
cc3d46a47b Fix up last-minute imports to use osc-lib
Change-Id: I1ed2983cf574ebd565eeac4f8199fbc3a2e29c8e
2016-08-18 18:22:42 +00:00
Jenkins
34f5515a32 Merge "Gate-unbreaking combo review" 2016-08-18 17:52:37 +00:00
Dean Troyer
44f6b76929 Add shell integration test
These run next to unit tests, but unlike unit tests, they test the
dependent libraries also.  This is to detect incompatible breakage
in those dependencies.  The tests provide CLI-level input and
verify the API calls being made via requests using requests_mock
so the entire stack is tested.

It is possible we want to run these separate from the unit tests.
They do not belong in the functional tests as they do not require
a functional cloud for testing.

Depends-on: I426548376fc7d3cdb36501310dafd8c44d22ae30
Change-Id: I356956fcc4ff35191a6ad6a085b75cf370434b09
2016-08-18 11:15:18 -05:00
Dean Troyer
2a1a174086 Gate-unbreaking combo review
Fix argument precedence hack
  Working around issues in os-client-config <= 1.18.0

  This is ugly because the issues in o-c-c 1.19.1 run even deeper
  than in 1.18.0, so we're going to use 1.19.0 get_one_cloud() that
  is known to work for OSC and fix o-c-c with an axe.

Remove return values for set commands
  'identity provider set' and 'service provider set' were still
  returning their show-like data, this is a fail for set commands
  now, don't know how this ever passed before...

Constraints are ready to be used for tox.ini
  Per email[1] from Andreas, we don't need to hack at install_command
  any longer.

  [1] http://openstack.markmail.org/thread/a4l7tokbotwqvuoh

Co-authorioed-by: Steve Martinelli <s.martinelli@gmail.com>
Depends-On: I49313dc7d4f44ec897de7a375f25b7ed864226f1
Change-Id: I426548376fc7d3cdb36501310dafd8c44d22ae30
2016-08-18 07:21:15 -05:00
Huanxuan Ao
81431d24a9 Add "volume service set" command
Add "volume service set" command in volume v1 and v2
(v1 is the same as v2) to disable or enable volume service.

Change-Id: Ibb2db7e93b24cb2e0d2a7c28b6fd8bcc851b8d2f
Closes-Bug: #1613597
2016-08-17 10:42:28 +08:00
Jenkins
fc7a69e410 Merge "Add '--dhcp' and '--no-dhcp' options to os subnet list cmd" 2016-08-11 07:27:35 +00:00
Jenkins
c9cf6c4eb2 Merge "Rename backup commands in volume v1 and v2" 2016-08-11 04:36:52 +00:00
Huanxuan Ao
95f0e3dc36 Fix errors in volume set/unset image properties unit tests
These errors may caused by copy-paste, we should specify
a fake return value for get() method but not create() method.
Create() mothod will not called in set/unset command. After
specifing the return value of get(), we can use the fake volume
in the assert.

Change-Id: I1e0df4c28ece373168788c396e9082d565e36cc7
2016-08-11 11:43:03 +08:00
Huanxuan Ao
39c5eb9e3f Rename backup commands in volume v1 and v2
Backup commands are used only in volume service now,
but "backup" is too generic, users may not know the
commands are used for volume from the commands name.
By seeing the command name, users can only see the
"backup" but do not know which object the backup
commands work for. It may confuse users. I think
rename "backup" to "volume backup" can depict resource
relation and will be helpful for users to know the
commands clearly.

So add new commands ``volume backup create/delete/
list/show/restore`` to replace the old commands
``backup create/delete/list/show/restore``. And also
deprecate old commands.

Change-Id: I4f844d9bc48573eb4d17288ce6b8a90cea00d16a
Implements: bp backup-snapshot-renamed-for-volume-resource
Co-Authored-By: Sheel Rana <ranasheel2000@gmail.com>
2016-08-11 09:32:10 +08:00
Henry Nash
5eb7e626b1 Add support for domain specific roles
A role entity can now be specified as domain specific.

Closes-bug: #1606105
Change-Id: I564cf3da1d61f5bfcf85be591480d2f5c8d694a0
2016-08-10 20:32:55 +00:00
Huanxuan Ao
722be75f9c Implement "network agent set" command
Add "network agent set" command in network v2 to set network
agent properties.
Also add the unit test, doc, functional test and release note.

Change-Id: Iebaee4c60f8c6b43f538c1b82a38b93178b9ce53
Implements: bp implement-network-agents
Co-Authored-By: Michael Gugino <michael.gugino@walmart.com>
2016-08-10 15:39:44 +08:00
Cao Xuan Hoang
831546fb9e Add '--dhcp' and '--no-dhcp' options to os subnet list cmd
This patch adds '--dhcp' and '--no-dhcp' options to filter
subnets resulted by os subnet list command.

Change-Id: Ib574cc54594845bc5c5afc38bf44e3b224d33b17
Partial-Bug: #1610883
2016-08-10 08:27:03 +07:00
Jenkins
80fd9b2bd4 Merge "Support multi REST API calls error handling for "volume set" command" 2016-08-06 12:02:29 +00:00
Jenkins
3692a2a91a Merge "osc-lib: shell" 2016-08-06 08:01:52 +00:00
Huanxuan Ao
3202fefc65 Support multi REST API calls error handling for "volume set" command
Support the error handling follow the rule in
doc/source/command-errors.rst
Also add a unit test for testing the error handling

Change-Id: I98064f4b8c1dc17eb3874f7b25c827a568463c0f
2016-08-06 09:15:21 +08:00
Dean Troyer
6a15f90dae osc-lib: shell
Convert to using ClientManager and OpenStackShell from osc-lib.
* Change all internal uses of ClientManager private attributes that are
  now public in osc-lib's ClientManager.  Leave back-compat copies in
  place in OSC's clientManager so we don't break plugins.
* Put some work-arounds in place for changes in osc-lib that we need until
  a new release makes it through the g-r and u-c change process.
* Add a test for Unicode decoding of argv in shell.main() to parallel
  the one in osc-lib.

Change-Id: I85289740d4ca081f2aca8c9b40ec422ad25d302c
2016-08-05 13:48:55 -05:00
Jenkins
020f13e12b Merge "Implement network agents functionality" 2016-08-05 16:01:13 +00:00
Jenkins
6dd3f45e39 Merge "Show "target_project_id" attribute properly for network rbac object" 2016-08-05 13:38:32 +00:00
Michael Gugino
0736336a71 Implement network agents functionality
python-neutronclient implements the following command set:

agent-list, agent-show, agent-delete

These commands display and modify various network agents and their
information.

python-openstacksdk has supported the api calls for these commands,
but python-openstackclient does not implement these commands.

This commit adds support for the following commands:

openstack network agent list
openstack network agent show <agent>
openstack network agent delete <agent>

Change-Id: I83ede6f89c37e7bdc38d7e9e7bb9d80e94c8becc
Implements: blueprint implement-network-agents
Depends-On: I9755637f76787d5fac8ff295ae273b308fcb98d0
Co-Authored-By: Huanxuan Ao <huanxuan.ao@easystack.cn>
2016-08-05 16:25:33 +08:00
Huanxuan Ao
7f93d8cc88 Show "target_project_id" attribute properly for network rbac object
According to the code in SDK:
https://github.com/openstack/python-openstacksdk/blob/master/openstack/network/v2/rbac_policy.py#L34
we can see the conlumn of "target_tenant" should be
"targer_project_id" but not "target_project". It is
the reason why could not show the "target_project"
in OSC, so this patch fix it.

Before this change:
(openstack) network rbac show b74fd644-e057-4d44-8ae1-7ca9967ea1e1
+----------------+--------------------------------------+
| Field          | Value                                |
+----------------+--------------------------------------+
| action         | access_as_shared                     |
| id             | b74fd644-e057-4d44-8ae1-7ca9967ea1e1 |
| object_id      | 8735b57f-606a-4f65-9902-2052a6d2a66d |
| object_type    | network                              |
| project_id     | 01c0ba43101b4080a52a5f79a55c56ff     |
| target_project |                                      |
+----------------+--------------------------------------+
After this change:
(openstack) network rbac show b74fd644-e057-4d44-8ae1-7ca9967ea1e1
+-------------------+--------------------------------------+
| Field             | Value                                |
+-------------------+--------------------------------------+
| action            | access_as_shared                     |
| id                | b74fd644-e057-4d44-8ae1-7ca9967ea1e1 |
| object_id         | 8735b57f-606a-4f65-9902-2052a6d2a66d |
| object_type       | network                              |
| project_id        | 01c0ba43101b4080a52a5f79a55c56ff     |
| target_project_id | c7ab4d2ea9e1487095a8ca24ea44ef38     |
+-------------------+--------------------------------------+

Change-Id: I53df127bfc3e43288c6afecdf872e6101b94a658
Closes-Bug: #1608903
2016-08-05 10:05:58 +08:00
Jenkins
d6413b2765 Merge "Add support of setting volume's state" 2016-08-05 00:30:25 +00:00
Huanxuan Ao
f58be9d4dd Add unit tests for group commands in identity v3
Add unit tests for commands below in identity v3:
group create
group delete
group show
group set
group add user
group remove user
group contains user

Change-Id: I02f3b49e93582245a2749492bba1dfc4c5e0258d
2016-08-04 19:30:02 +08:00
Jenkins
a42664ccaa Merge "Implement "network rbac set" command" 2016-08-03 12:54:03 +00:00
Xi Yang
20ae54045c Add support of setting volume's state
OSC does not support to set volume's state, this
patch is going to add this functionality.

Closes-Bug:#1535213
Change-Id: I5bc1c7e81b8ba61c37f4bfd209fc86c5857fb050
Co-Authored-By: Huanxuan Ao <huanxuan.ao@easystack.cn>
2016-08-03 12:19:16 +08:00
Huanxuan Ao
fac3214581 Implement "network rbac set" command
Add "network rbac set" command which just supports
setting a target project.
Also, This patch adds the doc, unit test and functional test.
But there is a bug of showing network RBAC
https://bugs.launchpad.net/python-openstacksdk/+bug/1608903
We need to skip the functional test before this bug fixed.

Change-Id: I756f448bb333cf1098a735e57a1c5dc4edf195d4
Partially-Implements: blueprint neutron-client-rbac
2016-08-03 10:49:57 +08:00
Huanxuan Ao
5125b6f73b Refactor identity v3 unit tests with fake class
Refactor unit tests in identity v3 for "user", "endpoint", "group"
and "service" with fake classes.

Change-Id: I57316bbf762c805f8e9ae225b394bbe58ebdd416
Partially-Implements: blueprint refactor-identity-unit-test
2016-08-02 12:36:15 +08:00
Jenkins
fe650e204b Merge "Implement network rbac create and delete commands" 2016-07-29 15:47:07 +00:00
Jenkins
b7b140df06 Merge "Pass security group id to novaclient while adding security group to server" 2016-07-29 13:21:20 +00:00
Rajasi Kulkarni
e26eecc12f Pass security group id to novaclient while adding security
group to server

In AddServerSecurityGroup, we currently pass the security group
name to novaclient. If multiple security groups with same name
exist, then even while passing secuity group using id to
command 'openstack server add security group <server> <group>'
it results in error 'Multiple security_group matches found'.
Added unit test case to test the command.

Change-Id: I6097eb36e1545c85209cfd767c477e10f82c6999
Closes-Bug: 1604076
2016-07-28 21:39:02 +05:30
Jenkins
3d53ae828b Merge "Allow setting quotas for server groups and server group members" 2016-07-28 13:12:07 +00:00
Huanxuan Ao
13bc3793e0 Implement network rbac create and delete commands
Add "network rbac create" and "network rbac delete" commands
and also add unit tests, functional tests, docs and release
note for them.

Change-Id: I5fd58342f2deaa9bae7717412a942a21bbd7d045
Partially-Implements: blueprint neutron-client-rbac
2016-07-28 10:23:29 +08:00
Jenkins
5f6257206e Merge "Add support for deleting volumes with associated snapshots" 2016-07-27 19:50:21 +00:00