Merge branch 'stable-2.16' into stable-2.17
[ganeti-github.git] / test / py / testutils / config_mock.py
index 9028f26..8267fa0 100644 (file)
@@ -64,6 +64,7 @@ def _UpdateIvNames(base_idx, disks):
 
 
 # pylint: disable=R0904
+# pylint: disable=W0102
 class ConfigMock(config.ConfigWriter):
   """A mocked cluster configuration with added methods for easy customization.
 
@@ -109,7 +110,7 @@ class ConfigMock(config.ConfigWriter):
                       ndparams=None,
                       diskparams=None,
                       ipolicy=None,
-                      hv_state_static=None,
+                      hv_state_static={},
                       disk_state_static=None,
                       alloc_policy=None,
                       networks=None):
@@ -160,7 +161,7 @@ class ConfigMock(config.ConfigWriter):
                  ndparams=None,
                  powered=True,
                  hv_state=None,
-                 hv_state_static=None,
+                 hv_state_static={},
                  disk_state=None,
                  disk_state_static=None):
     """Add a new L{objects.Node} to the cluster configuration