On Fri, Jul 30, 2010 at 10:33, Michael Hanselmann <[email protected]> wrote:
> Also add some assertions.
> ---
> lib/constants.py | 17 ++++++++++++++++-
> 1 files changed, 16 insertions(+), 1 deletions(-)
>
> diff --git a/lib/constants.py b/lib/constants.py
> index a04dbad..2c0fe0e 100644
> --- a/lib/constants.py
> +++ b/lib/constants.py
> @@ -597,6 +597,8 @@ HVS_PARAMETER_TYPES = {
>
> HVS_PARAMETERS = frozenset(HVS_PARAMETER_TYPES.keys())
>
> +assert frozenset(HVS_PARAMETER_TYPES.keys()) == HVS_PARAMETERS
I'm sorry, but what are you actually asserting here? That frozenset
works? And similar below.
> # BE parameter names
> BE_MEMORY = "memory"
> BE_VCPUS = "vcpus"
> @@ -610,6 +612,8 @@ BES_PARAMETER_TYPES = {
>
> BES_PARAMETERS = frozenset(BES_PARAMETER_TYPES.keys())
>
> +assert frozenset(BES_PARAMETER_TYPES.keys()) == BES_PARAMETERS
> +
> # Instance Parameters Profile
> PP_DEFAULT = "default"
>
> @@ -628,6 +632,8 @@ NICS_PARAMETER_TYPES = {
>
> NICS_PARAMETERS = frozenset(NICS_PARAMETER_TYPES.keys())
>
> +assert frozenset(NICS_PARAMETER_TYPES.keys()) == NICS_PARAMETERS
> +
> IDISK_SIZE = "size"
> IDISK_MODE = "mode"
> IDISK_ADOPT = "adopt"
> @@ -637,13 +643,22 @@ IDISK_PARAMS_TYPES = {
> IDISK_MODE: VTYPE_STRING,
> IDISK_ADOPT: VTYPE_STRING,
> }
> +assert frozenset(IDISK_PARAMS_TYPES.keys()) == IDISK_PARAMS
> +
> 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,
> + }
This change LGTM, but the asserts seems out of place.
iustin
