From f69382834b785b7e60d8cdc216fdedda88056783 Mon Sep 17 00:00:00 2001 From: Trevor McCasland Date: Tue, 14 Mar 2017 09:14:40 -0500 Subject: [PATCH] Use neutron_lib's get_random_mac Neutron-lib 1.1.0 is now out and contains the get_random_mac definition[1]. This patch moves neutron references over to the neutron-lib version. [1] ee0f5b2ab27c828cfedb771735d237a968423da2 Change-Id: I0635a2b3df20151c7b29fcf6c1d06ccd7d74d703 --- neutron_vpnaas/tests/functional/common/test_scenario.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/neutron_vpnaas/tests/functional/common/test_scenario.py b/neutron_vpnaas/tests/functional/common/test_scenario.py index 2d1269819..10d4e3282 100644 --- a/neutron_vpnaas/tests/functional/common/test_scenario.py +++ b/neutron_vpnaas/tests/functional/common/test_scenario.py @@ -35,6 +35,7 @@ from neutron.services.provider_configuration import serviceprovider_opts from neutron.tests.common import l3_test_common from neutron.tests.common import net_helpers from neutron.tests.functional import base +from neutron_lib.utils import net as n_utils from oslo_config import cfg from oslo_log import log as logging from oslo_utils import uuidutils @@ -189,7 +190,7 @@ class SiteInfo(object): 'id': _uuid(), 'admin_state_up': True, 'network_id': _uuid(), - 'mac_address': common_utils.get_random_mac(MAC_BASE), + 'mac_address': n_utils.get_random_mac(MAC_BASE), 'subnets': [ { 'ipv6_ra_mode': None, @@ -218,7 +219,7 @@ class SiteInfo(object): self.info['gw_port']['fixed_ips'][0]['ip_address'] = str( self.public_net) self.info['gw_port']['mac_address'] = ( - common_utils.get_random_mac(MAC_BASE)) + n_utils.get_random_mac(MAC_BASE)) self.info['ha'] = False def _prepare_vpn_service_info(self):