Merge "fix bug 992008, we should config public interface on compute"
This commit is contained in:
commit
cd04e9e284
|
@ -293,10 +293,10 @@ class FloatingIP(object):
|
||||||
LOG.debug(msg)
|
LOG.debug(msg)
|
||||||
continue
|
continue
|
||||||
fixed_address = fixed_ip_ref['address']
|
fixed_address = fixed_ip_ref['address']
|
||||||
interface = floating_ip['interface']
|
interface = FLAGS.public_interface or floating_ip['interface']
|
||||||
try:
|
try:
|
||||||
self.l3driver.add_floating_ip(floating_ip['address'],
|
self.l3driver.add_floating_ip(floating_ip['address'],
|
||||||
fixed_address, floating_ip['interface'])
|
fixed_address, interface)
|
||||||
except exception.ProcessExecutionError:
|
except exception.ProcessExecutionError:
|
||||||
LOG.debug(_('Interface %(interface)s not found'), locals())
|
LOG.debug(_('Interface %(interface)s not found'), locals())
|
||||||
raise exception.NoFloatingIpInterface(interface=interface)
|
raise exception.NoFloatingIpInterface(interface=interface)
|
||||||
|
@ -476,7 +476,7 @@ class FloatingIP(object):
|
||||||
else:
|
else:
|
||||||
host = network['host']
|
host = network['host']
|
||||||
|
|
||||||
interface = floating_ip['interface']
|
interface = FLAGS.public_interface or floating_ip['interface']
|
||||||
if host == self.host:
|
if host == self.host:
|
||||||
# i'm the correct host
|
# i'm the correct host
|
||||||
self._associate_floating_ip(context, floating_address,
|
self._associate_floating_ip(context, floating_address,
|
||||||
|
@ -547,7 +547,7 @@ class FloatingIP(object):
|
||||||
else:
|
else:
|
||||||
host = network['host']
|
host = network['host']
|
||||||
|
|
||||||
interface = floating_ip['interface']
|
interface = FLAGS.public_interface or floating_ip['interface']
|
||||||
if host == self.host:
|
if host == self.host:
|
||||||
# i'm the correct host
|
# i'm the correct host
|
||||||
self._disassociate_floating_ip(context, address, interface)
|
self._disassociate_floating_ip(context, address, interface)
|
||||||
|
|
|
@ -716,11 +716,24 @@ class VlanNetworkTestCase(test.TestCase):
|
||||||
self.stubs.Set(self.network.db, 'fixed_ip_get', fixed_ip_get)
|
self.stubs.Set(self.network.db, 'fixed_ip_get', fixed_ip_get)
|
||||||
|
|
||||||
self.mox.StubOutWithMock(self.network.l3driver, 'add_floating_ip')
|
self.mox.StubOutWithMock(self.network.l3driver, 'add_floating_ip')
|
||||||
|
self.flags(public_interface=False)
|
||||||
self.network.l3driver.add_floating_ip('fakefloat',
|
self.network.l3driver.add_floating_ip('fakefloat',
|
||||||
'fakefixed',
|
'fakefixed',
|
||||||
'fakeiface')
|
'fakeiface')
|
||||||
self.mox.ReplayAll()
|
self.mox.ReplayAll()
|
||||||
self.network.init_host_floating_ips()
|
self.network.init_host_floating_ips()
|
||||||
|
self.mox.UnsetStubs()
|
||||||
|
self.mox.VerifyAll()
|
||||||
|
|
||||||
|
self.mox.StubOutWithMock(self.network.l3driver, 'add_floating_ip')
|
||||||
|
self.flags(public_interface='fooiface')
|
||||||
|
self.network.l3driver.add_floating_ip('fakefloat',
|
||||||
|
'fakefixed',
|
||||||
|
'fooiface')
|
||||||
|
self.mox.ReplayAll()
|
||||||
|
self.network.init_host_floating_ips()
|
||||||
|
self.mox.UnsetStubs()
|
||||||
|
self.mox.VerifyAll()
|
||||||
|
|
||||||
def test_disassociate_floating_ip(self):
|
def test_disassociate_floating_ip(self):
|
||||||
ctxt = context.RequestContext('testuser', 'testproject',
|
ctxt = context.RequestContext('testuser', 'testproject',
|
||||||
|
|
Loading…
Reference in New Issue