To keep backwards compatibility with old RAPI, make network_vlan param of OpNetworkConnect optional. If not passed, cmdlib will use the empty string as default value.
Signed-off-by: Dimitris Aragiorgis <[email protected]> --- lib/cmdlib/network.py | 5 ++++- src/Ganeti/OpParams.hs | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/cmdlib/network.py b/lib/cmdlib/network.py index d93f2dd..c2f3bcb 100644 --- a/lib/cmdlib/network.py +++ b/lib/cmdlib/network.py @@ -572,7 +572,10 @@ class LUNetworkConnect(LogicalUnit): self.group_name = self.op.group_name self.network_mode = self.op.network_mode self.network_link = self.op.network_link - self.network_vlan = self.op.network_vlan + if self.op.network_vlan: + self.network_vlan = self.op.network_vlan + else: + self.network_vlan = "" self.network_uuid = self.cfg.LookupNetwork(self.network_name) self.group_uuid = self.cfg.LookupNodeGroup(self.group_name) diff --git a/src/Ganeti/OpParams.hs b/src/Ganeti/OpParams.hs index ae00822..d24b440 100644 --- a/src/Ganeti/OpParams.hs +++ b/src/Ganeti/OpParams.hs @@ -1635,4 +1635,4 @@ pNetworkLink = pNetworkVlan :: Field pNetworkVlan = withDoc "Network vlan when connecting to a group" $ - simpleField "network_vlan" [t| String |] + optionalField $ simpleField "network_vlan" [t| String |] -- 1.7.10.4
