libvirt: mask InjectionInfo.admin_pass
Logging network information and the admin password for guest instances is not ideal, so let's not do it. Change-Id: I328ba88b128c6c125e65d850ed7a6e57049dc7e2 Closes-Bug: #1737207
This commit is contained in:
parent
cbd67030d0
commit
6839630e86
|
@ -11772,6 +11772,14 @@ class LibvirtConnTestCase(test.NoDBTestCase,
|
||||||
]
|
]
|
||||||
self.assertEqual(wantFiles, gotFiles)
|
self.assertEqual(wantFiles, gotFiles)
|
||||||
|
|
||||||
|
def test_injection_info_is_sanitized(self):
|
||||||
|
info = get_injection_info(
|
||||||
|
network_info=mock.sentinel.network_info,
|
||||||
|
files=mock.sentinel.files,
|
||||||
|
admin_pass='verybadpass')
|
||||||
|
self.assertNotIn('verybadpass', str(info))
|
||||||
|
self.assertNotIn('verybadpass', repr(info))
|
||||||
|
|
||||||
@mock.patch(
|
@mock.patch(
|
||||||
'nova.virt.libvirt.driver.LibvirtDriver._build_device_metadata')
|
'nova.virt.libvirt.driver.LibvirtDriver._build_device_metadata')
|
||||||
@mock.patch('nova.api.metadata.base.InstanceMetadata')
|
@mock.patch('nova.api.metadata.base.InstanceMetadata')
|
||||||
|
|
|
@ -146,8 +146,14 @@ CONSOLE = "console=tty0 console=ttyS0 console=hvc0"
|
||||||
GuestNumaConfig = collections.namedtuple(
|
GuestNumaConfig = collections.namedtuple(
|
||||||
'GuestNumaConfig', ['cpuset', 'cputune', 'numaconfig', 'numatune'])
|
'GuestNumaConfig', ['cpuset', 'cputune', 'numaconfig', 'numatune'])
|
||||||
|
|
||||||
InjectionInfo = collections.namedtuple(
|
|
||||||
'InjectionInfo', ['network_info', 'files', 'admin_pass'])
|
class InjectionInfo(collections.namedtuple(
|
||||||
|
'InjectionInfo', ['network_info', 'files', 'admin_pass'])):
|
||||||
|
__slots__ = ()
|
||||||
|
|
||||||
|
def __repr__(self):
|
||||||
|
return ('InjectionInfo(network_info=%r, files=%r, '
|
||||||
|
'admin_pass=<SANITIZED>)') % (self.network_info, self.files)
|
||||||
|
|
||||||
libvirt_volume_drivers = [
|
libvirt_volume_drivers = [
|
||||||
'iscsi=nova.virt.libvirt.volume.iscsi.LibvirtISCSIVolumeDriver',
|
'iscsi=nova.virt.libvirt.volume.iscsi.LibvirtISCSIVolumeDriver',
|
||||||
|
|
Loading…
Reference in New Issue