X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=snaps%2Ftest_suite_builder.py;h=1990cd6a829fa6390c34e0c0bfdbbb8c3293eccb;hb=125a7061b19afdd3c2e4f0e463e85572dfb3783d;hp=235bb91d89fa6e2c4406b953c7afb09601352938;hpb=2e8f0c27a1a9e16778f83dba7ca9489664bd92f2;p=snaps.git diff --git a/snaps/test_suite_builder.py b/snaps/test_suite_builder.py index 235bb91..1990cd6 100644 --- a/snaps/test_suite_builder.py +++ b/snaps/test_suite_builder.py @@ -16,11 +16,26 @@ import logging import unittest +from snaps.config.tests.cluster_template_tests import ( + ClusterTemplateConfigUnitTests) +from snaps.config.tests.network_tests import ( + NetworkConfigUnitTests, SubnetConfigUnitTests, PortConfigUnitTests) +from snaps.config.tests.security_group_tests import ( + SecurityGroupConfigUnitTests, SecurityGroupRuleConfigUnitTests) +from snaps.config.tests.vm_inst_tests import ( + VmInstanceConfigUnitTests, FloatingIpConfigUnitTests) +from snaps.config.tests.volume_tests import VolumeConfigUnitTests +from snaps.config.tests.volume_type_tests import VolumeTypeConfigUnitTests +from snaps.config.tests.qos_tests import QoSConfigUnitTests +from snaps.config.tests.stack_tests import StackConfigUnitTests +from snaps.config.tests.router_tests import RouterConfigUnitTests +from snaps.config.tests.user_tests import UserConfigUnitTests from snaps.config.tests.project_tests import ProjectConfigUnitTests from snaps.config.tests.keypair_tests import KeypairConfigUnitTests from snaps.config.tests.flavor_tests import FlavorConfigUnitTests import snaps.config.tests.image_tests as image_tests import snaps.openstack.tests.create_image_tests as creator_tests +from snaps.domain.test.cluster_template_tests import ClusterTemplateUnitTests from snaps.domain.test.flavor_tests import FlavorDomainObjectTests from snaps.domain.test.image_tests import ImageDomainObjectTests from snaps.domain.test.keypair_tests import KeypairDomainObjectTests @@ -40,6 +55,8 @@ from snaps.domain.test.vm_inst_tests import ( from snaps.domain.test.volume_tests import ( QoSSpecDomainObjectTests, VolumeTypeDomainObjectTests, VolumeTypeEncryptionObjectTests, VolumeDomainObjectTests) +from snaps.openstack.tests.cluster_template_tests import ( + CreateClusterTemplateTests) from snaps.openstack.tests.conf.os_credentials_tests import ( ProxySettingsUnitTests, OSCredsUnitTests) from snaps.openstack.tests.create_flavor_tests import ( @@ -48,13 +65,13 @@ from snaps.openstack.tests.create_image_tests import ( CreateImageSuccessTests, CreateImageNegativeTests, CreateMultiPartImageTests) from snaps.openstack.tests.create_instance_tests import ( - CreateInstanceSingleNetworkTests, CreateInstancePubPrivNetTests, - CreateInstanceOnComputeHost, CreateInstanceSimpleTests, - FloatingIpSettingsUnitTests, InstanceSecurityGroupTests, - VmInstanceSettingsUnitTests, CreateInstancePortManipulationTests, - SimpleHealthCheck, CreateInstanceFromThreePartImage, - CreateInstanceMockOfflineTests, CreateInstanceTwoNetTests, - CreateInstanceVolumeTests, CreateInstanceIPv6NetworkTests) + CreateInstanceSingleNetworkTests, CreateInstanceOnComputeHost, + CreateInstanceSimpleTests, FloatingIpSettingsUnitTests, + InstanceSecurityGroupTests, VmInstanceSettingsUnitTests, + CreateInstancePortManipulationTests, SimpleHealthCheck, + CreateInstanceFromThreePartImage, CreateInstanceMockOfflineTests, + CreateInstanceTwoNetTests, CreateInstanceVolumeTests, + CreateInstanceIPv6NetworkTests) from snaps.openstack.tests.create_keypairs_tests import ( CreateKeypairsTests, KeypairSettingsUnitTests, CreateKeypairsCleanupTests) from snaps.openstack.tests.create_network_tests import ( @@ -109,7 +126,7 @@ from snaps.openstack.utils.tests.nova_utils_tests import ( from snaps.openstack.utils.tests.settings_utils_tests import ( SettingsUtilsUnitTests) from snaps.openstack.utils.tests.magnum_utils_tests import ( - MagnumSmokeTests) + MagnumSmokeTests, MagnumUtilsClusterTypeTests) from snaps.provisioning.tests.ansible_utils_tests import ( AnsibleProvisioningTests) from snaps.tests.file_utils_tests import FileUtilsTests @@ -124,14 +141,18 @@ def add_unit_tests(suite): :return: None as the tests will be adding to the 'suite' parameter object """ suite.addTest(unittest.TestLoader().loadTestsFromTestCase(FileUtilsTests)) - suite.addTest(unittest.TestLoader().loadTestsFromTestCase( - SecurityGroupRuleSettingsUnitTests)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase( ProxySettingsUnitTests)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase( OSCredsUnitTests)) + suite.addTest(unittest.TestLoader().loadTestsFromTestCase( + SecurityGroupConfigUnitTests)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase( SecurityGroupSettingsUnitTests)) + suite.addTest(unittest.TestLoader().loadTestsFromTestCase( + SecurityGroupRuleConfigUnitTests)) + suite.addTest(unittest.TestLoader().loadTestsFromTestCase( + SecurityGroupRuleSettingsUnitTests)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase( SecurityGroupDomainObjectTests)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase( @@ -154,6 +175,8 @@ def add_unit_tests(suite): KeypairSettingsUnitTests)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase( KeypairDomainObjectTests)) + suite.addTest(unittest.TestLoader().loadTestsFromTestCase( + UserConfigUnitTests)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase( UserSettingsUnitTests)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase( @@ -172,32 +195,46 @@ def add_unit_tests(suite): NetworkQuotasDomainObjectTests)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase( RoleDomainObjectTests)) + suite.addTest(unittest.TestLoader().loadTestsFromTestCase( + NetworkConfigUnitTests)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase( NetworkSettingsUnitTests)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase( NetworkObjectTests)) + suite.addTest(unittest.TestLoader().loadTestsFromTestCase( + SubnetConfigUnitTests)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase( SubnetSettingsUnitTests)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase( SubnetObjectTests)) + suite.addTest(unittest.TestLoader().loadTestsFromTestCase( + PortConfigUnitTests)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase( PortSettingsUnitTests)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase( PortDomainObjectTests)) + suite.addTest(unittest.TestLoader().loadTestsFromTestCase( + RouterConfigUnitTests)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase( RouterSettingsUnitTests)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase( RouterDomainObjectTests)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase( InterfaceRouterDomainObjectTests)) + suite.addTest(unittest.TestLoader().loadTestsFromTestCase( + FloatingIpConfigUnitTests)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase( FloatingIpSettingsUnitTests)) + suite.addTest(unittest.TestLoader().loadTestsFromTestCase( + VmInstanceConfigUnitTests)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase( VmInstanceSettingsUnitTests)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase( StackDomainObjectTests)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase( ResourceDomainObjectTests)) + suite.addTest(unittest.TestLoader().loadTestsFromTestCase( + StackConfigUnitTests)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase( StackSettingsUnitTests)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase( @@ -212,12 +249,22 @@ def add_unit_tests(suite): VmInstDomainObjectTests)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase( FloatingIpDomainObjectTests)) + suite.addTest(unittest.TestLoader().loadTestsFromTestCase( + QoSConfigUnitTests)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase( QoSSettingsUnitTests)) + suite.addTest(unittest.TestLoader().loadTestsFromTestCase( + VolumeTypeConfigUnitTests)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase( VolumeTypeSettingsUnitTests)) + suite.addTest(unittest.TestLoader().loadTestsFromTestCase( + VolumeConfigUnitTests)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase( VolumeSettingsUnitTests)) + suite.addTest(unittest.TestLoader().loadTestsFromTestCase( + ClusterTemplateConfigUnitTests)) + suite.addTest(unittest.TestLoader().loadTestsFromTestCase( + ClusterTemplateUnitTests)) suite.addTest(unittest.TestLoader().loadTestsFromTestCase( SettingsUtilsUnitTests)) @@ -358,6 +405,10 @@ def add_openstack_api_tests(suite, os_creds, ext_net_name, use_keystone=True, HeatUtilsSecurityGroupTests, os_creds=os_creds, ext_net_name=ext_net_name, log_level=log_level, image_metadata=image_metadata)) + suite.addTest(OSComponentTestCase.parameterize( + HeatUtilsVolumeTests, os_creds=os_creds, + ext_net_name=ext_net_name, log_level=log_level, + image_metadata=image_metadata)) suite.addTest(OSComponentTestCase.parameterize( CinderUtilsQoSTests, os_creds=os_creds, ext_net_name=ext_net_name, log_level=log_level, @@ -539,6 +590,11 @@ def add_openstack_integration_tests(suite, os_creds, ext_net_name, 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( + CreateInstanceIPv6NetworkTests, 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( CreateStackSuccessTests, os_creds=os_creds, ext_net_name=ext_net_name, use_keystone=use_keystone, @@ -666,15 +722,12 @@ def add_openstack_staging_tests(suite, os_creds, ext_net_name, suite.addTest(OSComponentTestCase.parameterize( CreateInstanceMockOfflineTests, os_creds=os_creds, ext_net_name=ext_net_name, log_level=log_level)) - suite.addTest(OSIntegrationTestCase.parameterize( - CreateInstancePubPrivNetTests, os_creds=os_creds, - ext_net_name=ext_net_name, log_level=log_level)) - suite.addTest(OSIntegrationTestCase.parameterize( - CreateInstanceIPv6NetworkTests, os_creds=os_creds, + suite.addTest(OSComponentTestCase.parameterize( + MagnumSmokeTests, os_creds=os_creds, ext_net_name=ext_net_name, log_level=log_level)) suite.addTest(OSComponentTestCase.parameterize( - HeatUtilsVolumeTests, os_creds=os_creds, + MagnumUtilsClusterTypeTests, os_creds=os_creds, ext_net_name=ext_net_name, log_level=log_level)) suite.addTest(OSComponentTestCase.parameterize( - MagnumSmokeTests, os_creds=os_creds, + CreateClusterTemplateTests, os_creds=os_creds, ext_net_name=ext_net_name, log_level=log_level))