table crud

tests/get_item_populated_table/config.py

@@ -1,4 +1,3 @@
-IS_FIRST_RUN = False
 SLAVE_COUNT = 2
 LOCUST_COUNT = 10
 HATCH_RATE = 10

tests/get_item_populated_table/setup.py

@@ -1,4 +1,3 @@
-import importlib
 import os
 import random
 import string
@@ -167,7 +166,7 @@ def setup(host, keystone_url, user, password, domain_name, project_name):
     kscfg.TOKEN = token
     kscfg.PROJECT_ID = project_id
     kscfg.req_headers['X-Auth-Token'] = token
-    print "req_headers: %s", json.dumps(kscfg.req_headers)
+
     table_3_fields_no_lsi_list = []
     table_3_fields_1_lsi_list = []
     table_10_fields_5_lsi_list = []

tests/get_item_populated_table/teardown.py

@@ -3,8 +3,8 @@
 
 import requests
 
-import ks_config as kscfg
 import config as cfg
+import ks_config as kscfg
 
 
 def cleanup(host):

tests/kvaasloader/config.py

@@ -1,4 +1,3 @@
-IS_FIRST_RUN = False
 SLAVE_COUNT = 2
 LOCUST_COUNT = 100
 HATCH_RATE = 10

tests/put_item_populated_table/config.py

@@ -1,4 +1,3 @@
-IS_FIRST_RUN = False
 SLAVE_COUNT = 2
 LOCUST_COUNT = 100
 HATCH_RATE = 10

tests/put_item_populated_table/scenario.py

@@ -120,6 +120,7 @@ class MagnetoDBUser(locust.HttpLocust):
     min_wait = cfg.MIN_WAIT
     max_wait = cfg.MAX_WAIT
 
+
 IS_FIRST_RUN = True
 # Master code
 def on_slave_report(client_id, data):

tests/put_item_populated_table/setup.py

@@ -164,7 +164,6 @@ def setup(host, keystone_url, user, password, domain_name, project_name):
     kscfg.PROJECT_ID = project_id
     kscfg.req_headers['X-Auth-Token'] = token
 
-
     table_3_fields_no_lsi_list = []
     table_3_fields_1_lsi_list = []
     table_10_fields_5_lsi_list = []

tests/put_item_populated_table/teardown.py

@@ -5,6 +5,7 @@
 import config as cfg
 import ks_config as kscfg
 
+
 def cleanup(host):
     print "Clean up ..."
     with open(cfg.TABLE_LIST) as table_list_file:

tests_unfinished/query_populated_table/config.py → tests/query_populated_table/config.py

@@ -1,6 +1,5 @@
-IS_FIRST_RUN = False
 SLAVE_COUNT = 2
-LOCUST_COUNT = 100
+LOCUST_COUNT = 10
 HATCH_RATE = 10
 MIN_WAIT = 0
 MAX_WAIT = 0
@@ -9,6 +8,9 @@
 BATCH_SIZE = 1000
 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',

tests/query_populated_table/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
+}

tests_unfinished/table_crud/queries.py → tests/query_populated_table/queries.py

@@ -1,10 +1,3 @@
-import json
-
-
-TABLE_LIST = '/tmp/table_list.txt'
-ITEM_KEY_LIST = '/tmp/item_key_list.txt'
-TOKEN_PROJECT = '/tmp/token_project.txt'
-
 CREATE_TABLE_3_FIELDS_NO_LSI_RQ = '''
 {
     "table_name": "%s",
@@ -638,24 +631,3 @@
     }
 }
 '''
