bug fixes and add text report
diff --git a/configs-examples/v2_default.yaml b/configs-examples/default.yaml
similarity index 76%
rename from configs-examples/v2_default.yaml
rename to configs-examples/default.yaml
index 931d101..c3614ba 100644
--- a/configs-examples/v2_default.yaml
+++ b/configs-examples/default.yaml
@@ -17,14 +17,18 @@
vms:
- "USERNAME[:PASSWD]@VM_NAME_PREFIX[::KEY_FILE]"
+# nodes: - map of explicit nodes URLS to node roles
+# in format
+# USERNAME[:PASSWD]@VM_NAME_PREFIX[::KEY_FILE] or localhost: role1, role2, role3....
collect_info: true
var_dir_root: /tmp/perf_tests
settings_dir: ~/.wally
-
-logging:
- extra_logs: 1
- level: DEBUG
+connect_timeout: 30
+rpc_log_level: DEBUG
+include: logging.yaml
+default_test_local_folder: "/tmp/wally_{name}_{uuid}"
+keep_raw_files: true
vm_configs:
keypair_file_private: wally_vm_key_perf3.pem
@@ -50,9 +54,11 @@
ceph: nodeep-scrub, noscrub
-
#----------------------------------------- STEPS ------------------------------------------------------------------
-# discover: ...
+# discover: a,b,c,... - comma separated list of clusters to discover. May be ommited
+# List may contains - ceph, openstack, fuel
+# Also - ignore_errors - mean to ignore errors during dicovery
+# metadata - mean to discrover cluster metadata only, but not nodes
# spawn: ...
# connect: ...
# sensors: ...
@@ -64,9 +70,9 @@
testnode: system-cpu, block-io, net-io
ceph-osd: system-cpu, block-io, net-io, ceph
compute:
- system-cpu: *
- block-io: sd*
- net-io: *
+ system-cpu: "*"
+ block-io: "sd*"
+ net-io: "*"
#---------------------------------- TEST PROFILES --------------------------------------------------------------------
profiles:
@@ -85,21 +91,21 @@
load: ceph
params:
FILENAME: /dev/vdb
- TEST_FILE_SIZE: AUTO
+ FILESIZE: AUTO
cinder_iscsi_vdb:
- io:
load: cinder_iscsi
params:
FILENAME: /dev/vdb
- TEST_FILE_SIZE: AUTO
+ FILESIZE: AUTO
nova_io:
- io:
load: hdd
params:
FILENAME: /dev/vdb
- TEST_FILE_SIZE: AUTO
+ FILESIZE: AUTO
openstack_ceph: OS_1_to_1 + ceph_vdb
openstack_cinder: OS_1_to_1 + ceph_iscsi_vdb
diff --git a/configs-examples/local_hdd.yaml b/configs-examples/local_hdd.yaml
new file mode 100644
index 0000000..39af205
--- /dev/null
+++ b/configs-examples/local_hdd.yaml
@@ -0,0 +1,13 @@
+include: default.yaml
+run_sensors: true
+results_storage: /var/wally_results
+
+nodes:
+ localhost: testnode
+
+tests:
+ - fio:
+ load: verify
+ params:
+ FILENAME: /dev/rbd0
+ FILESIZE: 4G
diff --git a/configs-examples/logging.yaml b/configs-examples/logging.yaml
new file mode 100644
index 0000000..e56c6c7
--- /dev/null
+++ b/configs-examples/logging.yaml
@@ -0,0 +1,26 @@
+logging:
+ version: 1
+ disable_existing_loggers: true
+ formatters:
+ simple:
+ format: "%(asctime)s - %(levelname)s - %(message)s"
+ datefmt: "%H:%M:%S"
+ handlers:
+ console:
+ level: INFO
+ class: logging.StreamHandler
+ formatter: simple
+ stream: "ext://sys.stdout"
+ log_file:
+ level: DEBUG
+ class: logging.FileHandler
+ formatter: simple
+ filename: null
+ loggers:
+ cmd: {"level": "DEBUG", "handlers": ["console", "log_file"]}
+ storage: {"level": "DEBUG", "handlers": ["console", "log_file"]}
+ rpc: {"level": "DEBUG", "handlers": ["console", "log_file"]}
+ cephlib: {"level": "DEBUG", "handlers": ["console", "log_file"]}
+ collect: {"level": "DEBUG", "handlers": ["console", "log_file"]}
+ agent: {"level": "DEBUG", "handlers": ["console", "log_file"]}
+ wally: {"level": "DEBUG", "handlers": ["console", "log_file"]}
diff --git a/configs-examples/v2_user.yaml b/configs-examples/openstack_ceph.yaml
similarity index 95%
rename from configs-examples/v2_user.yaml
rename to configs-examples/openstack_ceph.yaml
index 32e5a6d..efd51ff 100644
--- a/configs-examples/v2_user.yaml
+++ b/configs-examples/openstack_ceph.yaml
@@ -1,4 +1,4 @@
-include: v2_default.yaml
+include: default.yaml
discover: openstack,fuel_openrc_only
run_sensors: true
results_storage: /var/wally_results