On Thu, Feb 13, 2014 at 3:47 PM, Dimitris Aragiorgis <[email protected]> wrote: > Network UUID is written in .ini file during backup export > but is not used by _ReadExportParams(). This patch fixes it. > > Please note that in case a network is given, link and mode should > not be included in NIC options. > > This fixes issue 716. > > Signed-off-by: Dimitris Aragiorgis <[email protected]> > --- > lib/cmdlib/instance.py | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > > diff --git a/lib/cmdlib/instance.py b/lib/cmdlib/instance.py > index 007f989..6064088 100644 > --- a/lib/cmdlib/instance.py > +++ b/lib/cmdlib/instance.py > @@ -757,9 +757,19 @@ class LUInstanceCreate(LogicalUnit): > for idx in range(constants.MAX_NICS): > if einfo.has_option(constants.INISECT_INS, "nic%d_mac" % idx): > ndict = {} > - for name in list(constants.NICS_PARAMETERS) + ["ip", "mac"]: > + for name in [constants.INIC_IP, constants.INIC_MAC]: > v = einfo.get(constants.INISECT_INS, "nic%d_%s" % (idx, name)) > ndict[name] = v > + network = einfo.get(constants.INISECT_INS, > + "nic%d_%s" % (idx, constants.INIC_NETWORK)) > + # in case network is given link and mode are inherited > + # from nodegroup's netparams and thus should not be passed here > + if network: > + ndict[constants.INIC_NETWORK] = network > + else: > + for name in list(constants.NICS_PARAMETERS): > + v = einfo.get(constants.INISECT_INS, "nic%d_%s" % (idx, name)) > + ndict[name] = v > nics.append(ndict) > else: > break > -- > 1.7.10.4 >
LGTM, thanks. Michele -- 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
