summaryrefslogtreecommitdiffstats
path: root/snaps/test_suite_builder.py
diff options
context:
space:
mode:
authorspisarski <s.pisarski@cablelabs.com>2017-07-24 15:15:51 -0600
committerspisarski <s.pisarski@cablelabs.com>2017-07-24 15:15:51 -0600
commit59f7b5d1da435d64f10bd526c9dfd50007730766 (patch)
tree89ef07bfb8087019b5b16e4262dddcf1ae88c84e /snaps/test_suite_builder.py
parentfeae63d11f8295a0d9327496f42949ad5b67fca4 (diff)
Added keypair config for key file deletion.
Added KeypairSetting attribute named 'delete_on_clean' which is used to override the keypair creator's logic for deleting its associated public/private key files. JIRA: SNAPS-105 Change-Id: I337db99daa6bf7d4b42e8729a92a4baef5c73140 Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'snaps/test_suite_builder.py')
-rw-r--r--snaps/test_suite_builder.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/snaps/test_suite_builder.py b/snaps/test_suite_builder.py
index e40aaa9..24c3e65 100644
--- a/snaps/test_suite_builder.py
+++ b/snaps/test_suite_builder.py
@@ -44,7 +44,7 @@ from snaps.openstack.tests.create_instance_tests import (
SimpleHealthCheck, CreateInstanceFromThreePartImage,
CreateInstanceMockOfflineTests)
from snaps.openstack.tests.create_keypairs_tests import (
- CreateKeypairsTests, KeypairSettingsUnitTests)
+ CreateKeypairsTests, KeypairSettingsUnitTests, CreateKeypairsCleanupTests)
from snaps.openstack.tests.create_network_tests import (
CreateNetworkSuccessTests, NetworkSettingsUnitTests, PortSettingsUnitTests,
SubnetSettingsUnitTests, CreateNetworkTypeTests)
@@ -324,6 +324,11 @@ def add_openstack_integration_tests(suite, os_creds, ext_net_name,
flavor_metadata=flavor_metadata, image_metadata=image_metadata,
log_level=log_level))
suite.addTest(OSIntegrationTestCase.parameterize(
+ CreateKeypairsCleanupTests, os_creds=os_creds, ext_net_name=ext_net_name,
+ use_keystone=use_keystone,
+ flavor_metadata=flavor_metadata, image_metadata=image_metadata,
+ log_level=log_level))
+ suite.addTest(OSIntegrationTestCase.parameterize(
CreateNetworkSuccessTests, os_creds=os_creds,
ext_net_name=ext_net_name, use_keystone=use_keystone,
flavor_metadata=flavor_metadata, image_metadata=image_metadata,