Skip to content

S
slapos.core
Commit fb7b2bdb authored by Łukasz Nowak's avatar Łukasz Nowak
Browse files
Options

All services can be discounted.

parent 4dd4aa5f
Show whitespace changes
Inline Side-by-side
Showing with 478 additions and 10 deletions
master/bt5/vifib_data/PathTemplateItem/service_module/cpu_consumption.xml
View file @ fb7b2bdb
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
<tuple> <tuple>
<string>quantity_unit/unit/piece</string> <string>quantity_unit/unit/piece</string>
<string>product_line/cloud/usage</string> <string>product_line/cloud/usage</string>
<string>base_contribution/base_amount/invoicing/discounted</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -166,7 +167,7 @@ ...@@ -166,7 +167,7 @@
<value> <value>
<object> <object>
<klass> <klass>
<global name="DateTime" module="DateTime.DateTime"/> <global id="3.1" name="DateTime" module="DateTime.DateTime"/>
</klass> </klass>
<tuple> <tuple>
<none/> <none/>
...@@ -181,6 +182,51 @@ ...@@ -181,6 +182,51 @@
</value> </value>
</item> </item>
</dictionary> </dictionary>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>edit</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>ERP5TypeTestCase</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>916.11835.12815.57924</string> </value>
</item>
<item>
<key> <string>state</string> </key>
<value> <string>current</string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass> <reference id="3.1"/> </klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1328265546.42</float>
<string>GMT+1</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list> </list>
</tuple> </tuple>
</pickle> </pickle>
......
master/bt5/vifib_data/PathTemplateItem/service_module/memory_consumption.xml
View file @ fb7b2bdb
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
<tuple> <tuple>
<string>quantity_unit/unit/piece</string> <string>quantity_unit/unit/piece</string>
<string>product_line/cloud/usage</string> <string>product_line/cloud/usage</string>
<string>base_contribution/base_amount/invoicing/discounted</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -166,7 +167,7 @@ ...@@ -166,7 +167,7 @@
<value> <value>
<object> <object>
<klass> <klass>
<global name="DateTime" module="DateTime.DateTime"/> <global id="3.1" name="DateTime" module="DateTime.DateTime"/>
</klass> </klass>
<tuple> <tuple>
<none/> <none/>
...@@ -181,6 +182,51 @@ ...@@ -181,6 +182,51 @@
</value> </value>
</item> </item>
</dictionary> </dictionary>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>edit</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>ERP5TypeTestCase</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>916.11835.12815.57924</string> </value>
</item>
<item>
<key> <string>state</string> </key>
<value> <string>current</string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass> <reference id="3.1"/> </klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1328265541.06</float>
<string>GMT+1</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list> </list>
</tuple> </tuple>
</pickle> </pickle>
......
master/bt5/vifib_data/PathTemplateItem/service_module/vifib_instance_cleanup.xml
View file @ fb7b2bdb
...@@ -96,6 +96,7 @@ ...@@ -96,6 +96,7 @@
<tuple> <tuple>
<string>quantity_unit/unit/piece</string> <string>quantity_unit/unit/piece</string>
<string>product_line/cloud/configuration</string> <string>product_line/cloud/configuration</string>
<string>base_contribution/base_amount/invoicing/discounted</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -311,6 +312,51 @@ ...@@ -311,6 +312,51 @@
</value> </value>
</item> </item>
</dictionary> </dictionary>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>edit</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>ERP5TypeTestCase</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>916.11835.12815.57924</string> </value>
</item>
<item>
<key> <string>state</string> </key>
<value> <string>current</string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass> <reference id="3.1"/> </klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1328265536.32</float>
<string>GMT+1</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list> </list>
</tuple> </tuple>
</pickle> </pickle>
......
master/bt5/vifib_data/PathTemplateItem/service_module/vifib_instance_hosting.xml
View file @ fb7b2bdb
...@@ -69,6 +69,7 @@ ...@@ -69,6 +69,7 @@
<tuple> <tuple>
<string>quantity_unit/unit/piece</string> <string>quantity_unit/unit/piece</string>
<string>product_line/cloud/configuration</string> <string>product_line/cloud/configuration</string>
<string>base_contribution/base_amount/invoicing/discounted</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -248,6 +249,51 @@ ...@@ -248,6 +249,51 @@
</value> </value>
</item> </item>
</dictionary> </dictionary>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>edit</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>ERP5TypeTestCase</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>916.11835.12815.57924</string> </value>
</item>
<item>
<key> <string>state</string> </key>
<value> <string>current</string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass> <reference id="3.1"/> </klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1328265531.73</float>
<string>GMT+1</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list> </list>
</tuple> </tuple>
</pickle> </pickle>
......
master/bt5/vifib_data/PathTemplateItem/service_module/vifib_instance_setup.xml
View file @ fb7b2bdb
...@@ -69,6 +69,7 @@ ...@@ -69,6 +69,7 @@
<tuple> <tuple>
<string>quantity_unit/unit/piece</string> <string>quantity_unit/unit/piece</string>
<string>product_line/cloud/configuration</string> <string>product_line/cloud/configuration</string>
<string>base_contribution/base_amount/invoicing/discounted</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -101,9 +102,9 @@ ...@@ -101,9 +102,9 @@
<value> <value>
<tuple> <tuple>
<string>Computer Partition</string> <string>Computer Partition</string>
<string>Hosting Subscription</string>
<string>Software Instance</string> <string>Software Instance</string>
<string>Software Release</string> <string>Software Release</string>
<string>Hosting Subscription</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -188,7 +189,7 @@ ...@@ -188,7 +189,7 @@
<value> <value>
<object> <object>
<klass> <klass>
<global name="DateTime" module="DateTime.DateTime"/> <global id="3.1" name="DateTime" module="DateTime.DateTime"/>
</klass> </klass>
<tuple> <tuple>
<none/> <none/>
...@@ -203,6 +204,51 @@ ...@@ -203,6 +204,51 @@
</value> </value>
</item> </item>
</dictionary> </dictionary>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>edit</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>ERP5TypeTestCase</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>916.11835.12815.57924</string> </value>
</item>
<item>
<key> <string>state</string> </key>
<value> <string>current</string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass> <reference id="3.1"/> </klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1328265527.68</float>
<string>GMT+1</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list> </list>
</tuple> </tuple>
</pickle> </pickle>
......
master/bt5/vifib_data/PathTemplateItem/service_module/vifib_instance_subscription.xml
View file @ fb7b2bdb
...@@ -69,6 +69,7 @@ ...@@ -69,6 +69,7 @@
<tuple> <tuple>
<string>quantity_unit/unit/piece</string> <string>quantity_unit/unit/piece</string>
<string>product_line/cloud/subscription</string> <string>product_line/cloud/subscription</string>
<string>base_contribution/base_amount/invoicing/discounted</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -101,9 +102,9 @@ ...@@ -101,9 +102,9 @@
<value> <value>
<tuple> <tuple>
<string>Computer Partition</string> <string>Computer Partition</string>
<string>Hosting Subscription</string>
<string>Software Instance</string> <string>Software Instance</string>
<string>Software Release</string> <string>Software Release</string>
<string>Hosting Subscription</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -188,7 +189,7 @@ ...@@ -188,7 +189,7 @@
<value> <value>
<object> <object>
<klass> <klass>
<global name="DateTime" module="DateTime.DateTime"/> <global id="3.1" name="DateTime" module="DateTime.DateTime"/>
</klass> </klass>
<tuple> <tuple>
<none/> <none/>
...@@ -203,6 +204,51 @@ ...@@ -203,6 +204,51 @@
</value> </value>
</item> </item>
</dictionary> </dictionary>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>edit</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>ERP5TypeTestCase</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>916.11835.12815.57924</string> </value>
</item>
<item>
<key> <string>state</string> </key>
<value> <string>current</string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass> <reference id="3.1"/> </klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1328265523.68</float>
<string>GMT+1</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list> </list>
</tuple> </tuple>
</pickle> </pickle>
......
master/bt5/vifib_data/PathTemplateItem/service_module/vifib_instance_update.xml
View file @ fb7b2bdb
...@@ -69,6 +69,7 @@ ...@@ -69,6 +69,7 @@
<tuple> <tuple>
<string>quantity_unit/unit/piece</string> <string>quantity_unit/unit/piece</string>
<string>product_line/cloud/configuration</string> <string>product_line/cloud/configuration</string>
<string>base_contribution/base_amount/invoicing/discounted</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -248,6 +249,51 @@ ...@@ -248,6 +249,51 @@
</value> </value>
</item> </item>
</dictionary> </dictionary>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>edit</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>ERP5TypeTestCase</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>916.11835.12815.57924</string> </value>
</item>
<item>
<key> <string>state</string> </key>
<value> <string>current</string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass> <reference id="3.1"/> </klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1328265519.6</float>
<string>GMT+1</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list> </list>
</tuple> </tuple>
</pickle> </pickle>
......
master/bt5/vifib_data/PathTemplateItem/service_module/vifib_software_setup.xml
View file @ fb7b2bdb
...@@ -66,6 +66,7 @@ ...@@ -66,6 +66,7 @@
<value> <value>
<tuple> <tuple>
<string>quantity_unit/unit/piece</string> <string>quantity_unit/unit/piece</string>
<string>base_contribution/base_amount/invoicing/discounted</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -183,7 +184,7 @@ ...@@ -183,7 +184,7 @@
<value> <value>
<object> <object>
<klass> <klass>
<global name="DateTime" module="DateTime.DateTime"/> <global id="3.1" name="DateTime" module="DateTime.DateTime"/>
</klass> </klass>
<tuple> <tuple>
<none/> <none/>
...@@ -198,6 +199,51 @@ ...@@ -198,6 +199,51 @@
</value> </value>
</item> </item>
</dictionary> </dictionary>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>edit</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>ERP5TypeTestCase</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>916.11835.12815.57924</string> </value>
</item>
<item>
<key> <string>state</string> </key>
<value> <string>current</string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass> <reference id="3.1"/> </klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1328265514.67</float>
<string>GMT+1</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list> </list>
</tuple> </tuple>
</pickle> </pickle>
......
master/bt5/vifib_data/PathTemplateItem/service_module/vifib_usage_report.xml
View file @ fb7b2bdb
...@@ -64,6 +64,7 @@ ...@@ -64,6 +64,7 @@
<tuple> <tuple>
<string>quantity_unit/volume/cubic_meter</string> <string>quantity_unit/volume/cubic_meter</string>
<string>product_line/cloud/usage</string> <string>product_line/cloud/usage</string>
<string>base_contribution/base_amount/invoicing/discounted</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -196,7 +197,7 @@ ...@@ -196,7 +197,7 @@
<value> <value>
<object> <object>
<klass> <klass>
<global name="DateTime" module="DateTime.DateTime"/> <global id="4.1" name="DateTime" module="DateTime.DateTime"/>
</klass> </klass>
<tuple> <tuple>
<none/> <none/>
...@@ -211,6 +212,51 @@ ...@@ -211,6 +212,51 @@
</value> </value>
</item> </item>
</dictionary> </dictionary>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>edit</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>ERP5TypeTestCase</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>916.11835.12815.57924</string> </value>
</item>
<item>
<key> <string>state</string> </key>
<value> <string>current</string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass> <reference id="4.1"/> </klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1328265509.99</float>
<string>GMT+1</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list> </list>
</tuple> </tuple>
</pickle> </pickle>
......
master/bt5/vifib_data/bt/revision
View file @ fb7b2bdb
93 94
\ No newline at end of file \ No newline at end of file
master/bt5/vifib_erp5/PathTemplateItem/service_module/computer_registration.xml
View file @ fb7b2bdb
...@@ -65,6 +65,7 @@ ...@@ -65,6 +65,7 @@
<value> <value>
<tuple> <tuple>
<string>quantity_unit/unit/piece</string> <string>quantity_unit/unit/piece</string>
<string>base_contribution/base_amount/invoicing/discounted</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
master/bt5/vifib_erp5/PathTemplateItem/service_module/vifib_registration.xml
View file @ fb7b2bdb
...@@ -52,6 +52,14 @@ ...@@ -52,6 +52,14 @@
</tuple> </tuple>
</value> </value>
</item> </item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>base_contribution/base_amount/invoicing/discounted</string>
</tuple>
</value>
</item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
<value> <value>
...@@ -305,6 +313,51 @@ ...@@ -305,6 +313,51 @@
</value> </value>
</item> </item>
</dictionary> </dictionary>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>edit</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>ERP5TypeTestCase</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>916.12291.13833.28433</string> </value>
</item>
<item>
<key> <string>state</string> </key>
<value> <string>current</string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass> <reference id="3.1"/> </klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1328265562.37</float>
<string>GMT+1</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list> </list>
</tuple> </tuple>
</pickle> </pickle>
......
master/bt5/vifib_erp5/bt/revision
View file @ fb7b2bdb
344 345
\ No newline at end of file \ No newline at end of file
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