Add i18n for logging, changed create_bridge/vlan to should_create_bridge/vlan, changed unfilter_instance's keyword param to positional, and added Dan's alternate ID to .mailmap
This commit is contained in:
1
.mailmap
1
.mailmap
@@ -14,6 +14,7 @@
|
|||||||
<code@term.ie> <github@anarkystic.com>
|
<code@term.ie> <github@anarkystic.com>
|
||||||
<code@term.ie> <termie@preciousroy.local>
|
<code@term.ie> <termie@preciousroy.local>
|
||||||
<corywright@gmail.com> <cory.wright@rackspace.com>
|
<corywright@gmail.com> <cory.wright@rackspace.com>
|
||||||
|
<dan@nicira.com> <danwent@dan-xs3-cs>
|
||||||
<devin.carlen@gmail.com> <devcamcar@illian.local>
|
<devin.carlen@gmail.com> <devcamcar@illian.local>
|
||||||
<ewan.mellor@citrix.com> <emellor@silver>
|
<ewan.mellor@citrix.com> <emellor@silver>
|
||||||
<itoumsn@nttdata.co.jp> <itoumsn@shayol>
|
<itoumsn@nttdata.co.jp> <itoumsn@shayol>
|
||||||
|
|||||||
@@ -828,7 +828,7 @@ class ComputeTestCase(test.TestCase):
|
|||||||
for v in i_ref['volumes']:
|
for v in i_ref['volumes']:
|
||||||
self.compute.volume_manager.remove_compute_volume(c, v['id'])
|
self.compute.volume_manager.remove_compute_volume(c, v['id'])
|
||||||
self.mox.StubOutWithMock(self.compute.driver, 'unfilter_instance')
|
self.mox.StubOutWithMock(self.compute.driver, 'unfilter_instance')
|
||||||
self.compute.driver.unfilter_instance(i_ref, network_info=[])
|
self.compute.driver.unfilter_instance(i_ref, [])
|
||||||
|
|
||||||
# executing
|
# executing
|
||||||
self.mox.ReplayAll()
|
self.mox.ReplayAll()
|
||||||
|
|||||||
@@ -164,8 +164,8 @@ class FlatNetworkTestCase(test.TestCase):
|
|||||||
'label': 'test%s' % i,
|
'label': 'test%s' % i,
|
||||||
'mac': 'DE:AD:BE:EF:00:0%s' % i,
|
'mac': 'DE:AD:BE:EF:00:0%s' % i,
|
||||||
'rxtx_cap': 'DONTCARE',
|
'rxtx_cap': 'DONTCARE',
|
||||||
'create_vlan': False,
|
'should_create_vlan': False,
|
||||||
'create_bridge': False}
|
'should_create_bridge': False}
|
||||||
self.assertDictMatch(nw[1], check)
|
self.assertDictMatch(nw[1], check)
|
||||||
|
|
||||||
check = [{'enabled': 'DONTCARE',
|
check = [{'enabled': 'DONTCARE',
|
||||||
|
|||||||
Reference in New Issue
Block a user