Commit Graph

5862 Commits

Author SHA1 Message Date
edwardro22
daff6d7f93 Merge branch 'master' of https://github.com/cgrates/cgrates 2017-09-17 02:14:45 +00:00
edwardro22
8d3d6b8692 Fixed the automatic migration script 2017-09-17 02:13:58 +00:00
DanB
042402cad5 Adding Tenant in resources allocation process for SM-FreeSWITCH and SM-Kamailio 2017-09-16 09:46:11 +02:00
DanB
0bc847de39 Load TTL from profile on Resource init 2017-09-16 09:35:03 +02:00
DanB
26efe5456e Resource indexing usage on ID instead of TenantID 2017-09-16 08:33:11 +02:00
DanB
f16ef66443 Merge branch 'master' of github.com:cgrates/cgrates 2017-09-15 20:40:22 +02:00
DanB
ba0b68f0b8 Indexing resources with tenant in ID, resources integration tests for mysql 2017-09-15 20:40:15 +02:00
Dan Christian Bogos
dc04305432 Merge pull request #740 from TeoV/master
New check for TPid in apier/v2/tp.go
2017-09-15 17:42:00 +02:00
edwardro22
9c1cdf7496 small fix 2017-09-15 15:36:30 +00:00
edwardro22
9851444f48 Fixed broken postgres script 2017-09-15 15:29:53 +00:00
TeoV
43c713f3a5 Fix on apier/v2/tp.go ExportTPToFolder 2017-09-15 18:29:24 +03:00
TeoV
5a92b3b182 Merge branch 'master' of https://github.com/cgrates/cgrates 2017-09-15 18:17:08 +03:00
TeoV
da0746b9aa New check for TPid in apier/v2/tp.go 2017-09-15 18:16:28 +03:00
TeoV
9188aad445 Small fix on data/storage/mysql and data/sorage/postgres 2017-09-15 18:01:51 +03:00
Dan Christian Bogos
937049d34f Merge pull request #738 from TeoV/master
Add new field("ID") in models TPResource  and replace primary key with PK and set tenant after ID in csv
2017-09-15 16:44:14 +02:00
TeoV
d8f3931b7f Small fix for loader_csv_test.go 2017-09-15 17:21:24 +03:00
TeoV
2f887b1ebb Small fix 2017-09-15 17:12:21 +03:00
TeoV
73399bef7a Tenant before ID on TPResources and TPStats 2017-09-15 17:02:22 +03:00
TeoV
37f1c66d1f Fix Merge 2017-09-15 16:51:26 +03:00
TeoV
33bc2e8b39 Merge branch 'master' of https://github.com/cgrates/cgrates
Conflicts:
	engine/loader_csv_test.go
2017-09-15 16:27:23 +03:00
TeoV
0f288af170 Add a new fild in models TPResource ID and replace primary key with PK and set tenant after ID 2017-09-15 16:21:32 +03:00
DanB
72be574e24 Merge branch 'master' of github.com:cgrates/cgrates 2017-09-15 14:54:15 +02:00
DanB
bdafd99137 Storage mongo returning TenantID from getKeysForPrefix for resource and resource profiles 2017-09-15 14:54:10 +02:00
DanB
9fbe0eefa4 Tenant in Resource 2017-09-15 14:18:56 +02:00
DanB
95565e8ff0 Loader to consider tenant when building up resource indexes 2017-09-15 11:55:50 +02:00
Dan Christian Bogos
fc66da3b63 Merge pull request #737 from TeoV/master
Add test for TPDerivedCahrges
2017-09-15 11:51:02 +02:00
TeoV
ba67a51544 Add test for TPDerivedCahrges 2017-09-15 12:49:06 +03:00
Dan Christian Bogos
0a3a646343 Merge pull request #735 from TeoV/master
Add tests for TPAccountActions and TPAccountPlans
2017-09-14 16:00:44 +02:00
TeoV
96f2d0fc17 Add test fot TPActions 2017-09-14 16:56:13 +03:00
TeoV
9dd2a66ff7 Add tests for TPAccountActions and TPAccountPlans 2017-09-14 15:23:42 +03:00
TeoV
e63b43959e Merge branch 'master' of https://github.com/cgrates/cgrates 2017-09-14 10:45:49 +03:00
DanB
956e6d47bb Merge branch 'master' of github.com:cgrates/cgrates 2017-09-13 18:54:15 +02:00
DanB
959ffdcc75 TPReader creating StatQueue based on StatQueueProfile, adding necessary methods in dataDB, tests 2017-09-13 18:54:05 +02:00
Dan Christian Bogos
97f0b65886 Merge pull request #734 from Edwardro22/master
Added Tenant field to Stats and Resources
2017-09-13 18:40:33 +02:00
edwardro22
54133db99b Formated code 2017-09-13 15:08:24 +00:00
Dan Christian Bogos
98399607fc Merge pull request #732 from TeoV/master
Add test for TPLcrRules
2017-09-13 16:56:13 +02:00
TeoV
128fafc523 Merge branch 'master' of https://github.com/cgrates/cgrates 2017-09-13 17:29:18 +03:00
TeoV
e13a64590b Add test for TPLcrRules 2017-09-13 17:28:47 +03:00
edwardro22
d71040dcf9 Merge branch 'master' of https://github.com/cgrates/cgrates 2017-09-13 14:28:23 +00:00
edwardro22
d9b4bbb604 Small fixes 2017-09-13 14:27:42 +00:00
DanB
69b4e3d3e3 Test return message in offline_tp 2017-09-13 16:20:38 +02:00
DanB
67e43ba481 Merge branch 'master' of github.com:cgrates/cgrates 2017-09-13 16:10:21 +02:00
DanB
3495a5d706 TPReader init resources if missing from dataDB 2017-09-13 16:10:12 +02:00
Dan Christian Bogos
8cd6550535 Merge pull request #731 from TeoV/master
Add tests for TPRatingPlans and TPDestinations
2017-09-13 15:37:34 +02:00
TeoV
1f519c0516 Add tests for TPRatingPlans and TPDestinations 2017-09-13 14:08:01 +03:00
edwardro22
3fd52d6022 Merge branch 'master' of https://github.com/cgrates/cgrates 2017-09-13 09:16:11 +00:00
edwardro22
fd01dd409d small fix 2017-09-13 09:16:01 +00:00
edwardro22
d01f8b58dc Added Tenant to resources 2017-09-13 09:08:09 +00:00
DanB
e4f035ee6c DataManager test fix 2017-09-12 18:42:22 +02:00
DanB
5c02dfa205 Merge branch 'master' of github.com:cgrates/cgrates 2017-09-12 18:35:07 +02:00