LGTM. Thanks, Jose
On Mon, Nov 18, 2013 at 12:30:43PM +0100, Thomas Thrainer wrote: > The cfgupgrade test assumes a very minimal configuration for some of its > tests. This configuration does not contain some of the fields which were > assumed to be present in cfgupgrade. This patch tests for the existence > of those fields before trying to access them. > > Signed-off-by: Thomas Thrainer <[email protected]> > --- > tools/cfgupgrade | 15 ++++++++++----- > 1 file changed, 10 insertions(+), 5 deletions(-) > > diff --git a/tools/cfgupgrade b/tools/cfgupgrade > index 7ffd554..aa8a97b 100755 > --- a/tools/cfgupgrade > +++ b/tools/cfgupgrade > @@ -416,19 +416,24 @@ def DowngradeHVParams(hvparams): > > def DowngradeCluster(config_data): > cluster = config_data["cluster"] > - DowngradeNDParams(cluster["ndparams"]) > - DowngradeNicParams(cluster["nicparams"][constants.PP_DEFAULT]) > - DowngradeHVParams(cluster["hvparams"]) > + if "ndparams" in cluster: > + DowngradeNDParams(cluster["ndparams"]) > + if "nicparams" in cluster: > + DowngradeNicParams(cluster["nicparams"][constants.PP_DEFAULT]) > + if "hvparams" in cluster: > + DowngradeHVParams(cluster["hvparams"]) > > > def DowngradeNodeGroups(config_data): > for (_, ngobj) in config_data["nodegroups"].items(): > - DowngradeNDParams(ngobj["ndparams"]) > + if "ndparams" in ngobj: > + DowngradeNDParams(ngobj["ndparams"]) > > > def DowngradeNodes(config_data): > for (_, nobj) in config_data["nodes"].items(): > - DowngradeNDParams(nobj["ndparams"]) > + if "ndparams" in nobj: > + DowngradeNDParams(nobj["ndparams"]) > > > def DowngradeInstances(config_data): > -- > 1.8.4.1 > -- Jose Antonio Lopes 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
