commit ceae204217136a27d685dbd3af98e35be09f31a9
author Yaroslav Lobankov <ylobankov@mirantis.com> Wed Sep 09 19:25:14 2015 +0300
committer Yaroslav Lobankov <ylobankov@mirantis.com> Wed Sep 09 19:36:29 2015 +0300
tree 34c4ba056423fdc18842bfc544a4fcdc957471df
parent d05a3c26cd1b492c0466737972ea05d339f224d6

Add possibility to skip test_subnet_details if DHCP client not available

The help message of the dhcp_client option from the scenario section says
"...If left empty, update operation will be skipped. ...", but allowed
choises are only "udhcpc" and "dhclient". So we don't have any way to skip
the test_subnet_details test if DHCP client is not available. This patch
fixes the issue.

Change-Id: I10c403f4da257e6b39b855ae8b4b9ac16a8e7fc4
Closes-Bug: #1493909

tempest/config.py

diff --git a/tempest/config.py b/tempest/config.py
index 7655c75..1da63dc 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -1036,7 +1036,7 @@
     # TODO(yfried): add support for dhcpcd
     cfg.StrOpt('dhcp_client',
                default='udhcpc',
-               choices=["udhcpc", "dhclient"],
+               choices=["udhcpc", "dhclient", ""],
                help='DHCP client used by images to renew DCHP lease. '
                     'If left empty, update operation will be skipped. '
                     'Supported clients: "udhcpc", "dhclient"')