Skip to content
This repository has been archived by the owner on Apr 7, 2022. It is now read-only.

Commit

Permalink
Merge pull request #8151 from lina-nikiforova/fix_test_with_load_bala…
Browse files Browse the repository at this point in the history
…ncers_view

[RFR] changed the provider to azure for test_tag_tagvis.py
  • Loading branch information
izapolsk committed Nov 22, 2018
2 parents 64b678b + d6b4e33 commit 4996a38
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions cfme/networks/floating_ips.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ class FloatingIpCollection(BaseCollection):
ENTITY = FloatingIp

def all(self):
floating_ips = []
view = navigate_to(self, 'All')
all_ips = view.entities.get_all(surf_pages=True)
list_floating_ip_obj = []
for ip in all_ips:
# as for 5.9 floating ip doesn't have name att, will get name as address from data
list_floating_ip_obj.append(ip.name if ip.name else ip.data['address'])
return [self.instantiate(address=name) for name in list_floating_ip_obj]
for _ in view.entities.paginator.pages():
ips = view.entities.get_all()
for ip in ips:
floating_ips.append(self.instantiate(address=ip.data['address']))
return floating_ips


@navigator.register(FloatingIpCollection, 'All')
Expand Down
4 changes: 2 additions & 2 deletions cfme/tests/networks/test_tag_tagvis.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import pytest

from cfme.cloud.provider.openstack import OpenStackProvider
from cfme.cloud.provider.azure import AzureProvider
from cfme.markers.env_markers.provider import ONE_PER_CATEGORY
from cfme.networks.views import (CloudNetworkView, SubnetView, NetworkRouterView, SecurityGroupView,
NetworkPortView, BalancerView, FloatingIpView)
from cfme.utils.appliance.implementations.ui import navigate_to

pytestmark = [
pytest.mark.usefixtures('setup_provider'),
pytest.mark.provider([OpenStackProvider], selector=ONE_PER_CATEGORY, scope='module')
pytest.mark.provider([AzureProvider], selector=ONE_PER_CATEGORY, scope='module')
]

network_collections = [
Expand Down

0 comments on commit 4996a38

Please sign in to comment.