Skip to content

S
slapos.core
Commit a14a847e authored by Rafael Monnerat's avatar Rafael Monnerat
Browse files
Options

slapos_accounting: Include reservation prices for larger VMs 

   Sample values.
parent 65a90221
Pipeline #14592 failed with stage
    in 0 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 328 additions and 4 deletions
    master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_aggregated_trade_condition/3.xml
    View file @ a14a847e
    ...@@ -260,7 +260,7 @@ ...@@ -260,7 +260,7 @@
    </item> </item>
    <item> <item>
    <key> <string>serial</string> </key> <key> <string>serial</string> </key>
    <value> <string>990.40476.14802.16776</string> </value> <value> <string>990.62787.62832.61696</string> </value>
    </item> </item>
    <item> <item>
    <key> <string>state</string> </key> <key> <string>state</string> </key>
    ...@@ -278,7 +278,7 @@ ...@@ -278,7 +278,7 @@
    </tuple> </tuple>
    <state> <state>
    <tuple> <tuple>
    <float>1615473764.78</float> <float>1616783272.42</float>
    <string>UTC</string> <string>UTC</string>
    </tuple> </tuple>
    </state> </state>
    ...@@ -306,6 +306,10 @@ ...@@ -306,6 +306,10 @@
    <key> <string>variation/service_module/slapos_reservation_fee/1</string> </key> <key> <string>variation/service_module/slapos_reservation_fee/1</string> </key>
    <value> <int>0</int> </value> <value> <int>0</int> </value>
    </item> </item>
    <item>
    <key> <string>variation/service_module/slapos_reservation_fee/3</string> </key>
    <value> <int>2</int> </value>
    </item>
    <item> <item>
    <key> <string>variation/service_module/slapos_reservation_fee/default</string> </key> <key> <string>variation/service_module/slapos_reservation_fee/default</string> </key>
    <value> <int>1</int> </value> <value> <int>1</int> </value>
    ......
    master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_aggregated_trade_condition/3/path_2.xml 0 → 100644
    View file @ a14a847e
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="Sale Supply Cell" module="erp5.portal_type"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_identity_criterion</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>_local_properties</string> </key>
    <value>
    <tuple>
    <dictionary>
    <item>
    <key> <string>id</string> </key>
    <value> <string>base_id</string> </value>
    </item>
    <item>
    <key> <string>type</string> </key>
    <value> <string>string</string> </value>
    </item>
    </dictionary>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>_range_criterion</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>base_id</string> </key>
    <value> <string>path</string> </value>
    </item>
    <item>
    <key> <string>base_price</string> </key>
    <value> <float>488.0</float> </value>
    </item>
    <item>
    <key> <string>categories</string> </key>
    <value>
    <tuple>
    <string>variation/service_module/slapos_reservation_fee/3</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>criterion_property</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>path_2</string> </value>
    </item>
    <item>
    <key> <string>mapped_value_property_list</string> </key>
    <value>
    <tuple>
    <string>base_price</string>
    <string>base_unit_price</string>
    <string>slice_base_price</string>
    <string>slice_quantity_range</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>membership_criterion_base_category</string> </key>
    <value>
    <tuple>
    <string>variation</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>membership_criterion_category</string> </key>
    <value>
    <tuple>
    <string>variation/service_module/slapos_reservation_fee/3</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>multimembership_criterion_base_category</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    <item>
    <key> <string>portal_type</string> </key>
    <value> <string>Sale Supply Cell</string> </value>
    </item>
    <item>
    <key> <string>test_method_id</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="PersistentMapping" module="Persistence.mapping"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>data</string> </key>
    <value>
    <dictionary/>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="3" aka="AAAAAAAAAAM=">
    <pickle>
    <global name="PersistentMapping" module="Persistence.mapping"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>data</string> </key>
    <value>
    <dictionary/>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_aggregated_trade_condition/4.xml
    View file @ a14a847e
    ...@@ -260,7 +260,7 @@ ...@@ -260,7 +260,7 @@
    </item> </item>
    <item> <item>
    <key> <string>serial</string> </key> <key> <string>serial</string> </key>
    <value> <string>990.39746.40964.56832</string> </value> <value> <string>990.62787.62832.61696</string> </value>
    </item> </item>
    <item> <item>
    <key> <string>state</string> </key> <key> <string>state</string> </key>
    ...@@ -278,7 +278,7 @@ ...@@ -278,7 +278,7 @@
    </tuple> </tuple>
    <state> <state>
    <tuple> <tuple>
    <float>1615473747.58</float> <float>1616781754.41</float>
    <string>UTC</string> <string>UTC</string>
    </tuple> </tuple>
    </state> </state>
    ...@@ -306,6 +306,10 @@ ...@@ -306,6 +306,10 @@
    <key> <string>variation/service_module/slapos_reservation_fee/1</string> </key> <key> <string>variation/service_module/slapos_reservation_fee/1</string> </key>
    <value> <int>0</int> </value> <value> <int>0</int> </value>
    </item> </item>
    <item>
    <key> <string>variation/service_module/slapos_reservation_fee/3</string> </key>
    <value> <int>2</int> </value>
    </item>
    <item> <item>
    <key> <string>variation/service_module/slapos_reservation_fee/default</string> </key> <key> <string>variation/service_module/slapos_reservation_fee/default</string> </key>
    <value> <int>1</int> </value> <value> <int>1</int> </value>
    ......
    master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_aggregated_trade_condition/4/path_2.xml 0 → 100644
    View file @ a14a847e
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="Sale Supply Cell" module="erp5.portal_type"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_identity_criterion</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>_local_properties</string> </key>
    <value>
    <tuple>
    <dictionary>
    <item>
    <key> <string>id</string> </key>
    <value> <string>base_id</string> </value>
    </item>
    <item>
    <key> <string>type</string> </key>
    <value> <string>string</string> </value>
    </item>
    </dictionary>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>_range_criterion</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>base_id</string> </key>
    <value> <string>path</string> </value>
    </item>
    <item>
    <key> <string>base_price</string> </key>
    <value> <float>65.0</float> </value>
    </item>
    <item>
    <key> <string>categories</string> </key>
    <value>
    <tuple>
    <string>variation/service_module/slapos_reservation_fee/3</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>criterion_property</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>path_2</string> </value>
    </item>
    <item>
    <key> <string>mapped_value_property_list</string> </key>
    <value>
    <tuple>
    <string>base_price</string>
    <string>base_unit_price</string>
    <string>slice_base_price</string>
    <string>slice_quantity_range</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>membership_criterion_base_category</string> </key>
    <value>
    <tuple>
    <string>variation</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>membership_criterion_category</string> </key>
    <value>
    <tuple>
    <string>variation/service_module/slapos_reservation_fee/3</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>multimembership_criterion_base_category</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    <item>
    <key> <string>portal_type</string> </key>
    <value> <string>Sale Supply Cell</string> </value>
    </item>
    <item>
    <key> <string>test_method_id</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="2" aka="AAAAAAAAAAI=">
    <pickle>
    <global name="PersistentMapping" module="Persistence.mapping"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>data</string> </key>
    <value>
    <dictionary/>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="3" aka="AAAAAAAAAAM=">
    <pickle>
    <global name="PersistentMapping" module="Persistence.mapping"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>data</string> </key>
    <value>
    <dictionary/>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    master/bt5/slapos_accounting/PathTemplateItem/service_module/slapos_reservation_fee/3.xml 0 → 100644
    View file @ a14a847e
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="Service Individual Variation" module="erp5.portal_type"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>default_reference</string> </key>
    <value> <string>VPVPS</string> </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>3</string> </value>
    </item>
    <item>
    <key> <string>portal_type</string> </key>
    <value> <string>Service Individual Variation</string> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string>vpVPS Reservation Fee</string> </value>
    </item>
    <item>
    <key> <string>variation_base_category_list</string> </key>
    <value>
    <tuple>
    <string>variation</string>
    </tuple>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7