openstack
/
deb-neutron-vpnaas
Code Issues Proposed changes

Merge "Use neutron_lib's get_random_mac"

This commit is contained in:
Jenkins 2017-04-17 05:44:58 +00:00 committed by Gerrit Code Review
parent 966921aeca f69382834b
commit bb3e4a1183
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
neutron_vpnaas/tests/functional/common/test_scenario.py
View File

@ -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 l3_test_common
from neutron.tests.common import net_helpers from neutron.tests.common import net_helpers
from neutron.tests.functional import base from neutron.tests.functional import base
from neutron_lib.utils import net as n_utils
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
from oslo_utils import uuidutils from oslo_utils import uuidutils
@ -189,7 +190,7 @@ class SiteInfo(object):
'id': _uuid(), 'id': _uuid(),
'admin_state_up': True, 'admin_state_up': True,
'network_id': _uuid(), 'network_id': _uuid(),
'mac_address': common_utils.get_random_mac(MAC_BASE), 'mac_address': n_utils.get_random_mac(MAC_BASE),
'subnets': [ 'subnets': [
{ {
'ipv6_ra_mode': None, 'ipv6_ra_mode': None,
@ -218,7 +219,7 @@ class SiteInfo(object):
self.info['gw_port']['fixed_ips'][0]['ip_address'] = str( self.info['gw_port']['fixed_ips'][0]['ip_address'] = str(
self.public_net) self.public_net)
self.info['gw_port']['mac_address'] = ( self.info['gw_port']['mac_address'] = (
common_utils.get_random_mac(MAC_BASE)) n_utils.get_random_mac(MAC_BASE))
self.info['ha'] = False self.info['ha'] = False
def _prepare_vpn_service_info(self): def _prepare_vpn_service_info(self):