comparison PerfsDb/ConfigFileBuilder.py @ 158:df1f9946571c

perfs db continued: tests working with tiny DBs on all setup but the sqliteplugin
author am@osimis.io
date Fri, 17 Aug 2018 11:58:26 +0200
parents f1a75985caa8
children 616da104a996
comparison
equal deleted inserted replaced
157:ac14100ffbd7 158:df1f9946571c
1 import typing 1 import typing
2 import json 2 import json
3 import os
3 4
4 from DbType import DbType 5 from DbType import DbType
5 6
6 class ConfigFileBuilder: 7 class ConfigFileBuilder:
7 8
8 @staticmethod 9 @staticmethod
9 def generate( 10 def generate(
10 outputPath: str, 11 outputPath: str,
11 plugins: typing.List[str], 12 pluginsPath: str,
12 storagePath: str, 13 storagePath: str,
13 dbType: DbType, 14 dbType: DbType,
14 dbSize: str, 15 dbSize: str,
15 port: int 16 port: int
16 ): 17 ):
17 18
18 config = {} 19 config = {}
19 config["Plugins"] = plugins
20 config["StorageDirectory"] = storagePath 20 config["StorageDirectory"] = storagePath
21 21
22 dbConfig = {} 22 dbConfig = {}
23 dbConfig["EnableIndex"] = True 23 dbConfig["EnableIndex"] = True
24 dbConfig["Host"] = "127.0.0.1" 24
25 dbConfig["Lock"] = False 25 if dbType.isServer():
26 dbConfig["Port"] = port 26 dbConfig["Host"] = "127.0.0.1"
27 dbConfig["Lock"] = False
28 dbConfig["Port"] = port
27 29
28 if dbType == DbType.MySQL: 30 if dbType == DbType.MySQL:
31 config["Plugins"] = [os.path.join(pluginsPath, "libOrthancMySQLIndex.so")]
29 dbConfig["EnableStorage"] = False 32 dbConfig["EnableStorage"] = False
33 # config["Plugins"] = [os.path.join(pluginsPath, "libOrthancMySQLStorage.so")]
34
30 dbConfig["Database"] = "orthanc" 35 dbConfig["Database"] = "orthanc"
31 dbConfig["Username"] = "orthanc" 36 dbConfig["Username"] = "orthanc"
32 dbConfig["Password"] = "orthanc" 37 dbConfig["Password"] = "orthanc"
33 38
34 config["MySQL"] = dbConfig 39 config["MySQL"] = dbConfig
35 40
36 elif dbType == DbType.PG9 or dbType == DbType.PG10: 41 elif dbType.isPG():
42 config["Plugins"] = [os.path.join(pluginsPath, "libOrthancPostgreSQLIndex.so")]
37 dbConfig["EnableStorage"] = False 43 dbConfig["EnableStorage"] = False
38 dbConfig["Database"] = "orthanc" 44 # config["Plugins"] = [os.path.join(pluginsPath, "libOrthancPostgreSQLStorage.so")]
39 dbConfig["Username"] = "orthanc" 45
40 dbConfig["Password"] = "orthanc" 46 dbConfig["Database"] = "postgres"
47 dbConfig["Username"] = "postgres"
41 48
42 config["PostgreSQL"] = dbConfig 49 config["PostgreSQL"] = dbConfig
43 50
44 elif dbType == DbType.MSSQL: 51 elif dbType == DbType.MSSQL:
45 dbConfig["ConnectionString"] = "Driver={ODBC Driver 13 for SQL Server};Server=tcp:index," + port + ";Database=master;Uid=sa;Pwd=MyStrOngPa55word!;Encrypt=yes;TrustServerCertificate=yes;Connection Timeout=30" 52 config["Plugins"] = [os.path.join(pluginsPath, "libOrthancMsSqlIndex.so")]
53 dbConfig["EnableStorage"] = False
54
55 dbConfig["ConnectionString"] = "Driver={ODBC Driver 13 for SQL Server};Server=tcp:127.0.0.1," + str(port) + ";Database=master;Uid=sa;Pwd=MyStrOngPa55word!;Encrypt=yes;TrustServerCertificate=yes;Connection Timeout=30"
46 dbConfig["LicenseString"] = "1abaamBcReVXv6EtE_X___demo-orthanc%osimis.io___HHHnqVHYvEkR3jGs2Y3EvpbxZgTt7yaCniJa2Bz7hFWTMa" # note: this is a trial license expiring on 2018-09-30, replace with your license code 56 dbConfig["LicenseString"] = "1abaamBcReVXv6EtE_X___demo-orthanc%osimis.io___HHHnqVHYvEkR3jGs2Y3EvpbxZgTt7yaCniJa2Bz7hFWTMa" # note: this is a trial license expiring on 2018-09-30, replace with your license code
47 57
48 config["MSSQL"] = dbConfig 58 config["MSSQL"] = dbConfig
49 59
50 elif DbType == DbType.Sqlite: 60 elif dbType.isSqlite():
51 config["IndexDirectory"] = storagePath 61 config["IndexDirectory"] = storagePath
62 if dbType == DbType.SqlitePlugin:
63 config["Plugins"] = [os.path.join(pluginsPath, "libOrthancSQLiteIndex.so")]
52 64
53 else: 65 else:
54 raise NotImplementedError 66 raise NotImplementedError
55 67
56 with open(outputPath, "w") as configFile: 68 with open(outputPath, "w") as configFile: