Browse Source

cleaning up a bit

Bernhard Buhl 5 years ago
parent
commit
5f1a9418a7

BIN
Movie_PC-Vienna.zip


+ 0 - 67
auth_user.csv

@@ -1,67 +0,0 @@
-email
-admin@earthsquad.global
-10411004@test.com
-10411005@test.com
-10411008@test.com
-1029471000@test.com
-1029471001@test.com
-10411019@test.com
-10411007@test.com
-103121000@test.com
-103121001@test.com
-10411020@test.com
-10411011@test.com
-1040521001@test.com
-1040521000@test.com
-10411026@test.com
-10411000@test.com
-10411036@test.com
-10411032@test.com
-10411006@test.com
-10411029@test.com
-10411017@test.com
-10411013@test.com
-10411037@test.com
-10411025@test.com
-10411022@test.com
-10411003@test.com
-10411028@test.com
-10411031@test.com
-10411039@test.com
-10411002@test.com
-10411018@test.com
-10411016@test.com
-10411010@test.com
-10411023@test.com
-10411033@test.com
-10411030@test.com
-10411001@test.com
-10411027@test.com
-10411024@test.com
-10411034@test.com
-10411009@test.com
-10411038@test.com
-10411015@test.com
-10411021@test.com
-10411012@test.com
-10411014@test.com
-10411035@test.com
-10411047@test.com
-10411048@test.com
-10411049@test.com
-1017511000@test.com
-1017511001@test.com
-1017511002@test.com
-1017511003@test.com
-1017511004@test.com
-1017511005@test.com
-1017511006@test.com
-10411040@test.com
-1018351000@test.com
-1018351001@test.com
-10411041@test.com
-10411043@test.com
-10411044@test.com
-10411042@test.com
-10411045@test.com
-10411046@test.com

+ 0 - 87
auth_user_mysql.csv

@@ -1,87 +0,0 @@
-"admin@earthsquad.global"
-"283551000@test.com"
-"283551001@test.com"
-"283551002@test.com"
-"283551003@test.com"
-"283551004@test.com"
-"283551005@test.com"
-"283551006@test.com"
-"283551007@test.com"
-"283551008@test.com"
-"283551009@test.com"
-"2836281000@test.com"
-"2836281001@test.com"
-"2836281002@test.com"
-"2836281003@test.com"
-"2836281004@test.com"
-"2836281005@test.com"
-"2836281006@test.com"
-"2836281007@test.com"
-"2836281008@test.com"
-"2836281009@test.com"
-"2837271000@test.com"
-"2837271001@test.com"
-"2837271002@test.com"
-"2837271003@test.com"
-"2837271004@test.com"
-"2837271005@test.com"
-"2837271006@test.com"
-"2837271007@test.com"
-"2837271008@test.com"
-"2837271009@test.com"
-"2838561000@test.com"
-"2838561001@test.com"
-"2838561002@test.com"
-"2838561003@test.com"
-"2838561004@test.com"
-"2838561005@test.com"
-"2838561006@test.com"
-"2838561007@test.com"
-"2838561008@test.com"
-"2838561009@test.com"
-"2868141000@test.com"
-"2868141001@test.com"
-"2872221000@test.com"
-"2872221001@test.com"
-"2872221002@test.com"
-"2872221003@test.com"
-"2872221004@test.com"
-"2830111000@test.com"
-"2830111001@test.com"
-"2830111002@test.com"
-"2830111003@test.com"
-"2830111004@test.com"
-"2832101000@test.com"
-"2832101001@test.com"
-"2832101002@test.com"
-"2832101003@test.com"
-"2832101004@test.com"
-"2841381000@test.com"
-"2841381001@test.com"
-"2841381002@test.com"
-"2841381003@test.com"
-"2841381004@test.com"
-"2855411000@test.com"
-"2855411001@test.com"
-"2856341000@test.com"
-"2856341001@test.com"
-"2860321000@test.com"
-"2860321001@test.com"
-"2863131000@test.com"
-"2863131001@test.com"
-"2873201000@test.com"
-"2873201001@test.com"
-"287461000@test.com"
-"287461001@test.com"
-"2818281000@test.com"
-"2818281001@test.com"
-"2818281002@test.com"
-"2818281003@test.com"
-"2818281004@test.com"
-"2818281005@test.com"
-"2818281006@test.com"
-"2818281007@test.com"
-"2818281008@test.com"
-"2818281009@test.com"
-"2819531000@test.com"
-"2819531001@test.com"

BIN
dist/CMD_call for Kseniia.zip


+ 1 - 1
dist/_mysql.cmd

@@ -1 +1 @@
-api_calls.exe --users=100 --products=1000 --server=https://app-test.earthsquad.global/api
+api_calls.exe --users=100 --products=1000 --noimage=yes --server=https://app-test.earthsquad.global/api

+ 1 - 1
dist/_mysql_short.cmd

@@ -1 +1 @@
-api_calls.exe --users=2 --products=50 --server=https://app-test.earthsquad.global/api
+api_calls.exe --users=1 --products=100 --noimage=yes --server=https://app-test.earthsquad.global/api

+ 1 - 1
dist/_mysql_short_recycle.cmd

@@ -1 +1 @@
-api_calls.exe --users=10 --products=10 --server=https://app-test.earthsquad.global/api --mode=recycling --csv="auth_user_mysql.csv"
+api_calls.exe --users=200 --products=20 --server=https://app-test.earthsquad.global/api --mode=recycling --csv="auth_user_mysql.csv"

auth_user_dev_mysql.csv → dist/auth_user_dev_mysql.csv


auth_user_loc.csv → dist/auth_user_loc.csv


File diff suppressed because it is too large
+ 6240 - 86
dist/auth_user_mysql.csv


auth_user_mysql_old.csv → dist/auth_user_mysql_old.csv


File diff suppressed because it is too large
+ 116581 - 116581
auth_user_testserver.csv


BIN
dist/fuer den muecke.zip


+ 3 - 3
dist/init.ini

@@ -19,7 +19,7 @@ mode=allnew
 csv=auth_user_mysql.csv
 
 # Switch weather to upload images during product creation (no_image = yes will not upload image)
-no_image=No
+noimage=yes
 
 # Image file name and location (image2.jpg is currently a small image. image.jpg is 3MB)
 image=test2.jpg
@@ -31,7 +31,7 @@ products=5
 users=5
 
 #Shall the recycling-count be rather high (=yes) or quite low (=no) per User per Day?
-#do_mass=yes
-do_mass=no
+#domass=yes
+domass=no
 
 

+ 0 - 53
ini_file.py

@@ -1,53 +0,0 @@
-'''
-Created on 24.05.2018
-
-@author: Bernhard
-'''
-
-import logging
-
-class ini_contents:
-    def __init__(self, usage=None):
-        #print ("Init im ini_contents aufgetreten. Usage ist:" + usage)
-        #traceback.print_stack()
-        if usage is None:
-            self.__usage = "test" #"prod" or "test"
-        else:
-            self.__usage = usage
-        self.__attribs = {}
-        self.__open_ini()
-
-    def __open_ini(self):
-        if self.__usage == "prod":
-            l_file = "init.ini"
-            self.__attribs["USAGE"] = "PROD"
-        else:
-            l_file = "init_test.ini"
-            self.__attribs["USAGE"] = "TEST"
-        with (open(l_file, "r")) as l_file:
-            for l_line in l_file.readlines():
-                # Kommentare ignorieren:
-                if len(l_line.strip()) == 0:
-                    continue
-                if l_line[0] != "#":
-                    l_line = l_line.strip()
-                    self.__attribs[l_line.split("=")[0]] = l_line.split("=")[1]
-            if "LogLevel" in self.__attribs:
-                self.__attribs["LogLevel"] = self.__get_proper_loglevel(self.__attribs["LogLevel"])
-            else:
-                self.__attribs["LogLevel"] = self.__get_proper_loglevel("INFO")
-    
-    def __get_proper_loglevel(self, loglevel):
-        if loglevel == "INFO":
-            return logging.INFO
-        elif loglevel == "DEBUG":
-            return logging.DEBUG
-        elif loglevel == "WARNING":
-            return logging.WARNING
-        elif loglevel == "ERROR":
-            return logging.ERROR
-        else:
-            return logging.INFO
-        
-    def get_value(self, key_for_value):
-        return (self.__attribs[key_for_value])

+ 3 - 3
init.ini

@@ -19,7 +19,7 @@ mode=allnew
 csv=auth_user_mysql.csv
 
 # Switch weather to upload images during product creation (no_image = yes will not upload image)
-no_image=No
+noimage=No
 
 # Image file name and location (image2.jpg is currently a small image. image.jpg is 3MB)
 image=test2.jpg
@@ -31,7 +31,7 @@ products=5
 users=5
 
 #Shall the recycling-count be rather high (=yes) or quite low (=no) per User per Day?
-#do_mass=yes
-do_mass=no
+#domass=yes
+domass=no
 
 

+ 5 - 2
init_dev.ini

@@ -19,7 +19,7 @@ mode=recycling
 csv=auth_user_loc.csv
 
 # Switch weather to upload images during product creation (no_image = yes will not upload image)
-no_image=No
+noimage=No
 
 # Image file name and location
 #image=test.jpg
@@ -27,4 +27,7 @@ no_image=No
 products=5
 
 # Number of users to be created (mode=allnew) or chosen for daily recycling (mode=recycling)
-users=1
+users=1
+
+#Shall the recycling-count be rather high (=yes) or quite low (=no) per User per Day?
+domass=no

+ 0 - 1
pg_big.sh

@@ -1 +0,0 @@
-python3 API_Calls.py --users=1000 --products=5000 --domass=no --server=https://app-test-pg.earthsquad.global/api >/dev/null 2>&1 &