summaryrefslogtreecommitdiff
path: root/functional
diff options
context:
space:
mode:
authorHuanxuan Ao <huanxuan.ao@easystack.cn>2016-07-12 12:44:55 +0800
committerHuanxuan Ao <huanxuan.ao@easystack.cn>2016-07-19 09:49:36 +0800
commit60639d76a742852e18f9e2889c480be95596c268 (patch)
treecad7069ec7b4175f9ceea7e14113b9477698f1e8 /functional
parent55c1c575d63f4e9e6fc3f4dbb6c572e841b513d9 (diff)
downloadpython-openstackclient-60639d76a742852e18f9e2889c480be95596c268.tar.gz
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
Diffstat (limited to 'functional')
-rw-r--r--functional/tests/identity/v3/test_domain.py12
-rw-r--r--functional/tests/identity/v3/test_endpoint.py7
-rw-r--r--functional/tests/identity/v3/test_idp.py7
-rw-r--r--functional/tests/identity/v3/test_region.py7
-rw-r--r--functional/tests/identity/v3/test_service.py7
-rw-r--r--functional/tests/identity/v3/test_service_provider.py7
6 files changed, 47 insertions, 0 deletions
diff --git a/functional/tests/identity/v3/test_domain.py b/functional/tests/identity/v3/test_domain.py
index 305ed58d..3f514b58 100644
--- a/functional/tests/identity/v3/test_domain.py
+++ b/functional/tests/identity/v3/test_domain.py
@@ -43,6 +43,18 @@ class DomainTests(common.IdentityTests):
raw_output = self.openstack('domain delete %s' % domain_name)
self.assertEqual(0, len(raw_output))
+ def test_domain_multi_delete(self):
+ domain_1 = self._create_dummy_domain(add_clean_up=False)
+ domain_2 = self._create_dummy_domain(add_clean_up=False)
+ # cannot delete enabled domain, disable it first
+ raw_output = self.openstack('domain set --disable %s' % domain_1)
+ self.assertEqual(0, len(raw_output))
+ raw_output = self.openstack('domain set --disable %s' % domain_2)
+ self.assertEqual(0, len(raw_output))
+ raw_output = self.openstack(
+ 'domain delete %s %s' % (domain_1, domain_2))
+ self.assertEqual(0, len(raw_output))
+
def test_domain_delete_failure(self):
domain_name = self._create_dummy_domain()
# cannot delete enabled domain
diff --git a/functional/tests/identity/v3/test_endpoint.py b/functional/tests/identity/v3/test_endpoint.py
index 162c9e58..e0afab23 100644
--- a/functional/tests/identity/v3/test_endpoint.py
+++ b/functional/tests/identity/v3/test_endpoint.py
@@ -28,6 +28,13 @@ class EndpointTests(common.IdentityTests):
'endpoint delete %s' % endpoint_id)
self.assertEqual(0, len(raw_output))
+ def test_endpoint_multi_delete(self):
+ endpoint_1 = self._create_dummy_endpoint(add_clean_up=False)
+ endpoint_2 = self._create_dummy_endpoint(add_clean_up=False)
+ raw_output = self.openstack(
+ 'endpoint delete %s %s' % (endpoint_1, endpoint_2))
+ self.assertEqual(0, len(raw_output))
+
def test_endpoint_list(self):
endpoint_id = self._create_dummy_endpoint()
raw_output = self.openstack('endpoint list')
diff --git a/functional/tests/identity/v3/test_idp.py b/functional/tests/identity/v3/test_idp.py
index 8d864712..bc9690f7 100644
--- a/functional/tests/identity/v3/test_idp.py
+++ b/functional/tests/identity/v3/test_idp.py
@@ -26,6 +26,13 @@ class IdentityProviderTests(common.IdentityTests):
% identity_provider)
self.assertEqual(0, len(raw_output))
+ def test_idp_multi_delete(self):
+ idp_1 = self._create_dummy_idp(add_clean_up=False)
+ idp_2 = self._create_dummy_idp(add_clean_up=False)
+ raw_output = self.openstack(
+ 'identity provider delete %s %s' % (idp_1, idp_2))
+ self.assertEqual(0, len(raw_output))
+
def test_idp_show(self):
identity_provider = self._create_dummy_idp(add_clean_up=True)
raw_output = self.openstack('identity provider show %s'
diff --git a/functional/tests/identity/v3/test_region.py b/functional/tests/identity/v3/test_region.py
index 5ba0c231..2ebc0e59 100644
--- a/functional/tests/identity/v3/test_region.py
+++ b/functional/tests/identity/v3/test_region.py
@@ -27,6 +27,13 @@ class RegionTests(common.IdentityTests):
raw_output = self.openstack('region delete %s' % region_id)
self.assertEqual(0, len(raw_output))
+ def test_region_multi_delete(self):
+ region_1 = self._create_dummy_region(add_clean_up=False)
+ region_2 = self._create_dummy_region(add_clean_up=False)
+ raw_output = self.openstack(
+ 'region delete %s %s' % (region_1, region_2))
+ self.assertEqual(0, len(raw_output))
+
def test_region_list(self):
raw_output = self.openstack('region list')
items = self.parse_listing(raw_output)
diff --git a/functional/tests/identity/v3/test_service.py b/functional/tests/identity/v3/test_service.py
index c757d914..79a63dc8 100644
--- a/functional/tests/identity/v3/test_service.py
+++ b/functional/tests/identity/v3/test_service.py
@@ -25,6 +25,13 @@ class ServiceTests(common.IdentityTests):
raw_output = self.openstack('service delete %s' % service_name)
self.assertEqual(0, len(raw_output))
+ def test_service_multi_delete(self):
+ service_1 = self._create_dummy_service(add_clean_up=False)
+ service_2 = self._create_dummy_service(add_clean_up=False)
+ raw_output = self.openstack(
+ 'service delete %s %s' % (service_1, service_2))
+ self.assertEqual(0, len(raw_output))
+
def test_service_list(self):
self._create_dummy_service()
raw_output = self.openstack('service list')
diff --git a/functional/tests/identity/v3/test_service_provider.py b/functional/tests/identity/v3/test_service_provider.py
index 6cfa7e56..458c2ae6 100644
--- a/functional/tests/identity/v3/test_service_provider.py
+++ b/functional/tests/identity/v3/test_service_provider.py
@@ -26,6 +26,13 @@ class ServiceProviderTests(common.IdentityTests):
% service_provider)
self.assertEqual(0, len(raw_output))
+ def test_sp_multi_delete(self):
+ sp1 = self._create_dummy_sp(add_clean_up=False)
+ sp2 = self._create_dummy_sp(add_clean_up=False)
+ raw_output = self.openstack(
+ 'service provider delete %s %s' % (sp1, sp2))
+ self.assertEqual(0, len(raw_output))
+
def test_sp_show(self):
service_provider = self._create_dummy_sp(add_clean_up=True)
raw_output = self.openstack('service provider show %s'