performa/shaker
Code Issues Proposed changes

Merge "Adjust new config options to use dash instead of underscore"

Browse Source
This commit is contained in:
Zuul
2018-12-10 21:20:06 +00:00
committed by Gerrit Code Review
parent 3d1d37b96a 6bddae1810
commit db5f9ca053
4 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
doc/source/tools/shaker-all-in-one.txt
View File

@@ -3,7 +3,7 @@ usage: shaker-all-in-one [-h] [--agent-join-timeout AGENT_JOIN_TIMEOUT]
[--artifacts-dir ARTIFACTS_DIR] [--book BOOK]
[--cleanup] [--cleanup-on-error] [--config-dir DIR]
[--config-file PATH]
[--custom_user_opts CUSTOM_USER_OPTS] [--debug]
[--custom-user-opts CUSTOM_USER_OPTS] [--debug]
[--dns-nameservers DNS_NAMESERVERS]
[--external-net EXTERNAL_NET]
[--flavor-disk FLAVOR_DISK]
@@ -34,8 +34,8 @@ usage: shaker-all-in-one [-h] [--agent-join-timeout AGENT_JOIN_TIMEOUT]
[--polling-interval POLLING_INTERVAL]
[--report REPORT] [--report-template REPORT_TEMPLATE]
[--scenario SCENARIO]
[--scenario_availability_zone SCENARIO_AVAILABILITY_ZONE]
[--scenario_compute_nodes SCENARIO_COMPUTE_NODES]
[--scenario-availability-zone SCENARIO_AVAILABILITY_ZONE]
[--scenario-compute-nodes SCENARIO_COMPUTE_NODES]
[--server-endpoint SERVER_ENDPOINT]
[--subunit SUBUNIT]
[--syslog-log-facility SYSLOG_LOG_FACILITY]
@@ -70,7 +70,7 @@ optional arguments:
--config-file PATH Path to a config file to use. Multiple config files
can be specified, with values in later files taking
precedence. Defaults to None.
--custom_user_opts CUSTOM_USER_OPTS
--custom-user-opts CUSTOM_USER_OPTS
Set custom user option parameters for the scenario.
The value is specified in YAML, e.g. custom_user_opts
= { key1:value1, key2:value2} The values specified can
@@ -235,12 +235,12 @@ optional arguments:
"openstack/udp_l3_north_south", "spot/ping",
"spot/tcp", "spot/udp". Defaults to
env[SHAKER_SCENARIO].
--scenario_availability_zone SCENARIO_AVAILABILITY_ZONE
--scenario-availability-zone SCENARIO_AVAILABILITY_ZONE
Comma-separated list of availability_zone. If
specified this setting will override the
availability_zone accomodation setting in the scenario
test definition.Defaults to SCENARIO_AVAILABILITY_ZONE
--scenario_compute_nodes SCENARIO_COMPUTE_NODES
--scenario-compute-nodes SCENARIO_COMPUTE_NODES
Number of compute_nodes. If specified this setting
will override the compute_nodes accomodation setting
in the scenario test definition. Defaults to

12
doc/source/tools/shaker-spot.txt
View File

@@ -1,14 +1,14 @@
usage: shaker-spot [-h] [--artifacts-dir ARTIFACTS_DIR] [--book BOOK]
[--config-dir DIR] [--config-file PATH]
[--custom_user_opts CUSTOM_USER_OPTS] [--debug]
[--custom-user-opts CUSTOM_USER_OPTS] [--debug]
[--log-config-append PATH] [--log-date-format DATE_FORMAT]
[--log-dir LOG_DIR] [--log-file PATH] [--matrix MATRIX]
[--no-report-on-error] [--nodebug] [--nono-report-on-error]
[--nouse-journal] [--nouse-json] [--nouse-syslog]
[--nowatch-log-file] [--output OUTPUT] [--report REPORT]
[--report-template REPORT_TEMPLATE] [--scenario SCENARIO]
[--scenario_availability_zone SCENARIO_AVAILABILITY_ZONE]
[--scenario_compute_nodes SCENARIO_COMPUTE_NODES]
[--scenario-availability-zone SCENARIO_AVAILABILITY_ZONE]
[--scenario-compute-nodes SCENARIO_COMPUTE_NODES]
[--subunit SUBUNIT]
[--syslog-log-facility SYSLOG_LOG_FACILITY] [--use-journal]
[--use-json] [--use-syslog] [--watch-log-file]
@@ -30,7 +30,7 @@ optional arguments:
--config-file PATH Path to a config file to use. Multiple config files
can be specified, with values in later files taking
precedence. Defaults to None.
--custom_user_opts CUSTOM_USER_OPTS
--custom-user-opts CUSTOM_USER_OPTS
Set custom user option parameters for the scenario.
The value is specified in YAML, e.g. custom_user_opts
= { key1:value1, key2:value2} The values specified can
@@ -114,12 +114,12 @@ optional arguments:
"openstack/udp_l3_north_south", "spot/ping",
"spot/tcp", "spot/udp". Defaults to
env[SHAKER_SCENARIO].
--scenario_availability_zone SCENARIO_AVAILABILITY_ZONE
--scenario-availability-zone SCENARIO_AVAILABILITY_ZONE
Comma-separated list of availability_zone. If
specified this setting will override the
availability_zone accomodation setting in the scenario
test definition.Defaults to SCENARIO_AVAILABILITY_ZONE
--scenario_compute_nodes SCENARIO_COMPUTE_NODES
--scenario-compute-nodes SCENARIO_COMPUTE_NODES
Number of compute_nodes. If specified this setting
will override the compute_nodes accomodation setting
in the scenario test definition. Defaults to