-
-TOKEN = """
-PKIZ_eJydV9lyo0oSfa-vmPcbHWaTbT3cB3aBVYVBBajqTSCbrZBkawHx9ZNIlq-7J3rGPY5QOFiqKvPkOSeTHz_gz7Bdj_zLxIvx4gfCnveU6Mx_2nKvPOVED3NzC_ciappmY5t6aPcm1WdGEb9bBTbdGu4_bV1z8eYuvExFVmjP9BXc9Pd2UVTLl7MvZcpBZJV37832VZYm0sqdNvkZrp19lbvOkKvrU96G1XLRFcjb-KfMTQav3hapuq9WaVgFlV7xOp4EaVQH1BfEKmvikjJwnZJT3uKaV8QqVE71HrGBVXNTr7LWOfAFnGL6hKdyxZde9ZpIe7gWLzNjl7fJsFQcaTzIq70O0_CAreKAMF3HuNbvCbXv8VAc8eD1cN2nlTcu7vJ2-sZTclkI6TWZIperVIMojQevFQ267Nh6Z1ZDLIpTY8vuCQ07VhslGfyGW6Jhit2RWh9Yijuv6uD9SZml8SVVxN3pgaXiiBf-dEzlhkGQ2rCAC6bgM6OhQlxHkEFUEKWGlbjnVLQ8jTvY4D8w-AwbV9dNITKJpf2JXypxgNCTI58Zp1U6kVB-u7lJzpl52WC7nkVdUD2eMG3O89pWAlMb8FnrsbXVAP1-rrJ-PogSK06L4KQat7ZE6ghKlE9YjbXAIgKn8YS3icBu1F7y3viCK-J04YfpL3i63mXK5BllbVxdc59IfOm3LCXiCqw4rl2IqnX2V-BEcy2hLfM2VAmNVQzAo4BGYiQItsKOW7mG6_wc0HggQ1R5G-ABsHG99PfXTUtpPdPv5-fHPqDeEVOmoXmNB8izC-pCCiz7tK7t03crMBYAjeEDyzardHq8nCI-cm2mR6jKSKZdtolE3vKSKdfaszQ6jGQa16Jb3bFCWuwmwHujhN3PxLXh5wvWhh2xdI2nDIDWJ7zG1SuICFgp521XoXHxahZJubU9zQd7giutJ_VIaQw56veBFWp4MVXw4nHCKCmhMgCdXxKLATdiFQWpNwRWMXDqiADy5tRo-FUH52uptEuE8UeaVJmIj6pcqoR469Q3Bq5Tf79KcfWV0vC8InUz4NbrAiAWsRoVCFSRNOyJ5TQI6t6A1gWvm5t8pZel8cGFgzJfEglABvGII1D5Aiq_MBYkbWEFYcsD9vk1p7GEB1JDSmfuOoB0rAVu1GBqT9h14ZGl8sfGcskhlTU4FWKVPKxngHYq77I2vyEssjbqMgXynOFR-9kN9V9BR7-iTqjeYRNQr7Tuv2ngJgH0fQ1gCcQmXUwnDRVOwwEkUCEG4gBOq4HlDZgmNaCsfUcDNwmgoI4BTR00AA_M79f_Vn70u_oT8ESojBJQqA3FUHMBqgXvpJ4c0FHS8ZnXpQA5Fz9x-39RGw8gdZp_Roz-NGR4v-QulPxK9x36YNWEpE7LhjX8RAu-J4G19RclKrEGvaPFQ9LyllcM3Htsad4mmuRu_KHGNBKg-d161vyEA1agjQ1ex6gBhoJV4H7JhhLYWQrYWMFwICJu0uAW_2rt73wpBqAqmMpo7cZPVv7VydE3rbz7auVfnRz9P1b-1cnR92gcngktNDLEZ5b6LbjUhIP1BWB7EEHUMCoEoWAUdaP8CY1HJ0fBhcZ_ZuVfnRx918rzWVJlrqh_Tg1MFeo8wSkosgWK1hGMLjYQR9cIdUoYOnru8pLUsfy71NDvcvtuauh3uX03NfS1TX1aeQovwEiD63AC3QgobCtQRpmkGPpHCdGMo0BZ8zqv0O-sPFNBdUr808ZMYSqrGwm3ocwhVdhYhQEDQKwFAMW60c7hoQR5_6oNmKPWR76MTtz9Ov5FZ8SWF9t-eL1INBnG-fA6wkWnLHV2t4n1M4raB7eC42Big54hI-jGFXZtFbdRM06mjOoKtgjIVv81ituM2F9K-tGhwJE8hVi8vjZX0DjVoeuCZdOxnRcKg_-MNgOYi_bRdP_pUBAxiMn73DFXiczT6JUtPwwFJlZiSh05S33ghGeQNrSA7XCReg3zA_VXMGzLU8w8o4DxXl9K43jfLS1jicN9Z4bMSsLQtTs_iQc7wHrn6nIM3wCdk6QTwCvskVXr2ChIYug5NpLkmCuJhEOts_TL4idLT5JsQ8Tashk22GUDveue1-panbeJBkSSu8yNj0yZHvTCNrCeu8ZiH-idt8K69PlhAd8Vhh7GuuF5hu4H_e5RmUb7WY-MhEyHHU12ZKFthyxKsf7qbsTbfBXP7iThJoXX3WkLrh_iplBF-t5vMlq8F75Eyd386Qk9GcY0eDNO87fjydE2S_WNNlmjavNDY6p7Fs1X_gSmpF2cvMptu1waOt4cqBOW-wd79X6P0UPzatrB-n5B5HXhGE_TfSHsRyvZbo71u98-lFNTTR985-EeuFBbK1mNVOosxKr7K3zYtyvUvPYieQnocD877pfp82K_MtZB722jx8H66zl-wZC-OYuPwV-LYpc_D0OxmJuJ7NwNp6k1U9F5c-428kC0l2e5UMroFJc8IryNpOO7Ozv1y8dFLBYtOML64UAb37i_ex9i9_FdXXqu7VBU3SVEXd7t-7fHv9HlS9Am1j9fhf8G36O5Vw==
-""".strip()
-PROJECT_ID = '9a3afecc2a464ae79b3883e1e9fee0df'
-
-with open(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
-}
-
-token_req_headers = {
-    'Content-Type': 'application/json',
-    'Accept': 'application/json'
-}

