Merge pull request AlexanderChudnovets#8 from chjwang/master

add list_tables, fix benchmark_runner

benchmark_runner.py

@@ -217,7 +217,7 @@ def run_benchmark(config_file, config, testcase):
             config = template
             for key in case:
                 config = config.replace('{{%s}}' % key, case[key])
-            with open(os.path.join(sys.argv[2], 'config.py', 'w') as f:
+            with open(os.path.join(sys.argv[2], 'config.py'), 'w') as f:
                 f.write(config)
             try:
                 run_benchmark(sys.argv[1], conf, sys.argv[2])

tests/list_tables/__init__.py

@@ -0,0 +1,2 @@
+from setup import setup
+from teardown import cleanup

tests/list_tables/config.py

@@ -0,0 +1,20 @@
+SLAVE_COUNT = 2
+LOCUST_COUNT = 10
+HATCH_RATE = 10
+MIN_WAIT = 0
+MAX_WAIT = 0
+TABLES_CREATED_3_FIELDS_NO_LSI = 10
+TABLES_CREATED_3_FIELDS_1_LSI = 10
+TABLES_CREATED_10_FIELDS_5_LSI = 10
+TABLE_NAME = "item_metadata"
+LIMIT = 10
+TOKEN_PROJECT = "/tmp/token_project.txt"
+TABLE_LIST='/tmp/table_list.txt'
+ITEM_KEY_LIST = '/tmp/item_key_list.txt'
+CASSANDRA_NODES='127.0.0.1'
+CASSANDRA_CLEANER='/root/scripts/cleaner.sh'
+
+token_req_headers = {
+    'Content-Type': 'application/json',
+    'Accept': 'application/json'
+}

tests/list_tables/ks_config.py

@@ -0,0 +1,20 @@
+import json
+import os.path
+
+import config as cfg
+
+
+TOKEN = None
+PROJECT_ID = None
+
+if os.path.isfile(cfg.TOKEN_PROJECT):
+    with open(cfg.TOKEN_PROJECT) as token_proj_file:
+        token_project = json.load(token_proj_file)
+        TOKEN = token_project['token'].strip()
+        PROJECT_ID = token_project['project_id'].strip()
+
+req_headers = {
+    'Content-Type': 'application/json',
+    'Accept': 'application/json',
+    'X-Auth-Token': TOKEN
+}