Automating retire bundle with multi vm test

cfme/tests/services/test_dialog_element_in_catalog.py

@@ -762,31 +762,6 @@ def test_datepicker_field_set_to_required():
     pass
 
 
-@pytest.mark.meta(coverage=[1654165])
-@pytest.mark.manual
-@pytest.mark.tier(2)
-def test_service_bundle_vms():
-    """
-
-    Bugzilla:
-        1654165
-
-    Polarion:
-        assignee: nansari
-        startsin: 5.10
-        casecomponent: Services
-        initialEstimate: 1/6h
-        testSteps:
-            1. Create Bundle, containing 2 service items, each of which will provision a single VM
-            2. Navigate to order page of service
-            3. Order the Service bundle.
-        expectedResults:
-            1.
-            2. View the Service. Both VMs should displayed, instead of the 1 VM.
-    """
-    pass
-
-
 @pytest.mark.meta(automates=[1558926])
 @pytest.mark.tier(2)
 @pytest.mark.parametrize(

cfme/tests/services/test_service_catalogs_bundles.py

@@ -0,0 +1,140 @@
+import fauxfactory
+import pytest
+from widgetastic.utils import partial_match
+
+from cfme import test_requirements
+from cfme.infrastructure.provider.virtualcenter import VMwareProvider
+from cfme.markers.env_markers.provider import ONE_PER_TYPE
+from cfme.services.myservice import MyService
+from cfme.services.service_catalogs import ServiceCatalogs
+from cfme.utils.generators import random_vm_name
+from cfme.utils.wait import wait_for
+
+
+pytestmark = [
+    pytest.mark.meta(server_roles="+automate"),
+    pytest.mark.long_running,
+    test_requirements.service,
+    pytest.mark.tier(2),
+    pytest.mark.provider([VMwareProvider], selector=ONE_PER_TYPE, scope="module"),
+]
+
+
+@pytest.fixture(scope="function")
+def catalog_item_setups(request, appliance, provider, setup_provider_modscope, provisioning,
+                        catalog, dialog):
+    """
+    This fixture is used to create two catalog items instance pointing to method
+    """
+    template, host, datastore, vlan = list(map(
+        provisioning.get, ('template', 'host', 'datastore', 'vlan'))
+    )
+    provisioning_data = {
+        'catalog': {'catalog_name': {'name': template, 'provider': provider.name},
+                    'vm_name': random_vm_name('service')},
+        'environment': {'host_name': {'name': host},
+                        'datastore_name': {'name': datastore}},
+        'network': {'vlan': partial_match(vlan)},
+    }
+    cat_list = []
+    for _ in range(2):
+
+        catalog_item = appliance.collections.catalog_items.create(
+            provider.catalog_item_type,
+            name=fauxfactory.gen_alphanumeric(15, start="cat_item_"),
+            description="my catalog",
+            display_in=True,
+            catalog=catalog,
+            dialog=dialog,
+            prov_data=provisioning_data
+        )
+
+        cat_list.append(catalog_item)
+        request.addfinalizer(catalog_item.delete_if_exists)
+
+    yield cat_list, catalog_item
+
+
+@pytest.mark.meta(automates=[1654165])
+@pytest.mark.tier(2)
+@pytest.mark.customer_scenario
+def test_retire_service_and_bundle_vms(provider, request, appliance, catalog_item_setups):
+    """
+    Bugzilla:
+        1654165
+    Polarion:
+        assignee: nansari
+        casecomponent: Services
+        initialEstimate: 1/6h
+        startsin: 5.10
+        testSteps:
+            1. Create catalog and create two catalog items
+            2. Create bundle with above two catalog items
+            3. Order the catalog bundle
+            4. Go to My services
+            5. Check the Both VMs
+            6. Retire the services
+        expectedResults:
+            1.
+            2.
+            3.
+            4.
+            5. Both VMs should be present
+            6. Services should retire and vms as well
+    """
+    cat_list, catalog_item = catalog_item_setups
+
+    collection = provider.appliance.provider_based_collection(provider)
+    vm_name1 = f'{cat_list[0].prov_data["catalog"]["vm_name"]}0001'
+    vm_name2 = f'{cat_list[1].prov_data["catalog"]["vm_name"]}0002'
+
+    vm1 = collection.instantiate(vm_name1, provider)
+    vm2 = collection.instantiate(vm_name2, provider)
+
+    # Creating catalog bundle of two catalog items
+    catalog_bundle = appliance.collections.catalog_bundles.create(
+        name=fauxfactory.gen_alphanumeric(),
+        description="catalog_bundle",
+        display_in=True,
+        catalog=catalog_item.catalog,
+        dialog=catalog_item.dialog,
+        catalog_items=[cat_item.name for cat_item in cat_list],
+    )
+    request.addfinalizer(catalog_bundle.delete_if_exists)
+
+    # Ordering service catalog bundle
+    provision_request = ServiceCatalogs(
+        appliance, catalog_bundle.catalog, catalog_bundle.name
+    ).order()
+
+    provision_request.wait_for_request(method='ui')
+    assert provision_request.is_succeeded(method="ui")
+
+    service = MyService(appliance, catalog_item.dialog.label)
+
+    @request.addfinalizer
+    def _clear_request_service():
+        if provision_request.exists():
+            provision_request.remove_request(method="rest")
+        if service.exists:
+            service.delete()
+
+    assert service.exists
+
+    # Retire service
+    retire_request = service.retire()
+    assert retire_request.exists()
+
+    @request.addfinalizer
+    def _clear_retire_request():
+        if retire_request.exists():
+            retire_request.remove_request()
+
+    wait_for(
+        lambda: service.is_retired,
+        delay=5, num_sec=120,
+        fail_func=service.browser.refresh,
+        message="waiting for service retire"
+    )
+    assert vm1.wait_for_vm_state_change(from_any_provider=True, desired_state='archived')
+    assert vm2.wait_for_vm_state_change(from_any_provider=True, desired_state='archived')