From cc87d7364c2abecb9fd9662d05da3f2ed7ce2af8 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Fri, 30 Jul 2010 16:32:33 +0200
Subject: [PATCH] Allow instance NIC's IP address to be None
Also add some assertions.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/constants.py | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/lib/constants.py b/lib/constants.py
index a04dbadeb..e13df8edc 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -631,19 +631,26 @@ NICS_PARAMETERS = frozenset(NICS_PARAMETER_TYPES.keys())
IDISK_SIZE = "size"
IDISK_MODE = "mode"
IDISK_ADOPT = "adopt"
-IDISK_PARAMS = frozenset([IDISK_SIZE, IDISK_MODE, IDISK_ADOPT])
IDISK_PARAMS_TYPES = {
IDISK_SIZE: VTYPE_SIZE,
IDISK_MODE: VTYPE_STRING,
IDISK_ADOPT: VTYPE_STRING,
}
+IDISK_PARAMS = frozenset(IDISK_PARAMS_TYPES.keys())
+
INIC_MAC = "mac"
INIC_IP = "ip"
INIC_MODE = "mode"
INIC_LINK = "link"
INIC_BRIDGE = "bridge"
-INIC_PARAMS = frozenset([INIC_MAC, INIC_IP, INIC_MODE, INIC_LINK, INIC_BRIDGE])
-INIC_PARAMS_TYPES = dict([(name, VTYPE_STRING) for name in INIC_PARAMS])
+INIC_PARAMS_TYPES = {
+ INIC_BRIDGE: VTYPE_STRING,
+ INIC_IP: VTYPE_MAYBE_STRING,
+ INIC_LINK: VTYPE_STRING,
+ INIC_MAC: VTYPE_STRING,
+ INIC_MODE: VTYPE_STRING,
+ }
+INIC_PARAMS = frozenset(INIC_PARAMS_TYPES.keys())
# Hypervisor constants
HT_XEN_PVM = "xen-pvm"
--
GitLab