Merge pull request #6075 from psav/remove_page_name

Remove page_name it is no longer used

cfme/cloud/provider/__init__.py

@@ -4,20 +4,20 @@
 from widgetastic.exceptions import MoveTargetOutOfBoundsException
 from widgetastic.widget import View
 from widgetastic_patternfly import Dropdown
-from widgetastic_manageiq import TimelinesView, BreadCrumb, ItemsToolBarViewSelector
 
 from cfme.base.login import BaseLoggedInPage
 from cfme.common import TagPageView
+from cfme.common.provider import CloudInfraProvider
 from cfme.common.provider_views import (
     CloudProviderAddView, CloudProviderEditView, CloudProviderDetailsView, CloudProvidersView,
     CloudProvidersDiscoverView)
-from cfme.common.provider import CloudInfraProvider
 from cfme.common.vm_views import VMToolbar, VMEntities
 from cfme.utils.appliance import Navigatable
 from cfme.utils.appliance.implementations.ui import navigator, navigate_to, CFMENavigateStep
 from cfme.utils.log import logger
-from cfme.utils.wait import wait_for
 from cfme.utils.pretty import Pretty
+from cfme.utils.wait import wait_for
+from widgetastic_manageiq import TimelinesView, BreadCrumb, ItemsToolBarViewSelector
 
 
 class CloudProviderTimelinesView(TimelinesView, BaseLoggedInPage):
@@ -97,7 +97,6 @@ class CloudProvider(Pretty, CloudInfraProvider):
     pretty_attrs = ['name', 'credentials', 'zone', 'key']
     STATS_TO_MATCH = ['num_template', 'num_vm']
     string_name = "Cloud"
-    page_name = "clouds"
     templates_destination_name = "Images"
     vm_name = "Instances"
     template_name = "Images"

cfme/containers/provider/__init__.py

@@ -1,19 +1,14 @@
-import re
 import random
 from random import sample
 from traceback import format_exc
 
+import re
 from navmazing import NavigateToSibling, NavigateToAttribute
-
-from widgetastic_patternfly import (
-    SelectorDropdown, Dropdown, BootstrapSelect, Input, Button, Tab, FlashMessages
-)
 from widgetastic.utils import VersionPick, Version
 from widgetastic.widget import Text, View, TextInput
-from widgetastic_manageiq import (
-    SummaryTable, BreadCrumb, Accordion, ManageIQTree
+from widgetastic_patternfly import (
+    SelectorDropdown, Dropdown, BootstrapSelect, Input, Button, Tab, FlashMessages
 )
-
 from wrapanapi.utils import eval_strings
 
 from cfme import exceptions
@@ -30,10 +25,13 @@
 from cfme.utils.appliance import Navigatable
 from cfme.utils.appliance.implementations.ui import navigator, CFMENavigateStep, navigate_to
 from cfme.utils.browser import browser
+from cfme.utils.log import logger
 from cfme.utils.pretty import Pretty
 from cfme.utils.varmeth import variable
-from cfme.utils.log import logger
 from cfme.utils.wait import wait_for
+from widgetastic_manageiq import (
+    SummaryTable, BreadCrumb, Accordion, ManageIQTree
+)
 
 
 class ContainersProviderDefaultEndpoint(DefaultEndpoint):
@@ -161,7 +159,6 @@ class ContainersProvider(BaseProvider, Pretty):
         'num_container']
     # TODO add 'num_volume'
     string_name = "Containers"
-    page_name = "containers"
     detail_page_suffix = 'provider_detail'
     edit_page_suffix = 'provider_edit_detail'
     quad_name = None

cfme/infrastructure/provider/__init__.py

@@ -1,12 +1,9 @@
 """ A model of an Infrastructure Provider in CFME
 """
-from widgetastic.exceptions import MoveTargetOutOfBoundsException
-from widgetastic.utils import Fillable
-
 from cached_property import cached_property
-from cfme.exceptions import DestinationNotFound
 from navmazing import NavigateToSibling, NavigateToAttribute
-from widgetastic_manageiq import BreadCrumb, BaseEntitiesView, View
+from widgetastic.exceptions import MoveTargetOutOfBoundsException
+from widgetastic.utils import Fillable
 
 from cfme.base.ui import Server
 from cfme.common import TagPageView
@@ -18,6 +15,7 @@
                                         InfraProvidersDiscoverView,
                                         InfraProvidersView,
                                         ProviderNodesView)
+from cfme.exceptions import DestinationNotFound
 from cfme.fixtures import pytest_selenium as sel
 from cfme.infrastructure.cluster import ClusterView, ClusterToolbar
 from cfme.infrastructure.host import Host
@@ -28,6 +26,7 @@
 from cfme.utils.pretty import Pretty
 from cfme.utils.varmeth import variable
 from cfme.utils.wait import wait_for
+from widgetastic_manageiq import BreadCrumb, BaseEntitiesView, View
 
 
 class ProviderClustersView(ClusterView):
