slapos.core:f43f788d604f8fcfbdb9b5263f1453d550c4e0c7 commitshttps://lab.nexedi.com/nexedi/slapos.core/-/commits/f43f788d604f8fcfbdb9b5263f1453d550c4e0c72019-03-18T14:50:22+01:00https://lab.nexedi.com/nexedi/slapos.core/-/commit/f43f788d604f8fcfbdb9b5263f1453d550c4e0c7slapos_subscription_request: remove useless imports2019-03-18T14:50:22+01:00Rafael Monneratrafael@nexedi.comhttps://lab.nexedi.com/nexedi/slapos.core/-/commit/a50f389be7628d70fe0d7c310d9f789330ce5382slapos_accounting: Use a specific trade condition to SPL from Consumption2019-03-18T14:50:22+01:00Rafael Monneratrafael@nexedi.com
This is only for when subscription request is present, as consumption is normally irrelevant from accounting point of view.
This preserves the previous approach from non-subscriptions hosting subscriptions.https://lab.nexedi.com/nexedi/slapos.core/-/commit/615ec1d0c453471101b79f3e6ed25755b52ad2f8slapos_accounting: Add Jump action from Payment Transaction to Payzen Events2019-03-18T14:50:22+01:00Rafael Monneratrafael@nexedi.comhttps://lab.nexedi.com/nexedi/slapos.core/-/commit/2e34365b83753ad1365cf55af2a168ae13367495Fix display of upgrade decision2019-03-15T15:52:41+01:00Thomas Gambierthomas.gambier@nexedi.com
I'm now displaying the upgrade decision message as HTML. <a href="/rafael" data-user="11" data-reference-type="user" data-container="body" data-placement="top" data-html="true" class="gfm gfm-project_member" title="Rafael Monnerat">@rafael</a> I'm not sure if I should do the same in `rjs_gadget_erp5_page_slap_ticket_view_js.js` and `rjs_gadget_erp5_page_slap_regularisation_request_view_js.js`
/cc <a href="/alain.takoudjou" data-user="3" data-reference-type="user" data-container="body" data-placement="top" data-html="true" class="gfm gfm-project_member" title="Alain Takoudjou">@alain.takoudjou</a>
/reviewed-on <a href="https://lab.nexedi.com/nexedi/slapos.core/merge_requests/103" data-original="https://lab.nexedi.com/nexedi/slapos.core/merge_requests/103" data-link="false" data-link-reference="true" data-project="77" data-merge-request="2834" data-project-path="nexedi/slapos.core" data-iid="103" data-mr-title="Fix display of upgrade decision" data-reference-type="merge_request" data-container="body" data-placement="top" data-html="true" title="" class="gfm gfm-merge_request">nexedi/slapos.core!103</a>https://lab.nexedi.com/nexedi/slapos.core/-/commit/3156633c0baf4c3b474676d5a2c9a6f95c69edaaRelease 1.4.202019-03-08T20:33:45+01:00Rafael Monneratrafael@nexedi.comhttps://lab.nexedi.com/nexedi/slapos.core/-/commit/43c0654212782de35dd707f06a31ee07ee3640dcPrepare for xml-marshaller 1.0.22019-03-07T12:10:16+01:00Bryton Lacquementbryton.lacquement@nexedi.comhttps://lab.nexedi.com/nexedi/slapos.core/-/commit/f143249d83e8e470d8ece6420c6023753470fc2ctest: Update to follow up xml-marshaller 1.0.12019-03-07T12:10:16+01:00Rafael Monneratrafael@nexedi.comhttps://lab.nexedi.com/nexedi/slapos.core/-/commit/6f45e99e4fdcb3f421225d4f1ecdee2eb3f268b8Release slapos.core 1.4.192019-03-06T18:35:22+01:00Alain Takoudjoualain.takoudjou@nexedi.comhttps://lab.nexedi.com/nexedi/slapos.core/-/commit/9b3ccfd01b442e64c31ed93b2b9a1344ea1fa9eb[slapformat] Make sure routing is OK withVM inside VM2019-03-06T16:26:06+01:00Thomas Gambierthomas.gambier@nexedi.com
if we have host2 inside host1 inside host0 then routing from host0 to host2 needs to specify 'via' address because the destination address (of host2) is not directly seen through slaptap of host0 (because it goes only to host1).
this commit introduces a new constraint: users must now put the IPv6 address `network::1` on their ethernet interface inside the VM.
/cc <a href="/jm" data-user="30" data-reference-type="user" data-container="body" data-placement="top" data-html="true" class="gfm gfm-project_member" title="Julien Muchembled">@jm</a> <a href="/rafael" data-user="11" data-reference-type="user" data-container="body" data-placement="top" data-html="true" class="gfm gfm-project_member" title="Rafael Monnerat">@rafael</a> <a href="/alain.takoudjou" data-user="3" data-reference-type="user" data-container="body" data-placement="top" data-html="true" class="gfm gfm-project_member" title="Alain Takoudjou">@alain.takoudjou</a>
/reviewed-on <a href="https://lab.nexedi.com/nexedi/slapos.core/merge_requests/102" data-original="https://lab.nexedi.com/nexedi/slapos.core/merge_requests/102" data-link="false" data-link-reference="true" data-project="77" data-merge-request="2802" data-project-path="nexedi/slapos.core" data-iid="102" data-mr-title="[slapformat] Make sure routing is OK withVM inside VM" data-reference-type="merge_request" data-container="body" data-placement="top" data-html="true" title="" class="gfm gfm-merge_request">!102</a>https://lab.nexedi.com/nexedi/slapos.core/-/commit/852b0583ccd69c83e6e95b7037bd87c1348afe2eslapos_erp5: Makes easy dump and compare difference on production2019-03-06T16:05:49+01:00Rafael Monneratrafael@nexedi.comhttps://lab.nexedi.com/nexedi/slapos.core/-/commit/b56939861ec2e9d906f643c303dd1a35f8859cb5slapos_subscription_request: round values to avoid float points imprecision2019-03-06T16:05:03+01:00Rafael Monneratrafael@nexedi.comhttps://lab.nexedi.com/nexedi/slapos.core/-/commit/c1ea6cea54508f7044da8ee6c24a26a5adcee513slapos_subscription_request: Generate deduction for the reservation fee.2019-03-06T16:05:03+01:00Rafael Monneratrafael@nexedi.comhttps://lab.nexedi.com/nexedi/slapos.core/-/commit/3b56aae6979c15e2968958c69000852e6b85437dslapos_accounting: Add support to Reservation Deduction2019-03-06T16:05:03+01:00Rafael Monneratrafael@nexedi.com
Once a user pays for a reservation, the ERP5 can generate a deduction (complete or partial). The code here, includes the needed simulation code for expand and merge the Deduction into the invoice.https://lab.nexedi.com/nexedi/slapos.core/-/commit/5daf9565b9075d527ee08db6ca752bb99a09db7aslapgrid.promise: Improve promise check speed2019-03-06T15:32:47+01:00Alain Takoudjoualain.takoudjou@nexedi.com
Use cache to save some promise instance information.
First run of slapgrid fill each promise cached (when there is no cache). The next run will check some usefull info like if promise `is test less` or promise `is anomaly less` directly from cache without need to import the module.
Cache is updated if promise file or module change, or if the promise periodicity expire (when the promise it update cache).
/reviewed-on <a href="https://lab.nexedi.com/nexedi/slapos.core/merge_requests/101" data-original="https://lab.nexedi.com/nexedi/slapos.core/merge_requests/101" data-link="false" data-link-reference="true" data-project="77" data-merge-request="2790" data-project-path="nexedi/slapos.core" data-iid="101" data-mr-title="slapgrid.promise: Improve promise check speed" data-reference-type="merge_request" data-container="body" data-placement="top" data-html="true" title="" class="gfm gfm-merge_request">nexedi/slapos.core!101</a>https://lab.nexedi.com/nexedi/slapos.core/-/commit/0c398b4da10d11b2408a25c2a791f69aac40c58egrid.promise: add tests for promise cached information2019-03-06T15:15:41+01:00Alain Takoudjoualain.takoudjou@nexedi.comhttps://lab.nexedi.com/nexedi/slapos.core/-/commit/02bcc9a3b4eabdf798dc5971a136834e57b37e2bgrid.promise: save and use promise periodicity in cache2019-03-06T15:15:40+01:00Alain Takoudjoualain.takoudjou@nexedi.comhttps://lab.nexedi.com/nexedi/slapos.core/-/commit/ababf1f635cdbde5cb882ff71801d03d5f8ecd4egrid.promise: cache some promise information to speedup testless and anomalyl...2019-03-04T15:11:19+01:00Alain Takoudjoualain.takoudjou@nexedi.comhttps://lab.nexedi.com/nexedi/slapos.core/-/commit/d259174fdb33d9b6759a67f3052ee961ddc00ffbslapos_accounting: Add alarm for aggregated SPL related to subscription2019-02-20T03:20:27+01:00Rafael Monneratrafael@nexedi.comhttps://lab.nexedi.com/nexedi/slapos.core/-/commit/154f1d6c21f51fbba9e4eca941a2a8ba3eeb1d54slapos_subscription_request: Fixes for Tests2019-02-20T03:20:27+01:00Rafael Monneratrafael@nexedi.com
- Round tax comparation, else we hit floating point impression.
- Free trial user is defined by ERP5 Login reference and not Person Reference.https://lab.nexedi.com/nexedi/slapos.core/-/commit/32c8d21a045b1b33ff6daed25ce850906f547d3bslapos_subscription_request: Enable free trial alarms by default.2019-02-20T03:20:26+01:00Rafael Monneratrafael@nexedi.comhttps://lab.nexedi.com/nexedi/slapos.core/-/commit/0c10bf13c6115a09895ea58a13ceddbca063d2d5slapos_subscription_request: Add Scenario Test for Subscriptions2019-02-20T03:20:26+01:00Rafael Monneratrafael@nexedi.com
Simple subscription Case
Request three instances (ie.: 3 VMs) Case
Two concurrent Subscriptions Casehttps://lab.nexedi.com/nexedi/slapos.core/-/commit/6e0fd3baf86ecf72431dac4fe988d354bb5b0982slapos_subscription: Set default values.2019-02-20T03:20:26+01:00Rafael Monneratrafael@nexedi.comhttps://lab.nexedi.com/nexedi/slapos.core/-/commit/338682feb495801fc579134090182a0236df8bcbslapos_subscription: Implement check and test Payment Balance2019-02-20T03:20:25+01:00Rafael Monneratrafael@nexedi.com
If the first 3 months are payed, the subscription request is confirmed (allowing allocation).https://lab.nexedi.com/nexedi/slapos.core/-/commit/a4b8b535bf41c068f498ef6ae8de83b431913510slapos_cloud: add method for set computer as Open/Subscription2019-02-20T03:20:25+01:00Rafael Monneratrafael@nexedi.comhttps://lab.nexedi.com/nexedi/slapos.core/-/commit/76b9637745bae9d835e3c10935fb4ce46a6afa47slapos_accounting: Do not merge SPL (Aggregated) from different causality2019-02-20T03:20:25+01:00Rafael Monneratrafael@nexedi.com
When causality is set and it is a Subscription Request, do not aggregate services (it will generate individual inviduals invoices per Subscription).
When a user has multiple requests, it should not merge, and it should generate 1 invoice per subscription request.https://lab.nexedi.com/nexedi/slapos.core/-/commit/bbebfa5bff8d3782346a4eb96d679ea046ef1341slapos_accounting: Set causality into the sale packing list to subscription r...2019-02-20T03:20:25+01:00Rafael Monneratrafael@nexedi.comhttps://lab.nexedi.com/nexedi/slapos.core/-/commit/06f2ac0bb72cb43048703663ffcd4fbdda115231slapos_accounting: sale trade condition from subscription is also acceptable ...2019-02-20T03:20:24+01:00Rafael Monneratrafael@nexedi.comhttps://lab.nexedi.com/nexedi/slapos.core/-/commit/7909bac35a0841c4cc78bcbef71ff7b8a3b0bf53slapos_accounting: Subscription Requests generate a first payment with severa...2019-02-20T03:19:06+01:00Rafael Monneratrafael@nexedi.comhttps://lab.nexedi.com/nexedi/slapos.core/-/commit/f2f4ba6a9d18e6f1bdae09fc959354f3c93bc414slapos_accounting: Use specific trade condition if Hosting Subscription comes...2019-02-20T03:19:06+01:00Rafael Monneratrafael@nexedi.comslapos_accounting: Use specific trade condition if Hosting Subscription comes from a Subscription Request
This allow the system differ the 2 scenarios.
https://lab.nexedi.com/nexedi/slapos.core/-/commit/8df9ff0da6b2f57e019184b9f13d185eff2f252fslapos_accounting: Use same Trade Condition from the movement2019-02-20T03:19:05+01:00Rafael Monneratrafael@nexedi.comhttps://lab.nexedi.com/nexedi/slapos.core/-/commit/77b4b9168b0aa03b89345730582c6ced4417a381slapos_accounting: Introduce Subscription Trade Condition Case2019-02-20T03:19:05+01:00Rafael Monneratrafael@nexedi.com
When the Hosting Subscription comes from a Subscription Request, the Trade Condition applied is a different one (slapos_aggregated_subscription_trade_condition).
Update all related scripts to work accordinally.
SPL on this case are started as soon they are created and a payment generated.https://lab.nexedi.com/nexedi/slapos.core/-/commit/039572626bc510faf0162ee86c3c99a7ef1b3091slapos_accounting: Add new preference for Subscription Sale Trade Condition2019-02-20T03:19:05+01:00Rafael Monneratrafael@nexedi.com
This is used for subscription mode, like rapid.space VM-Like services.https://lab.nexedi.com/nexedi/slapos.core/-/commit/8d1c638a0e648a041148f56182d07e1a8ec8e2eeslapos_cloud: SlapOSTestCaseDefaultScenarioMixin Make code compatible with Li...2019-02-20T03:17:06+01:00Rafael Monneratrafael@nexedi.comhttps://lab.nexedi.com/nexedi/slapos.core/-/commit/0c48f4c748c1dc1aba48ca991ad971d31a79083bslapos_subscription_request: Add Test for Trial Scenario2019-02-20T03:17:06+01:00Rafael Monneratrafael@nexedi.comhttps://lab.nexedi.com/nexedi/slapos.core/-/commit/0d1b678819997071e24ed90da792c592348da776slapos_subscription_request: Ensure you are getting the right free trial user2019-02-20T03:17:06+01:00Rafael Monneratrafael@nexedi.comhttps://lab.nexedi.com/nexedi/slapos.core/-/commit/a4421a1390913c55fb27cbbde4215e0e7efe3c13slapos_subscription_request: Email shouldn't use coordinate_interaction_workf...2019-02-20T03:16:38+01:00Rafael Monneratrafael@nexedi.com
Subscription and Trial uses setDefaultEmailText when create a Trial/Subscription as annonymous which will trigger this workflow and raise Unauthorized when invoke Coordinate_beforeCoordinateTextChange.
As Reacheability/Unreacheability is not tracked on SlapOS master for now, so this commits remove the interaction workflow for Email (only).https://lab.nexedi.com/nexedi/slapos.core/-/commit/9ea0556165cd9768ed35227a4e8ef047359de270slapos_erp5: Clean up test and use the mixing2019-02-20T03:16:37+01:00Rafael Monneratrafael@nexedi.comhttps://lab.nexedi.com/nexedi/slapos.core/-/commit/2952318d4307f60c8360c4d6179c6dd2d60037baslapos_cloud: Add mixin for test Scenarios2019-02-20T03:16:37+01:00Rafael Monneratrafael@nexedi.com
Code migrated from testSlapOSERP5DefaultScenario.https://lab.nexedi.com/nexedi/slapos.core/-/commit/bb80ef795f0faff4f8e12b5a24f69f9288ead2daslapos_cloud: Don't allocate instances w/o Hosting Subscription2019-02-20T03:16:37+01:00Rafael Monneratrafael@nexedi.comhttps://lab.nexedi.com/nexedi/slapos.core/-/commit/9389ad8571c742d4e0cf93c41e5eeb5cb1fe2c9dslapos_erp5/testSlapOSERP5DefaultScenario: Invoke alarms multiple times2019-02-20T03:16:37+01:00Rafael Monneratrafael@nexedi.com
This would guarantee that the ungenerated payment from others tests are generated, while you are running live tests.