Merge pull request #8543 from mshriver/rlbabyuk-test-map-tagging

[1LP][RFR] Tests tagging on provider side

Author: izapolsk

cfme/common/__init__.py

@@ -435,7 +435,7 @@ def get_tags(self, tenant="My Company Tags"):
             ItemNotFound: when nav destination DNE, or times out on wait (is_displayed was false)
         """
         try:
-            view = navigate_to(self, 'Details')
+            view = navigate_to(self, 'Details', force=True)
         except (NavigationDestinationNotFound, DestinationNotFound):
             raise ItemNotFound('Details page does not exist for: {}'.format(self))
         except TimedOutError:

cfme/configure/configuration/region_settings.py

@@ -388,7 +388,6 @@ class MapTag(BaseEntity, Pretty, Updateable):
             entity_type: Name of the tag
             label: Tag display name
             category: Tags Category
-
     """
     pretty_attrs = ['entity_type', 'label', 'category']
 
@@ -402,7 +401,7 @@ def update(self, updates, cancel=False):
             Args:
                 updates: tag map data that should be changed
                 cancel: True - if you want to cancel map edition,
-                        by defaul map will be updated
+                        by default map will be updated
         """
         view = navigate_to(self, 'Edit')
         # only category can be updated, as other fields disabled by default
@@ -427,7 +426,7 @@ def delete(self, cancel=False):
                         'True' - map will not be deleted
         """
         view = navigate_to(self.parent, 'All')
-        row = view.table.row(tag_category=self.category)
+        row = view.table.row(tag_category=self.category, resource_label=self.label)
         row.actions.click()
         view.browser.handle_alert(cancel=cancel)
 

cfme/tests/cloud/test_tag_mapping.py

@@ -1,16 +1,20 @@
+import fauxfactory
 import pytest
 from widgetastic.utils import partial_match
+from wrapanapi.exceptions import ImageNotFoundError
 
 from cfme import test_requirements
 from cfme.cloud.provider.azure import AzureProvider
+from cfme.cloud.provider.ec2 import EC2Provider
 from cfme.exceptions import ItemNotFound
-from cfme.markers.env_markers.provider import ONE_PER_CATEGORY
+from cfme.markers.env_markers.provider import ONE_PER_TYPE
 from cfme.utils.appliance.implementations.ui import navigate_to
+from cfme.utils.log import logger
 from cfme.utils.wait import wait_for
 
 pytestmark = [
-    pytest.mark.provider([AzureProvider], selector=ONE_PER_CATEGORY, scope='function'),
-    pytest.mark.usefixtures('setup_provider')
+    pytest.mark.provider([EC2Provider], scope='function'),
+    pytest.mark.usefixtures('setup_provider', 'refresh_provider')
 ]
 
 
@@ -24,7 +28,7 @@ def map_tags(appliance, provider, request):
 
 
 @pytest.fixture(scope='function')
-def vm(appliance, provider):
+def tagged_vm(provider):
     # cu-24x7 vm is tagged with test:testing in provider
     tag_vm = provider.data.cap_and_util.capandu_vm
     collection = provider.appliance.provider_based_collection(provider)
@@ -41,8 +45,35 @@ def refresh_provider(provider):
     return True
 
 
+@pytest.fixture(params=['instances', 'images'])
+def tag_mapping_items(request, appliance, provider):
+    entity_type = request.param
+    collection = getattr(appliance.collections, 'cloud_{}'.format(entity_type))
+    collection.filters = {'provider': provider}
+    view = navigate_to(collection, 'AllForProvider')
+    name = view.entities.get_first_entity().name
+    try:
+        mgmt_item = (
+            provider.mgmt.get_template(name)
+            if entity_type == 'images'
+            else provider.mgmt.get_vm(name)
+        )
+    except ImageNotFoundError:
+        msg = 'Failed looking up template [{}] from CFME on provider: {}'.format(name, provider)
+        logger.exception(msg)
+        pytest.skip(msg)
+    return collection.instantiate(name=name, provider=provider), mgmt_item, entity_type
+
+
+def tag_components():
+    # Return tuple with random tag_label and tag_value
+    return ('tag_label_{}'.format(fauxfactory.gen_alphanumeric()),
+            'tag_value_{}'.format(fauxfactory.gen_alphanumeric()))
+
+
 @test_requirements.tag