@@ -69,7 +68,6 @@ class InfraProvider(Pretty, CloudInfraProvider, Fillable):
     pretty_attrs = ['name', 'key', 'zone']
     STATS_TO_MATCH = ['num_template', 'num_vm', 'num_datastore', 'num_host', 'num_cluster']
     string_name = "Infrastructure"
-    page_name = "infrastructure"
     templates_destination_name = "Templates"
     db_types = ["InfraManager"]
     hosts_menu_item = "Hosts"

cfme/middleware/provider/__init__.py

@@ -1,8 +1,8 @@
 
-import os
-import re
 from random import sample
 
+import os
+import re
 from navmazing import NavigateToSibling, NavigateToAttribute
 from selenium.common.exceptions import NoSuchElementException
 
@@ -15,9 +15,11 @@
     MiddlewareProviderDetailsView)
 from cfme.exceptions import MiddlewareProviderNotFound
 from cfme.middleware.provider.middleware_views import (ProviderMessagingAllView,
-    ProviderDeploymentAllView, ProviderDatasourceAllView,
-    ProviderServerAllView, MiddlewareProviderTimelinesView,
-    ProviderDomainsAllView)
+                                                       ProviderDeploymentAllView,
+                                                       ProviderDatasourceAllView,
+                                                       ProviderServerAllView,
+                                                       MiddlewareProviderTimelinesView,
+                                                       ProviderDomainsAllView)
 from cfme.utils import version
 from cfme.utils.appliance import current_appliance
 from cfme.utils.appliance.implementations.ui import navigator, CFMENavigateStep, navigate_to
@@ -42,7 +44,6 @@ def _get_providers_page():
 class MiddlewareProvider(BaseProvider):
     in_version = ('5.7', version.LATEST)
     category = "middleware"
-    page_name = 'middleware'
     string_name = 'Middleware'
     provider_types = {}
     STATS_TO_MATCH = []

cfme/networks/balancer.py

@@ -1,12 +1,11 @@
 import attr
-
 from navmazing import NavigateToAttribute
 
 from cfme.common import WidgetasticTaggable
 from cfme.exceptions import ItemNotFound
+from cfme.modeling.base import BaseCollection, BaseEntity, parent_of_type
 from cfme.networks.views import BalancerDetailsView, BalancerView
 from cfme.utils import version
-from cfme.modeling.base import BaseCollection, BaseEntity, parent_of_type
 from cfme.utils.appliance.implementations.ui import navigator, CFMENavigateStep, navigate_to
 
 
@@ -15,7 +14,6 @@ class Balancer(WidgetasticTaggable, BaseEntity):
     """Class representing balancers in sdn"""
     in_version = ('5.8', version.LATEST)
     category = 'networks'
-    page_name = 'network_balancer'
     string_name = 'NetworkBalancer'
     refresh_text = 'Refresh items and relationships'
     detail_page_suffix = 'network_balancer_detail'

cfme/networks/cloud_network.py

@@ -1,14 +1,13 @@
 import attr
-
 from navmazing import NavigateToAttribute, NavigateToSibling
 from widgetastic.exceptions import NoSuchElementException
 
 from cfme.common import WidgetasticTaggable
 from cfme.exceptions import ItemNotFound
+from cfme.modeling.base import BaseCollection, BaseEntity, parent_of_type
 from cfme.networks.views import (CloudNetworkAddView, CloudNetworkEditView, CloudNetworkDetailsView,
                                  CloudNetworkView)
 from cfme.utils import providers, version
-from cfme.modeling.base import BaseCollection, BaseEntity, parent_of_type
 from cfme.utils.appliance.implementations.ui import navigator, CFMENavigateStep, navigate_to
 from cfme.utils.wait import wait_for
 
@@ -18,7 +17,6 @@ class CloudNetwork(WidgetasticTaggable, BaseEntity):
     """Class representing cloud networks in cfme database"""
     in_version = ('5.8', version.LATEST)
     category = 'networks'
-    page_name = 'cloud_network'
     string_name = 'CloudNetwork'
     quad_name = None
     db_types = ['CloudNetwork']

cfme/networks/network_port.py

@@ -1,12 +1,11 @@
 import attr
-
 from navmazing import NavigateToAttribute
 
 from cfme.common import WidgetasticTaggable
 from cfme.exceptions import ItemNotFound
+from cfme.modeling.base import BaseCollection, BaseEntity, parent_of_type
 from cfme.networks.views import NetworkPortDetailsView, NetworkPortView
 from cfme.utils import version
-from cfme.modeling.base import BaseCollection, BaseEntity, parent_of_type
 from cfme.utils.appliance.implementations.ui import navigator, CFMENavigateStep, navigate_to
 
 
@@ -15,7 +14,6 @@ class NetworkPort(WidgetasticTaggable, BaseEntity):
     """Class representing network ports in sdn"""
     in_version = ('5.8', version.LATEST)
     category = "networks"
-    page_name = 'network_port'
     string_name = 'NetworkPort'
     quad_name = None
     db_types = ['CloudNetworkPort']

cfme/networks/network_router.py

@@ -1,14 +1,13 @@
 import attr
