From 7e39b0076e945c15d2ffe533b789963bef492608 Mon Sep 17 00:00:00 2001 From: Petr Pudlak Date: Wed, 28 May 2014 14:53:47 +0200 Subject: [PATCH] Add the old DRBD secrets reservation code to mocked config .. so that the unit tests work without the presence of WConfd. Also fix mocked GenerateMAC, which used _temporary_ids by mistake in the original ConfigWriter. Signed-off-by: Petr Pudlak Reviewed-by: Klaus Aehlig --- test/py/cmdlib/testsupport/config_mock.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/test/py/cmdlib/testsupport/config_mock.py b/test/py/cmdlib/testsupport/config_mock.py index 23e757e25..527b3d867 100644 --- a/test/py/cmdlib/testsupport/config_mock.py +++ b/test/py/cmdlib/testsupport/config_mock.py @@ -31,6 +31,7 @@ from ganeti import constants from ganeti import errors from ganeti import objects from ganeti.network import AddressPool +from ganeti import utils import mocks @@ -57,6 +58,7 @@ class ConfigMock(config.ConfigWriter): self._mocked_config_store = None self._temporary_macs = config.TemporaryReservationManager() + self._temporary_secrets = config.TemporaryReservationManager() super(ConfigMock, self).__init__(cfg_file="/dev/null", _getents=_StubGetEntResolver(), @@ -667,7 +669,7 @@ class ConfigMock(config.ConfigWriter): existing = self._AllMACs() prefix = self._UnlockedGetNetworkMACPrefix(net_uuid) gen_mac = self._GenerateOneMAC(prefix) - return self._temporary_ids.Generate(existing, gen_mac, ec_id) + return self._temporary_macs.Generate(existing, gen_mac, ec_id) def ReserveMAC(self, mac, ec_id): """Reserve a MAC for an instance. @@ -681,3 +683,13 @@ class ConfigMock(config.ConfigWriter): raise errors.ReservationError("mac already in use") else: self._temporary_macs.Reserve(ec_id, mac) + + def GenerateDRBDSecret(self, ec_id): + """Generate a DRBD secret. + + This checks the current disks for duplicates. + + """ + return self._temporary_secrets.Generate(self._AllDRBDSecrets(), + utils.GenerateSecret, + ec_id) -- GitLab