From 4afb88fb03f4b9280470e53322d5a630d22548f5 Mon Sep 17 00:00:00 2001 From: George Paraskevopoulos Date: Thu, 30 Mar 2017 15:20:33 +0300 Subject: Fix hardcoded domain in wait_for_clf_rules In the CI the availability zones are using a different domain. For example instead of "node-1.domain.tld", we have "node-1.opnfvericsson.com" This patch takes the av zones dynamically from nova hypervisor-list. Change-Id: Ifa26dbbb6b8d415ee30bb1216fc1150f65096a16 Signed-off-by: George Paraskevopoulos --- sfc/lib/topology_shuffler.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'sfc/lib/topology_shuffler.py') diff --git a/sfc/lib/topology_shuffler.py b/sfc/lib/topology_shuffler.py index 4e027d9e..9104a5f6 100644 --- a/sfc/lib/topology_shuffler.py +++ b/sfc/lib/topology_shuffler.py @@ -1,8 +1,7 @@ import datetime import random -import functest.utils.openstack_utils as os_utils import functest.utils.functest_logger as ft_logger - +import sfc.lib.utils as sfc_utils logger = ft_logger.Logger(__name__).getLogger() @@ -75,15 +74,6 @@ def get_seed(): return seed -def _get_av_zones(): - ''' - Return the availability zone each host belongs to - ''' - nova_client = os_utils.get_nova_client() - hosts = os_utils.get_hypervisors(nova_client) - return ['nova::{0}'.format(host) for host in hosts] - - def topology(vnf_names, av_zones=None, seed=None): ''' Get the topology for client, server and vnfs. @@ -99,7 +89,7 @@ def topology(vnf_names, av_zones=None, seed=None): ''' if av_zones is None: - av_zones = _get_av_zones() + av_zones = sfc_utils.get_av_zones() if len(av_zones) < 2 or seed is None: # fall back to nova availability zone -- cgit 1.2.3-korg