diff --git a/cfme/cloud/instance/__init__.py b/cfme/cloud/instance/__init__.py index e3a320f641..4a9f3f8a8f 100644 --- a/cfme/cloud/instance/__init__.py +++ b/cfme/cloud/instance/__init__.py @@ -32,7 +32,6 @@ class InstanceDetailsToolbar(View): monitoring = Dropdown('Monitoring') power = Dropdown('Instance Power Functions') # title download = Button(title='Download summary in PDF format') - web_console = Button('Web Console') access = Dropdown("Access") diff --git a/cfme/tests/cloud_infra_common/test_cockpit_server.py b/cfme/tests/cloud_infra_common/test_cockpit_server.py index d0398fd9e8..2b46de72e8 100644 --- a/cfme/tests/cloud_infra_common/test_cockpit_server.py +++ b/cfme/tests/cloud_infra_common/test_cockpit_server.py @@ -3,8 +3,6 @@ from cfme.cloud.instance import Instance from cfme.cloud.provider import CloudProvider -from cfme.cloud.provider.ec2 import EC2Provider -from cfme.cloud.provider.azure import AzureProvider from cfme.cloud.provider.gce import GCEProvider from cfme.common.provider import CloudInfraProvider from cfme.infrastructure.virtual_machines import InfraVm @@ -42,14 +40,7 @@ def test_cockpit_server_role(appliance, provider, setup_provider, new_vm, enable view = navigate_to(new_vm, 'Details') if enable: - if provider.one_of(AzureProvider, EC2Provider): - # For Azure and EC2 the Web Console button directly shows in the toolbar - assert not view.toolbar.web_console.disabled - else: - assert view.toolbar.access.item_enabled('Web Console') + assert view.toolbar.access.item_enabled('Web Console') appliance.server.settings.disable_server_roles('cockpit_ws') else: - if provider.one_of(AzureProvider, EC2Provider): - assert view.toolbar.web_console.disabled - else: - assert not view.toolbar.access.item_enabled('Web Console') + assert not view.toolbar.access.item_enabled('Web Console')