Skip to content

Commit 60639d7

Browse files
author
Huanxuan Ao
committed
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
1 parent 55c1c57 commit 60639d7

36 files changed

Lines changed: 361 additions & 82 deletions

doc/source/command-objects/consumer.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ Create new consumer
2424
consumer delete
2525
---------------
2626

27-
Delete consumer
27+
Delete consumer(s)
2828

2929
.. program:: consumer delete
3030
.. code:: bash
3131
3232
os consumer delete
33-
<consumer>
33+
<consumer> [<consumer> ...]
3434
3535
.. describe:: <consumer>
3636

37-
Consumer to delete
37+
Consumer(s) to delete
3838

3939
consumer list
4040
-------------

doc/source/command-objects/domain.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,17 @@ Create new domain
4343
domain delete
4444
-------------
4545

46-
Delete domain
46+
Delete domain(s)
4747

4848
.. program:: domain delete
4949
.. code:: bash
5050
5151
os domain delete
52-
<domain>
52+
<domain> [<domain> ...]
5353
5454
.. describe:: <domain>
5555

56-
Domain to delete (name or ID)
56+
Domain(s) to delete (name or ID)
5757

5858
domain list
5959
-----------

doc/source/command-objects/federation-protocol.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,22 @@ Create new federation protocol
3434
federation protocol delete
3535
--------------------------
3636

37-
Delete federation protocol
37+
Delete federation protocol(s)
3838

3939
.. program:: federation protocol delete
4040
.. code:: bash
4141
4242
os federation protocol delete
4343
--identity-provider <identity-provider>
44-
<federation-protocol>
44+
<federation-protocol> [<federation-protocol> ...]
4545
4646
.. option:: --identity-provider <identity-provider>
4747

4848
Identity provider that supports <federation-protocol> (name or ID) (required)
4949

5050
.. describe:: <federation-protocol>
5151

52-
Federation protocol to delete (name or ID)
52+
Federation protocol(s) to delete (name or ID)
5353

5454
federation protocol list
5555
------------------------

doc/source/command-objects/identity-provider.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,17 @@ Create new identity provider
4949
identity provider delete
5050
------------------------
5151

52-
Delete identity provider
52+
Delete identity provider(s)
5353

5454
.. program:: identity provider delete
5555
.. code:: bash
5656
5757
os identity provider delete
58-
<identity-provider>
58+
<identity-provider> [<identity-provider> ...]
5959
6060
.. describe:: <identity-provider>
6161

62-
Identity provider to delete
62+
Identity provider(s) to delete
6363

6464
identity provider list
6565
----------------------

doc/source/command-objects/mapping.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@ Create new mapping
3030
mapping delete
3131
--------------
3232

33-
Delete mapping
33+
Delete mapping(s)
3434

3535
.. program:: mapping delete
3636
.. code:: bash
3737
3838
os mapping delete
39-
<mapping>
39+
<mapping> [<mapping> ...]
4040
4141
.. _mapping_delete-mapping:
4242
.. describe:: <mapping>
4343

44-
Mapping to delete
44+
Mapping(s) to delete
4545

4646
mapping list
4747
------------

doc/source/command-objects/policy.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@ Create new policy
2727
policy delete
2828
-------------
2929

30-
Delete policy
30+
Delete policy(s)
3131

3232
.. program:: policy delete
3333
.. code:: bash
3434
3535
os policy delete
36-
<policy>
36+
<policy> [<policy> ...]
3737
3838
.. describe:: <policy>
3939

40-
Policy to delete
40+
Policy(s) to delete
4141

4242
policy list
4343
-----------

doc/source/command-objects/region.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@ Create new region
3333
region delete
3434
-------------
3535

36-
Delete region
36+
Delete region(s)
3737

3838
.. program:: region delete
3939
.. code:: bash
4040
4141
os region delete
42-
<region-id>
42+
<region-id> [<region-id> ...]
4343
4444
.. _region_delete-region-id:
4545
.. describe:: <region-id>
4646

47-
Region ID to delete
47+
Region ID(s) to delete
4848

4949
region list
5050
-----------

doc/source/command-objects/service-provider.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,17 @@ Create new service provider
4848
service provider delete
4949
-----------------------
5050

51-
Delete service provider
51+
Delete service provider(s)
5252

5353
.. program:: service provider delete
5454
.. code:: bash
5555
5656
os service provider delete
57-
<service-provider>
57+
<service-provider> [<service-provider> ...]
5858
5959
.. describe:: <service-provider>
6060

61-
Service provider to delete
61+
Service provider(s) to delete
6262

6363
service provider list
6464
---------------------

functional/tests/identity/v3/test_domain.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,18 @@ def test_domain_delete(self):
4343
raw_output = self.openstack('domain delete %s' % domain_name)
4444
self.assertEqual(0, len(raw_output))
4545

46+
def test_domain_multi_delete(self):
47+
domain_1 = self._create_dummy_domain(add_clean_up=False)
48+
domain_2 = self._create_dummy_domain(add_clean_up=False)
49+
# cannot delete enabled domain, disable it first
50+
raw_output = self.openstack('domain set --disable %s' % domain_1)
51+
self.assertEqual(0, len(raw_output))
52+
raw_output = self.openstack('domain set --disable %s' % domain_2)
53+
self.assertEqual(0, len(raw_output))
54+
raw_output = self.openstack(
55+
'domain delete %s %s' % (domain_1, domain_2))
56+
self.assertEqual(0, len(raw_output))
57+
4658
def test_domain_delete_failure(self):
4759
domain_name = self._create_dummy_domain()
4860
# cannot delete enabled domain

functional/tests/identity/v3/test_endpoint.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@ def test_endpoint_delete(self):
2828
'endpoint delete %s' % endpoint_id)
2929
self.assertEqual(0, len(raw_output))
3030

31+
def test_endpoint_multi_delete(self):
32+
endpoint_1 = self._create_dummy_endpoint(add_clean_up=False)
33+
endpoint_2 = self._create_dummy_endpoint(add_clean_up=False)
34+
raw_output = self.openstack(
35+
'endpoint delete %s %s' % (endpoint_1, endpoint_2))
36+
self.assertEqual(0, len(raw_output))
37+
3138
def test_endpoint_list(self):
3239
endpoint_id = self._create_dummy_endpoint()
3340
raw_output = self.openstack('endpoint list')

0 commit comments

Comments
 (0)