diff options
author | Steven Pisarski <s.pisarski@cablelabs.com> | 2017-08-03 14:23:37 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-08-03 14:23:37 +0000 |
commit | 1d3be6637bb78b514a0dfe32a34dbc7c93ea0611 (patch) | |
tree | 8866f9d118e108e2f3e613df3bfa7d0b3e586122 /snaps/test_suite_builder.py | |
parent | 84d902632f1dd77f891c49cfb1d58af5ae051d1a (diff) | |
parent | a4f8adbb935737122b4800efbb19b9d9b75c7e01 (diff) |
Merge "Add domain name when creating projects and users"
Diffstat (limited to 'snaps/test_suite_builder.py')
-rw-r--r-- | snaps/test_suite_builder.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/snaps/test_suite_builder.py b/snaps/test_suite_builder.py index 24c3e65..cf99a5f 100644 --- a/snaps/test_suite_builder.py +++ b/snaps/test_suite_builder.py @@ -23,7 +23,8 @@ from snaps.domain.test.network_tests import ( SecurityGroupDomainObjectTests, SecurityGroupRuleDomainObjectTests, PortDomainObjectTests, RouterDomainObjectTests, InterfaceRouterDomainObjectTests, NetworkObjectTests, SubnetObjectTests) -from snaps.domain.test.project_tests import ProjectDomainObjectTests +from snaps.domain.test.project_tests import ( + ProjectDomainObjectTests, DomainDomainObjectTests) from snaps.domain.test.role_tests import RoleDomainObjectTests from snaps.domain.test.stack_tests import StackDomainObjectTests from snaps.domain.test.user_tests import UserDomainObjectTests @@ -123,6 +124,8 @@ def add_unit_tests(suite): suite.addTest(unittest.TestLoader().loadTestsFromTestCase( ProjectDomainObjectTests)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase( + DomainDomainObjectTests)) + suite.addTest(unittest.TestLoader().loadTestsFromTestCase( RoleDomainObjectTests)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase( NetworkSettingsUnitTests)) @@ -324,7 +327,8 @@ 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, + 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)) |