Added new 3-part image tests to test_suite_builder.py and documented them

in IntegrationTests.rst.

JIRA: SNAPS-32

Change-Id: I20b3917840b5caf26f1a12caf0231f5f0801999d
Signed-off-by: spisarski <s.pisarski@cablelabs.com>

2 files changed, 30 insertions, 2 deletions

diff --git a/docs/how-to-use/IntegrationTests.rst b/docs/how-to-use/IntegrationTests.rst
index 983c165..16f2a1c 100644
--- a/docs/how-to-use/IntegrationTests.rst
+++ b/docs/how-to-use/IntegrationTests.rst
@@ -86,6 +86,19 @@ create_image_tests.py - CreateImageNegativeTests
 |                                       |               | being raised when the credentials user is None            |
 +---------------------------------------+---------------+-----------------------------------------------------------+
 
+create_image_tests.py - CreateMultiPartImageTests
+-------------------------------------------------
+
++----------------------------------------+---------------+-----------------------------------------------------------+
+| Test Name                              | Glance API    | Description                                               |
++========================================+===============+===========================================================+
+| test_create_three_part_image_from_url  | 1             | Ensures that a 3-part image can be created when each part |
+|                                        |               | is being sourced from URLs                                |
++----------------------------------------+---------------+-----------------------------------------------------------+
+| test_create_three_part_image_from_file | 1             | Ensures that a 3-part image can be created when each part |
+|                                        |               | is being sourced from local files                         |
++----------------------------------------+---------------+-----------------------------------------------------------+
+
 create_keypairs_tests.py - CreateKeypairsTests
 ----------------------------------------------
 
@@ -243,6 +256,16 @@ create_instance_tests.py - CreateInstanceOnComputeHost
 |                                       | Neutron 2     | active compute node                                       |
 +---------------------------------------+---------------+-----------------------------------------------------------+
 
+create_instance_tests.py - CreateInstanceFromThreePartImage
+-----------------------------------------------------------
+
++-----------------------------------------------------+---------------+-----------------------------------------------------------+
+| Test Name                                           | API Versions  | Description                                               |
++=====================================================+===============+===========================================================+
+| test_create_delete_instance_from_three_part_image   | Nova 2        | Tests to ensure that one can fire up an instance then     |
+|                                                     | Neutron 2     | delete it when using a 3-part image                       |
++-----------------------------------------------------+---------------+-----------------------------------------------------------+
+
 create_instance_tests.py - CreateInstancePubPrivNetTests
 --------------------------------------------------------
 
diff --git a/snaps/test_suite_builder.py b/snaps/test_suite_builder.py
index 32e0e35..6f26db8 100644
--- a/snaps/test_suite_builder.py
+++ b/snaps/test_suite_builder.py
@@ -28,7 +28,7 @@ from snaps.openstack.utils.tests.keystone_utils_tests import KeystoneSmokeTests,
 from snaps.openstack.utils.tests.neutron_utils_tests import NeutronSmokeTests, NeutronUtilsNetworkTests, \
     NeutronUtilsSubnetTests, NeutronUtilsRouterTests, NeutronUtilsSecurityGroupTests
 from snaps.openstack.tests.create_image_tests import CreateImageSuccessTests, CreateImageNegativeTests, \
-    ImageSettingsUnitTests
+    ImageSettingsUnitTests, CreateMultiPartImageTests
 from snaps.openstack.tests.create_keypairs_tests import CreateKeypairsTests, KeypairSettingsUnitTests
 from snaps.openstack.tests.create_network_tests import CreateNetworkSuccessTests, NetworkSettingsUnitTests, \
     PortSettingsUnitTests, SubnetSettingsUnitTests, CreateNetworkTypeTests
@@ -36,7 +36,7 @@ from snaps.openstack.tests.create_router_tests import CreateRouterSuccessTests,
 from snaps.openstack.tests.create_instance_tests import CreateInstanceSingleNetworkTests, \
     CreateInstancePubPrivNetTests, CreateInstanceOnComputeHost, CreateInstanceSimpleTests, \
     FloatingIpSettingsUnitTests, InstanceSecurityGroupTests, VmInstanceSettingsUnitTests, \
-    CreateInstancePortManipulationTests, SimpleHealthCheck
+    CreateInstancePortManipulationTests, SimpleHealthCheck, CreateInstanceFromThreePartImage
 from snaps.provisioning.tests.ansible_utils_tests import AnsibleProvisioningTests
 from snaps.openstack.tests.os_source_file_test import OSComponentTestCase, OSIntegrationTestCase
 from snaps.openstack.utils.tests.nova_utils_tests import NovaSmokeTests, NovaUtilsKeypairTests, NovaUtilsFlavorTests
@@ -162,6 +162,9 @@ def add_openstack_integration_tests(suite, source_filename, ext_net_name, proxy_
     suite.addTest(OSIntegrationTestCase.parameterize(CreateImageNegativeTests, source_filename, ext_net_name,
                                                      http_proxy_str=proxy_settings, use_keystone=use_keystone,
                                                      log_level=log_level))
+    suite.addTest(OSIntegrationTestCase.parameterize(CreateMultiPartImageTests, source_filename, ext_net_name,
+                                                     http_proxy_str=proxy_settings, use_keystone=use_keystone,
+                                                     log_level=log_level))
     suite.addTest(OSIntegrationTestCase.parameterize(CreateKeypairsTests, source_filename, ext_net_name,
                                                      http_proxy_str=proxy_settings, use_keystone=use_keystone,
                                                      log_level=log_level))
@@ -192,6 +195,8 @@ def add_openstack_integration_tests(suite, source_filename, ext_net_name, proxy_
                                                      log_level=log_level))
     suite.addTest(OSComponentTestCase.parameterize(CreateInstanceOnComputeHost, source_filename, ext_net_name,
                                                    http_proxy_str=proxy_settings, log_level=log_level))
+    suite.addTest(OSComponentTestCase.parameterize(CreateInstanceFromThreePartImage, source_filename, ext_net_name,
+                                                   http_proxy_str=proxy_settings, log_level=log_level))
 
     if use_floating_ips:
         suite.addTest(OSIntegrationTestCase.parameterize(CreateInstanceSingleNetworkTests, source_filename,