LGTM, thanks On Mon, May 4, 2015 at 5:32 PM, 'Lisa Velden' via ganeti-devel < [email protected]> wrote:
> Make sure that there is an environment variable for each parameter > with the correct value. > > Signed-off-by: Lisa Velden <[email protected]> > --- > test/py/ganeti.backend_unittest.py | 35 > +++++++++++++++++++++++++++++++++++ > 1 file changed, 35 insertions(+) > > diff --git a/test/py/ganeti.backend_unittest.py b/test/py/ > ganeti.backend_unittest.py > index 1f05197..08b0301 100755 > --- a/test/py/ganeti.backend_unittest.py > +++ b/test/py/ganeti.backend_unittest.py > @@ -44,7 +44,9 @@ from ganeti import hypervisor > from ganeti import netutils > from ganeti import objects > from ganeti import pathutils > +from ganeti import serializer > from ganeti import utils > +from cmdlib.testsupport.config_mock import ConfigMock > > > class TestX509Certificates(unittest.TestCase): > @@ -948,5 +950,38 @@ class TestSpaceReportingConstants(unittest.TestCase): > self.assertEqual(None, backend._STORAGE_TYPE_INFO_FN[storage_type]) > > > +class TestOSEnvironment(unittest.TestCase): > + """Ensure the presence of public and private parameters. > + > + They have to be present inside os environment variables. > + > + """ > + > + def _CreateEnv(self): > + """Create and return an environment.""" > + config_mock = ConfigMock() > + inst = config_mock.AddNewInstance( > + osparams={"public_param": "public_info"}, > + osparams_private=serializer.PrivateDict({"private_param": > + "private_info", > + > "another_private_param": > + "more_privacy"}), > + nics = []) > + inst.disks_info = "" > + inst.secondary_nodes = [] > + > + return backend.OSEnvironment(inst, config_mock.CreateOs()) > + > + def testParamPresence(self): > + env = self._CreateEnv() > + env_keys = env.keys() > + self.assertIn("OSP_PUBLIC_PARAM", env) > + self.assertIn("OSP_PRIVATE_PARAM", env) > + self.assertIn("OSP_ANOTHER_PRIVATE_PARAM", env) > + self.assertEqual("public_info", env["OSP_PUBLIC_PARAM"]) > + self.assertEqual("private_info", env["OSP_PRIVATE_PARAM"]) > + self.assertEqual("more_privacy", env["OSP_ANOTHER_PRIVATE_PARAM"]) > + > + > if __name__ == "__main__": > testutils.GanetiTestProgram() > -- > 2.2.0.rc0.207.ga3a616c > > Hrvoje Ribicic Ganeti Engineering Google Germany GmbH Dienerstr. 12, 80331, München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores Steuernummer: 48/725/00206 Umsatzsteueridentifikationsnummer: DE813741370
