x/vmware-nsx
Code Issues Proposed changes

Merge "Add endpoint_type parameter to MetaInterfaceDriver"

Browse Source
This commit is contained in:
Jenkins 2014-09-18 07:25:26 +00:00 committed by Gerrit Code Review
commit 0c242d0bfd
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
neutron/agent/linux/interface.py
View File

@ -41,7 +41,11 @@ OPTS = [
cfg.IntOpt('network_device_mtu', cfg.IntOpt('network_device_mtu',
help=_('MTU setting for device.')), help=_('MTU setting for device.')),
cfg.StrOpt('meta_flavor_driver_mappings', cfg.StrOpt('meta_flavor_driver_mappings',
help=_('Mapping between flavor and LinuxInterfaceDriver')), help=_('Mapping between flavor and LinuxInterfaceDriver. '
'It is specific to MetaInterfaceDriver used with '
'admin_user, admin_password, admin_tenant_name, '
'admin_url, auth_strategy, auth_region and '
'endpoint_type.')),
cfg.StrOpt('admin_user', cfg.StrOpt('admin_user',
help=_("Admin username")), help=_("Admin username")),
cfg.StrOpt('admin_password', cfg.StrOpt('admin_password',
@ -55,6 +59,10 @@ OPTS = [
help=_("The type of authentication to use")), help=_("The type of authentication to use")),
cfg.StrOpt('auth_region', cfg.StrOpt('auth_region',
help=_("Authentication region")), help=_("Authentication region")),
cfg.StrOpt('endpoint_type',
default='publicURL',
help=_("Network service endpoint type to pull from "
"the keystone catalog")),
] ]
@ -399,7 +407,8 @@ class MetaInterfaceDriver(LinuxInterfaceDriver):
tenant_name=self.conf.admin_tenant_name, tenant_name=self.conf.admin_tenant_name,
auth_url=self.conf.auth_url, auth_url=self.conf.auth_url,
auth_strategy=self.conf.auth_strategy, auth_strategy=self.conf.auth_strategy,
region_name=self.conf.auth_region region_name=self.conf.auth_region,
endpoint_type=self.conf.endpoint_type
) )
self.flavor_driver_map = {} self.flavor_driver_map = {}
for net_flavor, driver_name in [ for net_flavor, driver_name in [

1
neutron/tests/unit/test_linux_interface.py
View File

@ -449,6 +449,7 @@ class TestMetaInterfaceDriver(TestBase):
'meta_flavor_driver_mappings', 'meta_flavor_driver_mappings',
'fake1:neutron.agent.linux.interface.OVSInterfaceDriver,' 'fake1:neutron.agent.linux.interface.OVSInterfaceDriver,'
'fake2:neutron.agent.linux.interface.BridgeInterfaceDriver') 'fake2:neutron.agent.linux.interface.BridgeInterfaceDriver')
self.conf.set_override('endpoint_type', 'internalURL')
def test_get_driver_by_network_id(self): def test_get_driver_by_network_id(self):
meta_interface = interface.MetaInterfaceDriver(self.conf) meta_interface = interface.MetaInterfaceDriver(self.conf)