tests_unfinished/query_populated_table/query_populated_table.py → tests/query_populated_table/scenario.py

@@ -1,14 +1,14 @@
 import json
 import random
 import string
+
 import locust
 from gevent import GreenletExit
-from locust.events import EventHook
 from locust import task
 import config as cfg
+import ks_config as kscfg
 import queries as qry
 
-IS_FIRST_RUN = cfg.IS_FIRST_RUN
 
 table_3_fields_no_lsi_list = []
 table_3_fields_1_lsi_list = []
@@ -18,7 +18,7 @@
 key_3_fields_1_lsi_list = []
 key_10_fields_5_lsi_list = []
 
-PROJECT_ID = qry.PROJECT_ID
+PROJECT_ID = kscfg.PROJECT_ID
 
 
 class UserBehavior(locust.TaskSet):
@@ -46,7 +46,7 @@ def load_table_list(self):
         global table_3_fields_1_lsi_list
         global table_10_fields_5_lsi_list
 
-        with open(qry.TABLE_LIST) as table_list_file:
+        with open(cfg.TABLE_LIST) as table_list_file:
             table_list = json.load(table_list_file)
             table_3_fields_no_lsi_list = table_list['table_3_fields_no_lsi']
             table_3_fields_1_lsi_list = table_list['table_3_fields_1_lsi']
@@ -57,7 +57,7 @@ def load_item_key_list(self):
         global key_3_fields_1_lsi_list
         global key_10_fields_5_lsi_list
 
-        with open(qry.ITEM_KEY_LIST) as item_key_list_file:
+        with open(cfg.ITEM_KEY_LIST) as item_key_list_file:
             item_key_list = json.load(item_key_list_file)
             key_3_fields_no_lsi_list = item_key_list['key_3_fields_no_lsi']
             key_3_fields_1_lsi_list = item_key_list['key_3_fields_1_lsi']