-def test_tag_mapping_azure_instances(vm, map_tags, refresh_provider):
+@pytest.mark.provider([AzureProvider], selector=ONE_PER_TYPE, scope='function', override=True)
+def test_tag_mapping_azure_instances(tagged_vm, map_tags):
     """"
     Polarion:
         assignee: anikifor
@@ -60,7 +91,7 @@ def test_tag_mapping_azure_instances(vm, map_tags, refresh_provider):
             3.
             4. Field value is "My Company Tags Testing: testing"
     """
-    view = navigate_to(vm, 'Details')
+    view = navigate_to(tagged_vm, 'Details')
 
     def my_company_tags():
         return view.tag.get_text_of('My Company Tags') != 'No My Company Tags have been assigned'
@@ -73,32 +104,120 @@ def my_company_tags():
     assert view.tag.get_text_of('My Company Tags')[0] == 'Testing: testing'
 
 
-@pytest.mark.manual
-@pytest.mark.tier(2)
-def test_ec2_tags_mapping():
+@test_requirements.tag
+# TODO: Azure needs tagging support in wrapanapi
+def test_labels_update(provider, tag_mapping_items, soft_assert):
+    """" Test updates of tag labels on entity details
+
+    Polarion:
+        assignee: anikifor
+        casecomponent: Cloud
+        caseimportance: high
+        initialEstimate: 1/12h
+        testSteps:
+            1. Set a tag through provider mgmt interface
+            2. Refresh Provider
+            3. Go to entity details and get labels
+            4. unset tag through provider mgmt interface
+            5. Go to entity details and get labels
+        expectedResults:
+            1.
+            2.
+            3. labels includes label + tag
+            4.
+            5. labels should not include tag label
     """
-    Requirement: Have an ec2 provider
+    entity, mgmt_entity, entity_type = tag_mapping_items
+    tag_label, tag_value = tag_components()
+    mgmt_entity.set_tag(tag_label, tag_value)
+    provider.refresh_provider_relationships(method='ui')
+    view = navigate_to(entity, 'Details')
+    # get_tags() doesn't work here as we're looking at labels, not smart management
+    current_tag_value = view.entities.summary('Labels').get_text_of(tag_label)
+    soft_assert(
+        current_tag_value == tag_value, (
+            'Tag values is not that expected, actual - {}, expected - {}'.format(
+                current_tag_value, tag_value
+            )
+        )
+    )
+    mgmt_entity.unset_tag(tag_label, tag_value)
+    provider.refresh_provider_relationships(method='ui')
+    view = navigate_to(entity, 'Details', force=True)
+    fields = view.entities.summary('Labels').fields
+    soft_assert(
+        tag_label not in fields,
+        '{} label was not removed from details page'.format(tag_label)
+    )
+
 
+@test_requirements.tag
+# TODO: Azure needs tagging support in wrapanapi
+def test_mapping_tags(
+    appliance, provider, tag_mapping_items, soft_assert, category, request
+):
+    """Test mapping tags on provider instances and images
     Polarion:
         assignee: anikifor
         casecomponent: Cloud
-        caseimportance: medium
-        initialEstimate: 1/5h
-        startsin: 5.8
+        caseimportance: high
+        initialEstimate: 1/12h
         testSteps:
-            1. Create an instance and tag it with test:testing
-            2. Go to Configuration -> CFME Region -> Map Tags
-            3. Add a tag:
-            Entity: Instance (Amazon)
-            Label: test
-            Category: Testing
-            4. Refresh provider
-            5. Go to summary of that instance
-            6. In Smart Management field should be:
-            My Company Tags testing: Testing
-            7. Delete that instance
+            1. Set a tag through provider mgmt interface
+            2. create a CFME tag map for entity type
+            3. Go to entity details and get smart management table
+            4. Delete the tag map
+            5. Go to entity details and get smart management table
+        expectedResults:
+            1.
+            2.
+            3. smart management should include category name and tag
+            4.
+            5. smart management table should NOT include category name and tag
     """
