openstack
/
syntribos
Code Issues Proposed changes

Changing payloads_dir to payloads 

Changing the payloads_dir variable to payloads

Change-Id: I55ae283d1b4b92d397c1cd85acd7c88f9bbe87fd
This commit is contained in:
Vinay Potluri 2016-10-25 18:41:14 -05:00 committed by Charles Neill
parent 6945d31c98
commit 34091d3599
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.rst
View File

@ -217,7 +217,7 @@ file.
endpoint=http://localhost:5000 endpoint=http://localhost:5000
# Set payload and templates path # Set payload and templates path
templates=<location_of_templates_dir/file> templates=<location_of_templates_dir/file>
payloads_dir=<location_of_payloads_dir> payloads=<location_of_payloads_dir>
[user] [user]
# #
@ -251,7 +251,7 @@ Downloading templates and payloads remotely
Payload and template files can be downloaded remotely in syntribos. Payload and template files can be downloaded remotely in syntribos.
In the config file under ``[syntribos]`` section, if ``templates`` In the config file under ``[syntribos]`` section, if ``templates``
and ``payloads_dir`` options are not set then by default syntribos will and ``payloads`` options are not set then by default syntribos will
download templates for a few OpenStack projects and all the download templates for a few OpenStack projects and all the
latest payloads. As a user you can specify a URI to download custom latest payloads. As a user you can specify a URI to download custom
templates and payloads from as well; this is done by using templates and payloads from as well; this is done by using
@ -294,7 +294,7 @@ necessary fields like user credentials, log, template directory etc.
endpoint=http://localhost:5000 endpoint=http://localhost:5000
# Set payload and templates path # Set payload and templates path
templates=<location_of_templates_dir/file> templates=<location_of_templates_dir/file>
payloads_dir=<location_of_payloads_dir> payloads=<location_of_payloads_dir>
[user] [user]
# #

6
doc/source/configuration.rst
View File

@ -21,7 +21,7 @@ file.
endpoint=http://localhost:5000 endpoint=http://localhost:5000
# Set payload and templates path # Set payload and templates path
templates=<location_of_templates_dir/file> templates=<location_of_templates_dir/file>
payloads_dir=<location_of_payloads_dir> payloads=<location_of_payloads_dir>
[user] [user]
# #
@ -55,7 +55,7 @@ Downloading templates and payloads remotely
Payload and template files can be downloaded remotely in syntribos. Payload and template files can be downloaded remotely in syntribos.
In the config file under ``[syntribos]`` section, if ``templates`` In the config file under ``[syntribos]`` section, if ``templates``
and ``payloads_dir`` options are not set then by default syntribos will and ``payloads`` options are not set then by default syntribos will
download templates for a few OpenStack projects and all the download templates for a few OpenStack projects and all the
latest payloads. As a user you can specify a URI to download custom latest payloads. As a user you can specify a URI to download custom
templates and payloads from as well; this is done by using templates and payloads from as well; this is done by using
@ -98,7 +98,7 @@ necessary fields like user credentials, log, template directory etc.
endpoint=http://localhost:5000 endpoint=http://localhost:5000
# Set payload and templates path # Set payload and templates path
templates=<location_of_templates_dir/file> templates=<location_of_templates_dir/file>
payloads_dir=<location_of_payloads_dir> payloads=<location_of_payloads_dir>
[user] [user]
# #

4
doc/source/man/syntribos.rst
View File

@ -12,7 +12,7 @@ syntribos [-h] [--colorize] [--config-dir DIR] [--config-file PATH]
[--outfile OUTFILE] [--test-types TEST_TYPES] [--outfile OUTFILE] [--test-types TEST_TYPES]
[--syntribos-endpoint SYNTRIBOS_ENDPOINT] [--syntribos-endpoint SYNTRIBOS_ENDPOINT]
[--syntribos-exclude_results SYNTRIBOS_EXCLUDE_RESULTS] [--syntribos-exclude_results SYNTRIBOS_EXCLUDE_RESULTS]
[--syntribos-payloads_dir SYNTRIBOS_PAYLOADS_DIR] [--syntribos-payloads SYNTRIBOS_PAYLOADS_DIR]
[--syntribos-templates SYNTRIBOS_TEMPLATES] [--syntribos-templates SYNTRIBOS_TEMPLATES]
{list_tests,run,dry_run} ... {list_tests,run,dry_run} ...
@ -65,7 +65,7 @@ Main Syntribos Config:
The target host to be tested The target host to be tested
--syntribos-exclude_results SYNTRIBOS_EXCLUDE_RESULTS --syntribos-exclude_results SYNTRIBOS_EXCLUDE_RESULTS
Defect types to exclude from the results output Defect types to exclude from the results output
--syntribos-payloads_dir SYNTRIBOS_PAYLOADS_DIR --syntribos-payloads SYNTRIBOS_PAYLOADS_DIR
The location where we can find syntribos' payloads The location where we can find syntribos' payloads
--syntribos-templates SYNTRIBOS_TEMPLATES --syntribos-templates SYNTRIBOS_TEMPLATES
A directory of template files, or a single template A directory of template files, or a single template

2
examples/configs/keystone.conf
View File

@ -4,7 +4,7 @@
endpoint=http://localhost:5000 endpoint=http://localhost:5000
# Set payload and templates path # Set payload and templates path
templates=<location_of_templates_dir/file> templates=<location_of_templates_dir/file>
payloads_dir=<location_of_payloads_dir> payloads=<location_of_payloads_dir>
[user] [user]
# #

2
syntribos/config.py
View File

@ -214,7 +214,7 @@ def list_syntribos_opts():
sample_default="~/.syntribos/templates", sample_default="~/.syntribos/templates",
help="A directory of template files, or a single template " help="A directory of template files, or a single template "
"file, to test on the target API"), "file, to test on the target API"),
cfg.StrOpt("payloads_dir", default="", cfg.StrOpt("payloads", default="",
sample_default="~/.syntribos/data", sample_default="~/.syntribos/data",
help="The location where we can find syntribos' payloads"), help="The location where we can find syntribos' payloads"),
cfg.MultiStrOpt("exclude_results", cfg.MultiStrOpt("exclude_results",

8
syntribos/tests/fuzz/base_fuzz.py
View File

@ -31,10 +31,10 @@ class BaseFuzzTestCase(base.BaseTestCase):
@classmethod @classmethod
def _get_strings(cls, file_name=None): def _get_strings(cls, file_name=None):
payloads_dir = CONF.syntribos.payloads_dir payloads = CONF.syntribos.payloads
if not payloads_dir: if not payloads:
payloads_dir = remotes.get(CONF.remote.payloads_uri) payloads = remotes.get(CONF.remote.payloads_uri)
path = os.path.join(payloads_dir, file_name or cls.data_key) path = os.path.join(payloads, file_name or cls.data_key)
with open(path, "rb") as fp: with open(path, "rb") as fp:
return fp.read().splitlines() return fp.read().splitlines()