uncloud-mravi

mravi/uncloud-mravi

Fork 0

forked from uncloud/uncloud

Commit graph

50b8b7a5f6 in-between commit Nico Schottelius 2020-04-11 21:37:36 +02:00
f1bba63f6f Merge branch 'yearly-billing' into 'master' Nico Schottelius 2020-04-11 21:37:13 +02:00
276c7e9901 Set VM order starting date on creation Timothée Floure 2020-04-09 14:52:56 +02:00
3a37343a73 Set default value for vpnnetworkreservation, rebuild migrations Timothée Floure 2020-04-09 14:28:46 +02:00
3588ae88f9 Merge branch 'master' into HEAD Timothée Floure 2020-04-09 14:07:19 +02:00
9431f11284 ++notes Nico Schottelius 2020-04-09 12:09:38 +02:00
e64c2b8ddb Merge branch 'master' of code.ungleich.ch:uncloud/uncloud Nico Schottelius 2020-04-09 12:08:17 +02:00
d9473e8f33 ++ doc Nico Schottelius 2020-04-09 12:08:11 +02:00
cb3346303b Fix typo in migration dependencies for uncloud_pay Timothée Floure 2020-04-09 12:06:05 +02:00
7d892daff9 [db] stay on psql+socket Nico Schottelius 2020-04-09 11:59:49 +02:00
08b9886ce3 Remove sample secret key in secrets_sample Nico Schottelius 2020-04-09 11:59:25 +02:00
d6bdf5c991 Merge branch 'sync-old-meowpay-patches' into 'master' Nico Schottelius 2020-04-09 11:31:49 +02:00
cc7056c87c Remove old Stripe settings from secrets_sample.py Timothée Floure 2020-04-08 17:55:48 +02:00
a8b81b074b Remove user view from uncloud_pay Timothée Floure 2020-04-08 17:40:44 +02:00
89c705f7d2 Set one payment method as primary, allow updates Timothée Floure 2020-03-05 15:19:25 +01:00
f2a797874a Merge branch 'master' into stripe-js Timothée Floure 2020-04-08 17:08:09 +02:00
d3f2a3e071 in between commit Nico Schottelius 2020-04-08 16:24:39 +02:00
3d2f8574d3 [db] use tcp -> support ssh Nico Schottelius 2020-04-08 13:09:17 +02:00
1838eaf7dd Merge branch 'master' of code.ungleich.ch:uncloud/uncloud Nico Schottelius 2020-04-08 12:07:11 +02:00
8986835c7e Add readme for postgresql support Nico Schottelius 2020-04-08 12:03:18 +02:00
938f0a3390 update to work on different computer Nico Schottelius 2020-04-07 19:45:16 +02:00
913e992a48 [vpn] fix urls Nico Schottelius 2020-04-06 22:30:01 +02:00
096f7e05c0 [migration] new models for uncloud_net Nico Schottelius 2020-04-06 22:29:41 +02:00
06c4a5643c [doc] move readme to subdir Nico Schottelius 2020-04-06 22:08:29 +02:00
198aaea48a Remove unused ldaptest Nico Schottelius 2020-04-06 22:06:48 +02:00
d537e9e2f0 [doc] add new readme's Nico Schottelius 2020-04-06 22:06:34 +02:00
5d084a5716 phase in vpn Nico Schottelius 2020-04-03 19:27:49 +02:00
8fb3ad7fe8 inline all pictures Nico Schottelius 2020-04-03 18:51:09 +02:00
c44faa7a73 Begin to include bill output Nico Schottelius 2020-04-03 18:41:17 +02:00
fa0ca2d9c1 Merge remote-tracking branch 'meowpaylocal/master' Nico Schottelius 2020-04-02 19:31:57 +02:00
7a6c8739f6 Rename / prepare for merge with uncloud repo Nico Schottelius 2020-04-02 19:31:03 +02:00
833d570472 sync .gitignore Nico Schottelius 2020-04-02 19:30:47 +02:00
3cf3439f1c Move all files to _etc_based Nico Schottelius 2020-04-02 19:29:08 +02:00
23203ff418 vmsnapshot progress Nico Schottelius 2020-03-22 20:55:11 +01:00
9961ca0446 add new migrations Nico Schottelius 2020-03-22 18:59:59 +01:00
105142f76a Add template for creating VMs Nico Schottelius 2020-03-22 18:52:31 +01:00
08fe3e689e Add debug to opennebula, create VM disks from opennebula correctly Nico Schottelius 2020-03-22 17:30:55 +01:00
10c5257f90 Introduce "extra_data" jsonfield Nico Schottelius 2020-03-21 11:59:04 +01:00
a32f7522b5 Relate VM to disks and snapshots Nico Schottelius 2020-03-18 15:43:01 +01:00
4b4cbbf009 Also list snapshots for a VM 0.2 Nico Schottelius 2020-03-18 15:19:06 +01:00
c6a9bd4363 Make balance a user attribute + decimalfield Nico Schottelius 2020-03-18 14:53:26 +01:00
cd01f62fde Move user view to uncloud_auth Nico Schottelius 2020-03-18 14:36:40 +01:00
2f1aee8181 Can create a VMSnapshot w/ order (bugs to be removed) Nico Schottelius 2020-03-17 19:53:14 +01:00
6a382fab23 [vmhost] add used_ram_in_gb Nico Schottelius 2020-03-17 19:07:00 +01:00
b9473c1803 ++ fix opennebula migration Nico Schottelius 2020-03-17 16:03:41 +01:00
cc2efa5c14 Remove old opennebula view, remove vmid field 0.1 Nico Schottelius 2020-03-17 15:40:08 +01:00
5d840de55c [opennebula] refresh formula, cleanup vm import/migration to uncloud Nico Schottelius 2020-03-17 15:39:24 +01:00
9f4b927c74 Introduce mirations to ungleich_service to make tests work Nico Schottelius 2020-03-17 14:50:28 +01:00
55bd42fe64 List all VMs for admins Nico Schottelius 2020-03-17 14:50:14 +01:00
8634d667d5 update requirements for graphing Nico Schottelius 2020-03-17 14:49:59 +01:00
ac7ea86668 rename opennebula commands Nico Schottelius 2020-03-17 14:49:49 +01:00
8356404fe4 ++ product readme Nico Schottelius 2020-03-17 14:49:36 +01:00
723d2a99cc add django…extensions to support "graph_models" Nico Schottelius 2020-03-17 13:30:48 +01:00
8f4e7cca1b add migrations to ungleich_service so tests don't fail Nico Schottelius 2020-03-17 12:46:02 +01:00
b15a12dc71 Missing import for DCLVMProductSerializer meow 2020-03-13 14:22:49 +05:00
923102af24 Fix DCLVMProductSerializer import following rebase Timothée Floure 2020-03-09 13:17:40 +01:00
f4ebbb79ce Add test coverage parsing to CI Timothée Floure 2020-03-09 12:22:04 +01:00
122bc586b4 Disable 'old' broken/not-yet-implemented ungleich_vm tests Timothée Floure 2020-03-09 12:02:17 +01:00
ae6548e168 Read database host and user from environment (used by CI pipeline) Timothée Floure 2020-03-09 11:57:18 +01:00
0e4068cea8 Add minimal CI running django tests Timothée Floure 2020-03-09 09:07:14 +01:00
623d3ae5c4 Fix various billing issues discovered by testing Timothée Floure 2020-03-09 11:30:31 +01:00
fe0e6d98bf Add simple tests for billing Timothée Floure 2020-03-09 11:30:11 +01:00
41e35c1af0 Add missing migration and dependency to run tests Timothée Floure 2020-03-09 08:58:35 +01:00
948391ab2e Dump test placeholder for uncloud_pay Timothée Floure 2020-03-06 09:02:25 +01:00
d089d06264 Initial yearly billing implementation Timothée Floure 2020-03-05 16:22:41 +01:00
c086dbd357 Rebuild paymentmethod/stripe migrations from master Timothée Floure 2020-03-05 16:24:45 +01:00
545727afe7 Move STRIPE_PUBLIC_KEY to secrets (i.e. local configuration) Timothée Floure 2020-03-05 11:51:08 +01:00
7bbc729b87 Fix duplicates in payment method creation Timothée Floure 2020-03-05 11:45:37 +01:00
b10cae472e Fix migration dependencies after rebase Timothée Floure 2020-03-05 11:43:07 +01:00
952cf8fd13 Remove unused empty migration Timothée Floure 2020-03-05 11:36:19 +01:00
7e278228bd Fix payment update updates Timothée Floure 2020-03-05 11:28:43 +01:00
31507c0f1a Fix error in stripe get_customer_id_for Timothée Floure 2020-03-05 11:28:20 +01:00
7e58a8ace2 Fix generate-bills, remove debug print in charge method Timothée Floure 2020-03-05 11:27:43 +01:00
a4fa0def4b Fix dumb logic errors/typo from last commit Timothée Floure 2020-03-05 11:13:04 +01:00
80fe28588e Revamp stripe error handling Timothée Floure 2020-03-05 11:03:47 +01:00
4e658d2d77 Remove legacy credit card support Timothée Floure 2020-03-05 10:28:50 +01:00
5161a74354 Add STRIPE_PUBLIC_KEY setting Timothée Floure 2020-03-05 10:28:03 +01:00
0e62ccff3b Cleanup/reorder uncloud_pay views Timothée Floure 2020-03-05 10:27:33 +01:00
bf83b750de Replace legacy Stripe Charge API by Payment{setup, intent} Timothée Floure 2020-03-05 10:23:34 +01:00
47148454f6 s/_/-/ for bill id Nico Schottelius 2020-03-06 11:11:16 +01:00
0032c272e7 Merge branch 'bill-id' of code.ungleich.ch:nico/meow-pay Nico Schottelius 2020-03-06 11:10:47 +01:00
263125048d Begin to introduce a DCL alike view for VMs Nico Schottelius 2020-03-06 11:10:20 +01:00
658262c599 Add human readable reference to bills Timothée Floure 2020-03-06 09:39:41 +01:00
c41b55573a Fix order link in BillRecordSerializer Timothée Floure 2020-03-06 09:32:25 +01:00
4016c28c5f Fix generate-bills Timothée Floure 2020-03-05 11:27:43 +01:00
aa8336b7e4 VM: def __str__ Nico Schottelius 2020-03-05 23:55:33 +01:00
0e6a6afd88 [opennebula] Fix fields/serializers Nico Schottelius 2020-03-05 23:18:07 +01:00
efbe1c0596 Merge commands into the "vm" command Nico Schottelius 2020-03-05 17:52:01 +01:00
6c7f0e98b3 Rebuild paymentmethod/stripe migrations from master Timothée Floure 2020-03-05 16:24:45 +01:00
b8c2f80e45 [vmhost] add available_ram_in_gb and available_cores Nico Schottelius 2020-03-05 15:06:34 +01:00
139aca6a61 Remove vms field from vmhost Nico Schottelius 2020-03-05 14:58:45 +01:00
2a73f0e767 [migration] make vm name optional, use storage class choices Nico Schottelius 2020-03-05 14:22:56 +01:00
66e224e926 [storage] move choices to uncloud_storage Nico Schottelius 2020-03-05 14:21:10 +01:00
10f09c7115 add an old client hack (just for reference) Nico Schottelius 2020-03-05 14:15:33 +01:00
ec7a2a3c3a Correct pricing for VMProduct Nico Schottelius 2020-03-05 14:00:14 +01:00
b07df26eb2 Move STRIPE_PUBLIC_KEY to secrets (i.e. local configuration) Timothée Floure 2020-03-05 11:51:08 +01:00
b958cc77ea Fix duplicates in payment method creation Timothée Floure 2020-03-05 11:45:37 +01:00
e9b6a6f277 Fix migration dependencies after rebase Timothée Floure 2020-03-05 11:43:07 +01:00
546667d117 Remove unused empty migration Timothée Floure 2020-03-05 11:36:19 +01:00
b88dfa4bfe Fix payment update updates Timothée Floure 2020-03-05 11:28:43 +01:00