Merge pull request #9398 from mmojzis/511_ignores

[1LP][RFR]Ignoring load balancers in 5.11 because of deprecation
ManageIQ · Sep 27, 2019 · 0186f18 · 0186f18
2 parents 0af3f1b + ab3e927
commit 0186f18
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 2 deletions.
diff --git a/cfme/tests/cloud/test_targeted_refresh.py b/cfme/tests/cloud/test_targeted_refresh.py
@@ -161,6 +161,7 @@ def test_ec2_targeted_refresh_subnet():
 
 
 @pytest.mark.manual
+@pytest.mark.ignore_stream('5.11')
 def test_ec2_targeted_refresh_load_balancer():
     """
     AWS naming is ELB

diff --git a/cfme/tests/configure/test_landing_page.py b/cfme/tests/configure/test_landing_page.py
@@ -144,6 +144,7 @@
     "Cloud Intel / Reports",
     "Cloud Intel / Timelines",
     "Monitor / Alerts / Most Recent Alerts",
+    "Networks / Load Balancers",
     "Optimize / Bottlenecks",
     "Optimize / Planning",
     "Optimize / Utilization",

diff --git a/cfme/tests/networks/test_sdn_crud.py b/cfme/tests/networks/test_sdn_crud.py
@@ -38,7 +38,9 @@ def test_sdn_crud(provider, appliance):
     assert parent_name == provider.name
 
     testing_list = ["Cloud Networks", "Cloud Subnets", "Network Routers",
-                    "Security Groups", "Floating IPs", "Network Ports", "Load Balancers"]
+                    "Security Groups", "Floating IPs", "Network Ports"]
+    if appliance.version < '5.11':
+        testing_list.append("Load Balancers")
     for testing_name in testing_list:
         view = navigate_to(network_provider, 'Details')
         view.entities.relationships.click_at(testing_name)

diff --git a/cfme/tests/networks/test_sdn_downloads.py b/cfme/tests/networks/test_sdn_downloads.py
@@ -56,6 +56,10 @@ def handle_extra_tabs(view):
 
 @pytest.mark.parametrize("filetype", list(extensions_mapping.keys()))
 @pytest.mark.parametrize("collection_type", OBJECTCOLLECTIONS)
+@pytest.mark.uncollectif(
+    lambda collection_type, appliance:
+    "balancers" in collection_type and appliance.version > "5.11",
+    reason="Cloud Load Balancers are removed in 5.11, see BZ 1672949")
 def test_download_lists_base(filetype, collection_type, appliance):
     """ Download the items from base lists.
 
@@ -72,6 +76,10 @@ def test_download_lists_base(filetype, collection_type, appliance):
     download(collection, filetype)
 
 
+@pytest.mark.uncollectif(
+    lambda collection_type, appliance:
+    "balancers" in collection_type and appliance.version > "5.11",
+    reason="Cloud Load Balancers are removed in 5.11, see BZ 1672949")
 @pytest.mark.parametrize("collection_type", OBJECTCOLLECTIONS)
 def test_download_pdf_summary(appliance, collection_type, provider):
     """ Download the summary details of specific object

diff --git a/cfme/tests/networks/test_sdn_inventory_collection.py b/cfme/tests/networks/test_sdn_inventory_collection.py
@@ -110,6 +110,7 @@ def test_sdn_api_inventory_security_groups(provider, appliance):
     'cfme list: {cfme}'.format(sec=prov_sec_gp, cfme=cfme_sec_gp)
 
 
+@pytest.mark.ignore_stream('5.11')  # Load Balancers are deprecated in 5.11
 @pytest.mark.provider([EC2Provider, AzureProvider], override=True, scope='function')
 def test_sdn_api_inventory_loadbalancers(provider, appliance):
     """Pulls the list of loadbalancers from the Provider API and from the appliance. Compare the 2

diff --git a/cfme/tests/networks/test_sdn_navigation.py b/cfme/tests/networks/test_sdn_navigation.py
@@ -17,6 +17,9 @@
 
 @pytest.mark.parametrize("tested_part", ["Cloud Subnets", "Cloud Networks", "Network Routers",
                          "Security Groups", "Network Ports", "Load Balancers"])
+@pytest.mark.uncollectif(
+    lambda tested_part, appliance: "Load Balancers" in tested_part and appliance.version > "5.11",
+    reason="Cloud Load Balancers are removed in 5.11, see BZ 1672949")
 def test_sdn_provider_relationships_navigation(provider, tested_part, appliance):
     """
     Metadata:

diff --git a/cfme/tests/test_rest.py b/cfme/tests/test_rest.py
@@ -161,7 +161,7 @@ def _finished():
 }
 
 COLLECTIONS_NOT_IN_510 = {"customization_templates", "pxe_images", "pxe_servers"}
-COLLECTIONS_NOT_IN_511 = {"container_deployments"}
+COLLECTIONS_NOT_IN_511 = {"container_deployments", "load_balancers"}
 
 COLLECTIONS_IN_510 = COLLECTIONS_ALL - COLLECTIONS_NOT_IN_510
 COLLECTIONS_IN_511 = COLLECTIONS_ALL - COLLECTIONS_NOT_IN_511