Commit ae860154 authored by Christos Stavrakakis's avatar Christos Stavrakakis Committed by Helga Velroyen
Browse files

Add IDISK_NAME and INIC_NAME constants



Declare IDISK_NAME and INIC_NAME constants and add them to the
IDISK_PARAMS_TYPE and INIC_PARAMS_TYPE.
Signed-off-by: default avatarChristos Stavrakakis <cstavr@grnet.gr>
Signed-off-by: default avatarDimitris Aragiorgis <dimara@grnet.gr>
Reviewed-by: default avatarHelga Velroyen <helgav@google.com>
parent 238da95a
...@@ -7662,6 +7662,7 @@ class LUInstanceRecreateDisks(LogicalUnit): ...@@ -7662,6 +7662,7 @@ class LUInstanceRecreateDisks(LogicalUnit):
constants.IDISK_VG, constants.IDISK_VG,
constants.IDISK_METAVG, constants.IDISK_METAVG,
constants.IDISK_PROVIDER, constants.IDISK_PROVIDER,
constants.IDISK_NAME,
])) ]))
   
def _RunAllocator(self): def _RunAllocator(self):
......
...@@ -1328,6 +1328,7 @@ IDISK_ADOPT = "adopt" ...@@ -1328,6 +1328,7 @@ IDISK_ADOPT = "adopt"
IDISK_VG = "vg" IDISK_VG = "vg"
IDISK_METAVG = "metavg" IDISK_METAVG = "metavg"
IDISK_PROVIDER = "provider" IDISK_PROVIDER = "provider"
IDISK_NAME = "name"
IDISK_PARAMS_TYPES = { IDISK_PARAMS_TYPES = {
IDISK_SIZE: VTYPE_SIZE, IDISK_SIZE: VTYPE_SIZE,
IDISK_MODE: VTYPE_STRING, IDISK_MODE: VTYPE_STRING,
...@@ -1335,6 +1336,7 @@ IDISK_PARAMS_TYPES = { ...@@ -1335,6 +1336,7 @@ IDISK_PARAMS_TYPES = {
IDISK_VG: VTYPE_STRING, IDISK_VG: VTYPE_STRING,
IDISK_METAVG: VTYPE_STRING, IDISK_METAVG: VTYPE_STRING,
IDISK_PROVIDER: VTYPE_STRING, IDISK_PROVIDER: VTYPE_STRING,
IDISK_NAME: VTYPE_MAYBE_STRING,
} }
IDISK_PARAMS = frozenset(IDISK_PARAMS_TYPES.keys()) IDISK_PARAMS = frozenset(IDISK_PARAMS_TYPES.keys())
...@@ -1344,12 +1346,14 @@ INIC_IP = "ip" ...@@ -1344,12 +1346,14 @@ INIC_IP = "ip"
INIC_MODE = "mode" INIC_MODE = "mode"
INIC_LINK = "link" INIC_LINK = "link"
INIC_NETWORK = "network" INIC_NETWORK = "network"
INIC_NAME = "name"
INIC_PARAMS_TYPES = { INIC_PARAMS_TYPES = {
INIC_IP: VTYPE_MAYBE_STRING, INIC_IP: VTYPE_MAYBE_STRING,
INIC_LINK: VTYPE_STRING, INIC_LINK: VTYPE_STRING,
INIC_MAC: VTYPE_STRING, INIC_MAC: VTYPE_STRING,
INIC_MODE: VTYPE_STRING, INIC_MODE: VTYPE_STRING,
INIC_NETWORK: VTYPE_MAYBE_STRING, INIC_NETWORK: VTYPE_MAYBE_STRING,
INIC_NAME: VTYPE_MAYBE_STRING,
} }
INIC_PARAMS = frozenset(INIC_PARAMS_TYPES.keys()) INIC_PARAMS = frozenset(INIC_PARAMS_TYPES.keys())
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment