Re: [PATCH 6/6] lnst-ctl: add --pools option

[Jan Tluka]

Mon, Dec 14, 2015 at 09:45:43AM CET, olichtne(a)redhat.com wrote:
> From: Ondrej Lichtner <olichtne(a)redhat.com&gt;
>
> You can now specify which (by name) which pools should be used in a
> lnst-ctl run.
>
> Resolves issue #157.
>
> Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
> ---
>  lnst-ctl                             | 14 ++++++++++----
>  lnst/Controller/NetTestController.py | 15 +++++++++++++--
>  2 files changed, 23 insertions(+), 6 deletions(-)
>
> diff --git a/lnst-ctl b/lnst-ctl
> index eaa2558..c991247 100755
> --- a/lnst-ctl
> +++ b/lnst-ctl
> @@ -51,6 +51,8 @@ def usage(retval=0):
>                "machines in the pool"
>      print "  -p, --packet-capture            capture and log all ongoing " \
>                "network communication during the test"
> +    print "      --pools=NAME[,...]          restricts which pools to use "\
> +              "for matching"
>      print "  -r, --reduce-sync               reduces resource synchronization
> "\
>                "for python tasks, see documentation"
>      print "  -s, --xslt-url=URL              URL to a XSLT document that will
> "\
> @@ -87,7 +89,7 @@ def exec_action(action, nettestctl):
>  def get_recipe_result(action, file_path, log_ctl, res_serializer,
>                        pool_checks, packet_capture,
>                        defined_aliases, overriden_aliases,
> -                      reduce_sync, multi_match):
> +                      reduce_sync, multi_match, pools):
>      retval = RETVAL_PASS
>  
>      matches = 1
> @@ -106,7 +108,8 @@ def get_recipe_result(action, file_path, log_ctl, res_serializer,
>                                         packet_capture=packet_capture,
>                                         defined_aliases=defined_aliases,
>                                         overriden_aliases=overriden_aliases,
> -                                       reduce_sync=reduce_sync)
> +                                       reduce_sync=reduce_sync,
> +                                       restrict_pools=pools)
>      except XmlProcessingError as err:
>          log_exc_traceback()
>          logging.error(err)
> @@ -199,6 +202,7 @@ def main():
>               "html=",
>               "multi-match",
>               "result=",
> +             "pools="
>              ]
>          )
>      except getopt.GetoptError as err:
> @@ -238,6 +242,7 @@ def main():
>      reduce_sync = False
>      multi_match = False
>      dump_config = False
> +    pools = []
>      for opt, arg in opts:
>          if opt in ("-d", "--debug"):
>              debug += 1
> @@ -271,7 +276,8 @@ def main():
>              multi_match = True
>          elif opt in ("--dump-config"):
>              dump_config = True
> -
> +        elif opt in ("--pools"):
> +            pools.extend(arg.split(","))
>  
>      if xslt_url != None:
>          lnst_config.set_option("environment", "xslt_url", xslt_url)
> @@ -330,7 +336,7 @@ def main():
>          rv = get_recipe_result(action, recipe_file, log_ctl, res_serializer,
>                                 pool_checks, packet_capture,
>                                 defined_aliases, overriden_aliases,
> -                               reduce_sync, multi_match)
> +                               reduce_sync, multi_match, pools)
>          if rv > retval:
>              retval = rv
>  
> diff --git a/lnst/Controller/NetTestController.py b/lnst/Controller/NetTestController.py
> index 71ccc32..2afa992 100644
> --- a/lnst/Controller/NetTestController.py
> +++ b/lnst/Controller/NetTestController.py
> @@ -54,7 +54,7 @@ class NetTestController:
>                   res_serializer=None, pool_checks=True,
>                   packet_capture=False,
>                   defined_aliases=None, overriden_aliases=None,
> -                 reduce_sync=False):
> +                 reduce_sync=False, restrict_pools=[]):
>          self._res_serializer = res_serializer
>          self._remote_capture_files = {}
>          self._log_ctl = log_ctl
> @@ -77,7 +77,18 @@ class NetTestController:
>          self._parser.set_aliases(defined_aliases, overriden_aliases)
>          self._recipe = self._parser.parse()
>  
> -        sp = SlavePool(lnst_config.get_pools(), pool_checks)
> +        conf_pools = lnst_config.get_pools()
> +        pools = {}
> +        if len(restrict_pools) > 0:
> +            for pool_name in restrict_pools:
> +                if pool_name in conf_pools:
> +                    pools[pool_name] = conf_pools[pool_name]
> +                else:
> +                    raise NetTestError("Pool %s does not exist!" % pool_name)
> +        else:
> +            pools = conf_pools
> +
> +        sp = SlavePool(pools, pool_checks)
>          self._slave_pool = sp
>  
>          mreq = self._get_machine_requirements()
> -- 
> 2.6.4
> _______________________________________________
> LNST-developers mailing list
> lnst-developers(a)lists.fedorahosted.org
> https://lists.fedorahosted.org/admin/lists/[e-mail]... 
Ack to series.

One more thing is the followup patch that we discussed on IRC regarding
possibility to specify '--pools /my/path/to/pool' that would override
any defined pools.

Acked-by: Jan Tluka <jtluka(a)redhat.com&gt;