-
 from navmazing import NavigateToAttribute, NavigateToSibling
 from widgetastic.exceptions import NoSuchElementException
 
 from cfme.common import WidgetasticTaggable
 from cfme.exceptions import ItemNotFound
+from cfme.modeling.base import BaseCollection, BaseEntity, parent_of_type
 from cfme.networks.views import (NetworkRouterDetailsView, NetworkRouterView, NetworkRouterAddView,
                                  NetworkRouterEditView, NetworkRouterAddInterfaceView)
 from cfme.utils import version
-from cfme.modeling.base import BaseCollection, BaseEntity, parent_of_type
 from cfme.utils.appliance.implementations.ui import navigator, CFMENavigateStep, navigate_to
 from cfme.utils.wait import wait_for
 
@@ -18,7 +17,6 @@ class NetworkRouter(WidgetasticTaggable, BaseEntity):
     """ Class representing network ports in sdn"""
     in_version = ('5.8', version.LATEST)
     category = 'networks'
-    page_name = 'NetworkRouter'
     string_name = 'NetworkRouter'
     quad_name = None
     db_types = ['NetworkRouter']

cfme/networks/provider/__init__.py

@@ -1,11 +1,11 @@
 import attr
-
-from navmazing import NavigateToSibling, NavigateToAttribute
 from cached_property import cached_property
+from navmazing import NavigateToSibling, NavigateToAttribute
 
 from cfme.common import WidgetasticTaggable
 from cfme.common.provider import BaseProvider
 from cfme.exceptions import ItemNotFound
+from cfme.modeling.base import BaseCollection, BaseEntity
 from cfme.networks.balancer import BalancerCollection
 from cfme.networks.cloud_network import CloudNetworkCollection
 from cfme.networks.network_port import NetworkPortCollection
@@ -23,7 +23,6 @@
     OneProviderSubnetView
 )
 from cfme.utils import version
-from cfme.modeling.base import BaseCollection, BaseEntity
 from cfme.utils.appliance.implementations.ui import navigator, CFMENavigateStep, navigate_to
 from cfme.utils.wait import wait_for
 
@@ -38,9 +37,7 @@ class NetworkProvider(BaseProvider, WidgetasticTaggable, BaseEntity):
     STATS_TO_MATCH = []
     string_name = 'Networks'
     in_version = ('5.8', version.LATEST)
-    page_name = 'networks'
     edit_page_suffix = ''
-    detail_page_suffix = ''
     refresh_text = 'Refresh items and relationships'
     quad_name = None
     category = 'networks'

cfme/networks/security_group.py

@@ -1,12 +1,11 @@
 import attr
-
 from navmazing import NavigateToAttribute
 
 from cfme.common import WidgetasticTaggable
 from cfme.exceptions import ItemNotFound
+from cfme.modeling.base import BaseCollection, BaseEntity, parent_of_type
 from cfme.networks.views import SecurityGroupDetailsView, SecurityGroupView
 from cfme.utils import version
-from cfme.modeling.base import BaseCollection, BaseEntity, parent_of_type
 from cfme.utils.appliance.implementations.ui import navigator, CFMENavigateStep, navigate_to
 
 
@@ -15,7 +14,6 @@ class SecurityGroup(WidgetasticTaggable, BaseEntity):
     """Class representing security group in sdn"""
     in_version = ('5.8', version.LATEST)
     category = 'networks'
-    page_name = 'security_group'
     string_name = 'SecurityGroup'
     quad_name = None
     db_types = ['SecurityGroup']

cfme/networks/subnet.py

@@ -1,13 +1,12 @@
 import attr
-
 from navmazing import NavigateToAttribute, NavigateToSibling
 from widgetastic.exceptions import NoSuchElementException
 
 from cfme.common import WidgetasticTaggable
 from cfme.exceptions import ItemNotFound
+from cfme.modeling.base import BaseCollection, BaseEntity, parent_of_type
 from cfme.networks.views import SubnetDetailsView, SubnetView, SubnetAddView, SubnetEditView
 from cfme.utils import providers, version
-from cfme.modeling.base import BaseCollection, BaseEntity, parent_of_type
 from cfme.utils.appliance.implementations.ui import navigator, CFMENavigateStep, navigate_to
 from cfme.utils.wait import wait_for
 
@@ -17,7 +16,6 @@ class Subnet(WidgetasticTaggable, BaseEntity):
     """Class representing subnets in sdn"""
     in_version = ('5.8', version.LATEST)
     category = 'networks'
-    page_name = 'network_subnet'
     string_name = 'NetworkSubnet'
     quad_name = None
     db_types = ['NetworkSubnet']

cfme/physical/provider/__init__.py

@@ -19,7 +19,6 @@ class PhysicalProvider(Pretty, BaseProvider, Fillable):
     pretty_attrs = ['name']
     STATS_TO_MATCH = ['num_server']
     # string_name = "Physical Infrastructure"
-    # page_name = "infrastructure"
     # db_types = ["InfraManager"]
 
     def __init__(