-    pass
+    entity, mgmt_entity, entity_type = tag_mapping_items
+    tag_label, tag_value = tag_components()
+    mgmt_entity.set_tag(tag_label, tag_value)
+    request.addfinalizer(
+        lambda: mgmt_entity.unset_tag(tag_label, tag_value)
+    )
+
+    provider_type = provider.discover_name.split(' ')[0]
+    # Check the add form to find the correct resource entity type selection string
+    view = navigate_to(appliance.collections.map_tags, 'Add')
+    select_text = None  # init this since we set it within if, and reference it in for/else:
+    options = []  # track the option strings for logging in failure
+    for option in view.resource_entity.all_options:
+        option_text = option.text  # read it once since its used multiple times
+        options.append(option_text)
+        if provider_type in option_text and entity_type.capitalize()[:-1] in option_text:
+            select_text = option_text
+            break
+    else:
+        # no match / break for select_text
+        if select_text is None:
+            pytest.fail(
+                'Failed to match the entity type [{e}] and provider type [{p}] in options: [{o}]'
+                .format(e=entity_type, p=provider_type, o=options)
+            )
+    view.cancel_button.click()  # close the open form
+
+    map_tag = appliance.collections.map_tags.create(
+        entity_type=select_text,
+        label=tag_label,
+        category=category.name
+    )
+
+    # check the tag shows up
+    provider.refresh_provider_relationships(method='ui')
+    soft_assert('{}: {}'.format(category.name, tag_value) in entity.get_tags())
+
+    # delete it
+    map_tag.delete()
+
+    # check the tag goes away
+    provider.refresh_provider_relationships(method='ui')
+    soft_assert(not '{}: {}'.format(category.name, tag_value) in entity.get_tags())
 
 
 @pytest.mark.manual

cfme/tests/configure/test_tag.py

@@ -11,7 +11,8 @@
 from cfme.rest.gen_data import tags as _tags
 from cfme.rest.gen_data import tenants as _tenants
 from cfme.rest.gen_data import vm as _vm
-from cfme.utils.blockers import BZ
+from cfme.utils.appliance.implementations.ui import navigator
+from cfme.utils.log import logger
 from cfme.utils.rest import assert_response
 from cfme.utils.rest import delete_resources_from_collection
 from cfme.utils.rest import delete_resources_from_detail
@@ -43,6 +44,7 @@
     pytest.mark.usefixtures('setup_provider')
 ]
 
+
 @pytest.fixture
 def category(appliance):
     cg = appliance.collections.categories.create(
@@ -62,6 +64,7 @@ def test_tag_crud(category):
     Polarion:
         assignee: anikifor
         initialEstimate: 1/8h
+        casecomponent: Tagging
     """
     tag = category.collections.tags.create(
         name=fauxfactory.gen_alphanumeric(8).lower(),
@@ -72,6 +75,38 @@ def test_tag_crud(category):
     tag.delete()
 
 
+def test_map_tagging_crud(appliance, category, soft_assert):
+    """Test map tag crud with flash message assertion
+    Polarion:
+        assignee: anikifor
+        initialEstimate: 1/4h
+        casecomponent: Tagging
+    """
+    label = fauxfactory.gen_alphanumeric(8)
+    map_tags_collection = appliance.collections.map_tags
+    map_tag_entity = map_tags_collection.create('Container Project', label, category.name)
+
+    view = appliance.browser.create_view(navigator.get_class(map_tags_collection, 'All').VIEW)
+    view.flash.assert_success_message('Container Label Tag Mapping "{}" was added'
+                                      .format(label))  # use label var to validate create method
+
+    with update(map_tag_entity):
+        map_tag_entity.category = fauxfactory.gen_alphanumeric(8)
+
+    view = appliance.browser.create_view(navigator.get_class(map_tags_collection, 'All').VIEW)
+    view.flash.assert_success_message(
+        'Container Label Tag Mapping "{}" was saved'
+        .format(map_tag_entity.label)  # use entity label since it may get updated
+    )
+    row = next(view.table.rows(resource_label=map_tag_entity.label))
+    soft_assert(row.tag_category.text == map_tag_entity.category)
+
+    map_tag_entity.delete()
+    view = appliance.browser.create_view(navigator.get_class(map_tags_collection, 'All').VIEW)
+    view.flash.assert_success_message('Container Label Tag Mapping "{}": Delete successful'
+                                      .format(map_tag_entity.label))
+
+
 class TestTagsViaREST(object):
 
     COLLECTIONS_BULK_TAGS = ("services", "vms")
@@ -284,7 +319,13 @@ def test_assign_and_unassign_tag(self, appliance, tags_mod, provider, services_m
             pytest.skip("No available entity in {} to assign tag".format(collection_name))
         entity = collection[-1]
         tag = tags_mod[0]
-        entity.tags.action.assign(tag)
+        try:
+            entity.tags.action.assign(tag)
+        except AttributeError:
+            msg = ('Missing tag attribute in parametrized REST collection {} for entity: {}'
+                   .format(collection_name, entity))
+            logger.exception(msg)
+            pytest.fail(msg)
         assert_response(appliance)
         entity.reload()
         assert tag.id in [t.id for t in entity.tags.all]

conf/polarion_tools.yaml

@@ -113,5 +113,6 @@ docstrings:
             - Services
             - SmartState
             - Stack
+            - Tagging
             - V2V
             - WebUI