@@ -71,7 +71,7 @@ def query_3_fields_no_lsi_1(self):
                    '/data/tables/' + table_name + '/query')
         self.client.post(req_url,
                          qry.QUERY_3_FIELDS_NO_LSI_RQ1,
-                         headers=qry.req_headers,
+                         headers=kscfg.req_headers,
                          name="query_hash_only")
 
     @task(1)
@@ -82,7 +82,7 @@ def query_3_fields_1_lsi_1(self):
                    '/data/tables/' + table_name + '/query')
         self.client.post(req_url,
                          qry.QUERY_3_FIELDS_1_LSI_RQ1,
-                         headers=qry.req_headers,
+                         headers=kscfg.req_headers,
                          name="query_hash_only")
 
     @task(5)
@@ -96,7 +96,7 @@ def query_3_fields_1_lsi_2(self):
             post_by = attribute_key["LastPostedBy"]
             self.client.post(req_url,
                              qry.QUERY_3_FIELDS_1_LSI_RQ2 % post_by,
-                             headers=qry.req_headers,
+                             headers=kscfg.req_headers,
                              name="query_hash_range")
 
     @task(1)
@@ -107,7 +107,7 @@ def query_10_fields_5_lsi_1(self):
                    '/data/tables/' + table_name + '/query')
         self.client.post(req_url,
                          qry.QUERY_10_FIELDS_5_LSI_RQ1,
-                         headers=qry.req_headers,
+                         headers=kscfg.req_headers,
                          name="query_hash_only")
 
     @task(5)
@@ -121,7 +121,7 @@ def query_10_fields_5_lsi_2(self):
             post_by = attribute_key["LastPostedBy"]
             self.client.post(req_url,
                              qry.QUERY_10_FIELDS_5_LSI_RQ2 % post_by,
-                             headers=qry.req_headers,
+                             headers=kscfg.req_headers,
                              name="query_hash_range")
 
     @task(5)
@@ -135,7 +135,7 @@ def query_10_fields_5_lsi_3(self):
             addtional_field_1 = attribute_key["AdditionalField1"]
             self.client.post(req_url,
                              qry.QUERY_10_FIELDS_5_LSI_RQ3 % addtional_field_1,
-                             headers=qry.req_headers,
+                             headers=kscfg.req_headers,
                              name="query_hash_range")
 
     @task(5)
@@ -149,7 +149,7 @@ def query_10_fields_5_lsi_4(self):
             addtional_field_2 = attribute_key["AdditionalField2"]
             self.client.post(req_url,
                              qry.QUERY_10_FIELDS_5_LSI_RQ4 % addtional_field_2,
-                             headers=qry.req_headers,
+                             headers=kscfg.req_headers,
                              name="query_hash_range")
 
     @task(5)
@@ -163,7 +163,7 @@ def query_10_fields_5_lsi_5(self):
             addtional_field_3 = attribute_key["AdditionalField3"]
             self.client.post(req_url,
                              qry.QUERY_10_FIELDS_5_LSI_RQ5 % addtional_field_3,
-                             headers=qry.req_headers,
+                             headers=kscfg.req_headers,
                              name="query_hash_range")
 
     @task(5)
@@ -177,7 +177,7 @@ def query_10_fields_5_lsi_6(self):
             addtional_field_4 = attribute_key["AdditionalField4"]
             self.client.post(req_url,
                              qry.QUERY_10_FIELDS_5_LSI_RQ6 % addtional_field_4,
-                             headers=qry.req_headers,
+                             headers=kscfg.req_headers,
                              name="query_hash_range")
 
 
@@ -186,6 +186,8 @@ class MagnetoDBUser(locust.HttpLocust):
     min_wait = cfg.MIN_WAIT
     max_wait = cfg.MAX_WAIT
 
+IS_FIRST_RUN = True
+
 
 # Master code
 def on_slave_report(client_id, data):