summaryrefslogtreecommitdiff
path: root/functional/tests/identity
diff options
context:
space:
mode:
authorsunyajing <yajing.sun@easystack.cn>2016-06-23 12:55:54 +0800
committerSteve Martinelli <s.martinelli@gmail.com>2016-06-23 23:57:49 -0400
commit6df09fd377f872388d4f855b001a6578ae6fba46 (patch)
treedf8bba22d73bf72444a184433fb41c084e26bd0a /functional/tests/identity
parent5b144334bf526c8d368e592019fbb80c072911dc (diff)
downloadpython-openstackclient-6df09fd377f872388d4f855b001a6578ae6fba46.tar.gz
Support multi-delete for commands in identity V2
Commands are "ec2 credentials delete", "service delete", "endpoint delete". Also update their unit tests and functional tests. Partial-Bug: #1592906 Change-Id: I1a0b7160b803a523646d09d030e6f112c81c4c24
Diffstat (limited to 'functional/tests/identity')
-rw-r--r--functional/tests/identity/v2/test_ec2_credentials.py8
-rw-r--r--functional/tests/identity/v2/test_endpoint.py7
-rw-r--r--functional/tests/identity/v2/test_service.py7
3 files changed, 22 insertions, 0 deletions
diff --git a/functional/tests/identity/v2/test_ec2_credentials.py b/functional/tests/identity/v2/test_ec2_credentials.py
index 319bd11a..7a8ee35d 100644
--- a/functional/tests/identity/v2/test_ec2_credentials.py
+++ b/functional/tests/identity/v2/test_ec2_credentials.py
@@ -25,6 +25,14 @@ class EC2CredentialsTests(common.IdentityTests):
)
self.assertEqual(0, len(raw_output))
+ def test_ec2_credentials_multi_delete(self):
+ access_key_1 = self._create_dummy_ec2_credentials(add_clean_up=False)
+ access_key_2 = self._create_dummy_ec2_credentials(add_clean_up=False)
+ raw_output = self.openstack(
+ 'ec2 credentials delete ' + access_key_1 + ' ' + access_key_2
+ )
+ self.assertEqual(0, len(raw_output))
+
def test_ec2_credentials_list(self):
self._create_dummy_ec2_credentials()
raw_output = self.openstack('ec2 credentials list')
diff --git a/functional/tests/identity/v2/test_endpoint.py b/functional/tests/identity/v2/test_endpoint.py
index 0682e6b4..34888c0b 100644
--- a/functional/tests/identity/v2/test_endpoint.py
+++ b/functional/tests/identity/v2/test_endpoint.py
@@ -24,6 +24,13 @@ class EndpointTests(common.IdentityTests):
'endpoint delete %s' % endpoint_id)
self.assertEqual(0, len(raw_output))
+ def test_endpoint_multi_delete(self):
+ endpoint_id_1 = self._create_dummy_endpoint(add_clean_up=False)
+ endpoint_id_2 = self._create_dummy_endpoint(add_clean_up=False)
+ raw_output = self.openstack(
+ 'endpoint delete ' + endpoint_id_1 + ' ' + endpoint_id_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/v2/test_service.py b/functional/tests/identity/v2/test_service.py
index 219ed33f..9dcb6bea 100644
--- a/functional/tests/identity/v2/test_service.py
+++ b/functional/tests/identity/v2/test_service.py
@@ -23,6 +23,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_name_1 = self._create_dummy_service(add_clean_up=False)
+ service_name_2 = self._create_dummy_service(add_clean_up=False)
+ raw_output = self.openstack(
+ 'service delete ' + service_name_1 + ' ' + service_name_2)
+ self.assertEqual(0, len(raw_output))
+
def test_service_list(self):
self._create_dummy_service()
raw_output = self.openstack('service list')