Hi Thomas,
please see my inline replys.
Am 19.08.2013 12:55, schrieb Thomas Thrainer:
Hi,
A bit late for this patch, but it causes problems right now...
See the comments inline please:
On Sun, Jul 14, 2013 at 5:05 PM, Sebastian Gebhard <[email protected]
<mailto:[email protected]>> wrote:
@@ -1315,6 +1315,7 @@ PP_DEFAULT = "default"
# NIC_* constants are used inside the ganeti config
NIC_MODE = "mode"
NIC_LINK = "link"
+NIC_VLAN = "vlan"
Why do we need this constant? As far as I can see, only required
parameters are listed here, and that's mode and link. So why do we
need vlan here, but not things like ip, name, network, etc.?
I thought this is the right place to put it, since in my opinion it is a
important part of the nic configuration. You are right that it is not
required. It is not needed when using bridging or routing. But then link
would also not be required, because its not needed for routing.
I can try to move it. Do you have any suggestion where to put it?
NIC_MODE_BRIDGED = "bridged"
NIC_MODE_ROUTED = "routed"
@@ -1333,6 +1334,7 @@ RELEASE_ACTION = "release"
NICS_PARAMETER_TYPES = {
NIC_MODE: VTYPE_STRING,
NIC_LINK: VTYPE_STRING,
+ NIC_VLAN: VTYPE_MAYBE_STRING,
Adding this here breaks instance import for instances which were
exported with older Ganeti versions because...
}
NICS_PARAMETERS = frozenset(NICS_PARAMETER_TYPES.keys())
... the keys of this dict are used here, and that's the required
parameters for nic during instance import.
I understand this. I have not looked at the import script right now, but
is it possible to just leave add an empty value to the dict during
import if the field is not existant?
Cheers, Sebastian
$(buildObject "PartialNic" "nic" $
--
1.8.1.2
--
Thomas Thrainer | Software Engineer |[email protected]
<mailto:[email protected]> |
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
--
Fachschaft Elektrotechnik und Informationstechnik e.V.
Technische Universität München Tel: +49 89 289 22998
Arcisstr. 21 Fax: +49 89 289 25140
80333 München : http://www.fs.ei.tum.de