12
doc/source/tools/shaker.txt
View File

@@ -2,7 +2,7 @@ usage: shaker [-h] [--agent-join-timeout AGENT_JOIN_TIMEOUT]
[--agent-loss-timeout AGENT_LOSS_TIMEOUT]
[--artifacts-dir ARTIFACTS_DIR] [--book BOOK]
[--cleanup-on-error] [--config-dir DIR] [--config-file PATH]
[--custom_user_opts CUSTOM_USER_OPTS] [--debug]
[--custom-user-opts CUSTOM_USER_OPTS] [--debug]
[--dns-nameservers DNS_NAMESERVERS]
[--external-net EXTERNAL_NET] [--flavor-name FLAVOR_NAME]
[--image-name IMAGE_NAME] [--log-config-append PATH]
@@ -23,8 +23,8 @@ usage: shaker [-h] [--agent-join-timeout AGENT_JOIN_TIMEOUT]
[--os-username <auth-username>] [--output OUTPUT]
[--polling-interval POLLING_INTERVAL] [--report REPORT]
[--report-template REPORT_TEMPLATE] [--scenario SCENARIO]
[--scenario_availability_zone SCENARIO_AVAILABILITY_ZONE]
[--scenario_compute_nodes SCENARIO_COMPUTE_NODES]
[--scenario-availability-zone SCENARIO_AVAILABILITY_ZONE]
[--scenario-compute-nodes SCENARIO_COMPUTE_NODES]
[--server-endpoint SERVER_ENDPOINT] [--subunit SUBUNIT]
[--syslog-log-facility SYSLOG_LOG_FACILITY] [--use-journal]
[--use-json] [--use-syslog] [--watch-log-file]
@@ -56,7 +56,7 @@ optional arguments:
--config-file PATH Path to a config file to use. Multiple config files
can be specified, with values in later files taking
precedence. Defaults to None.
--custom_user_opts CUSTOM_USER_OPTS
--custom-user-opts CUSTOM_USER_OPTS
Set custom user option parameters for the scenario.
The value is specified in YAML, e.g. custom_user_opts
= { key1:value1, key2:value2} The values specified can
@@ -195,12 +195,12 @@ optional arguments:
"openstack/udp_l3_north_south", "spot/ping",
"spot/tcp", "spot/udp". Defaults to
env[SHAKER_SCENARIO].
--scenario_availability_zone SCENARIO_AVAILABILITY_ZONE
--scenario-availability-zone SCENARIO_AVAILABILITY_ZONE
Comma-separated list of availability_zone. If
specified this setting will override the
availability_zone accomodation setting in the scenario
test definition.Defaults to SCENARIO_AVAILABILITY_ZONE
--scenario_compute_nodes SCENARIO_COMPUTE_NODES
--scenario-compute-nodes SCENARIO_COMPUTE_NODES
Number of compute_nodes. If specified this setting
will override the compute_nodes accomodation setting
in the scenario test definition. Defaults to

6
shaker/engine/config.py
View File

@@ -215,19 +215,19 @@ SCENARIO_OPTS = [
deprecated_for_removal=True,
default=(utils.env('SHAKER_NO_REPORT_ON_ERROR') or False),
help='Do not generate report for failed scenarios'),
cfg.ListOpt('scenario_availability_zone',
cfg.ListOpt('scenario-availability-zone',
default=utils.env('SCENARIO_AVAILABILITY_ZONE'),
help='Comma-separated list of availability_zone. If specified '
'this setting will override the availability_zone '
'accomodation setting in the scenario test definition.'
'Defaults to SCENARIO_AVAILABILITY_ZONE'),
cfg.IntOpt('scenario_compute_nodes',
cfg.IntOpt('scenario-compute-nodes',
default=utils.env('SCENARIO_COMPUTE_NODES'),
help='Number of compute_nodes. If specified this setting will '
'override the compute_nodes accomodation setting in the '
'scenario test definition. '
'Defaults to SCENARIO_COMPUTE_NODES'),
cfg.Opt('custom_user_opts',
cfg.Opt('custom-user-opts',
default=utils.env('CUSTOM_USER_OPTS'),
type=Yaml(),
help='Set custom user option parameters for the scenario. '