On Thu, Dec 8, 2011 at 11:29 AM, Iustin Pop <[email protected]> wrote:
> On Thu, Dec 08, 2011 at 11:26:45AM +0100, Agata Murawska wrote:
>> Also, since both cluster init and modify use options for instance
>> policy, I extracted them as a separate list.
>
> LGTM, only one tiny comment:
>
>> +instance_policy_opts = [
>> + SPECS_CPU_COUNT_OPT,
>> + SPECS_DISK_COUNT_OPT,
>> + SPECS_DISK_SIZE_OPT,
>> + SPECS_MEM_SIZE_OPT,
>> + SPECS_NIC_COUNT_OPT,
>> + ]
>>
>> commands = {
>> "init": (
>> @@ -1403,8 +1410,7 @@ commands = {
>> MAINTAIN_NODE_HEALTH_OPT, UIDPOOL_OPT, DRBD_HELPER_OPT,
>> NODRBD_STORAGE_OPT,
>> DEFAULT_IALLOCATOR_OPT, PRIMARY_IP_VERSION_OPT,
>> PREALLOC_WIPE_DISKS_OPT,
>> NODE_PARAMS_OPT, GLOBAL_SHARED_FILEDIR_OPT, USE_EXTERNAL_MIP_SCRIPT,
>> - DISK_PARAMS_OPT, MEM_COUNT_SPECS_OPT, CPU_COUNT_SPECS_OPT,
>> - DISK_COUNT_SPECS_OPT, DISK_SIZE_SPECS_OPT, NIC_COUNT_SPECS_OPT],
>> + DISK_PARAMS_OPT] + instance_policy_opts,
>
> Since instance_policy_opts is kind of a constant here, I kindly ask you
> to uppercase it.
Ack (I used lowercase because the same was done in gnt_instance with add_opts)
>
> thanks,
> iustin
interdiff:
diff --git a/lib/client/gnt_cluster.py b/lib/client/gnt_cluster.py
index ccf6137..73f35ee 100644
--- a/lib/client/gnt_cluster.py
+++ b/lib/client/gnt_cluster.py
@@ -1392,7 +1392,7 @@ def Epo(opts, args):
else:
return _EpoOff(opts, node_list, inst_map)
-instance_policy_opts = [
+INSTANCE_POLICY_OPTS = [
SPECS_CPU_COUNT_OPT,
SPECS_DISK_COUNT_OPT,
SPECS_DISK_SIZE_OPT,
@@ -1410,7 +1410,7 @@ commands = {
MAINTAIN_NODE_HEALTH_OPT, UIDPOOL_OPT, DRBD_HELPER_OPT,
NODRBD_STORAGE_OPT,
DEFAULT_IALLOCATOR_OPT, PRIMARY_IP_VERSION_OPT, PREALLOC_WIPE_DISKS_OPT,
NODE_PARAMS_OPT, GLOBAL_SHARED_FILEDIR_OPT, USE_EXTERNAL_MIP_SCRIPT,
- DISK_PARAMS_OPT] + instance_policy_opts,
+ DISK_PARAMS_OPT] + INSTANCE_POLICY_OPTS,
"[opts...] <cluster_name>", "Initialises a new cluster configuration"),
"destroy": (
DestroyCluster, ARGS_NONE, [YES_DOIT_OPT],
@@ -1488,7 +1488,7 @@ commands = {
DRBD_HELPER_OPT, NODRBD_STORAGE_OPT, DEFAULT_IALLOCATOR_OPT,
RESERVED_LVS_OPT, DRY_RUN_OPT, PRIORITY_OPT, PREALLOC_WIPE_DISKS_OPT,
NODE_PARAMS_OPT, USE_EXTERNAL_MIP_SCRIPT, DISK_PARAMS_OPT] +
- instance_policy_opts,
+ INSTANCE_POLICY_OPTS,
"[opts...]",
"Alters the parameters of the cluster"),
"renew-crypto": (
