Skip to content

S
slapos.core
Commit c719f798 authored by Romain Courteaud's avatar Romain Courteaud 🐸
Browse files
Options

Support region in SLA.

parent 8866ce7d
Hide whitespace changes
Inline Side-by-side
Showing with 232 additions and 2 deletions
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Person_findPartition.xml
View file @ c719f798
...@@ -93,6 +93,7 @@ computer_base_category_list = [\n ...@@ -93,6 +93,7 @@ computer_base_category_list = [\n
\'cpu_frequency\',\n \'cpu_frequency\',\n
\'cpu_type\',\n \'cpu_type\',\n
\'local_area_network_type\',\n \'local_area_network_type\',\n
\'region\',\n
\'memory_size\',\n \'memory_size\',\n
\'memory_type\',\n \'memory_type\',\n
\'storage_capacity\',\n \'storage_capacity\',\n
......
master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCloudAlarm.py
View file @ c719f798
...@@ -657,6 +657,10 @@ portal_workflow.doActionFor(context, action='edit_action', comment='Visited by S ...@@ -657,6 +657,10 @@ portal_workflow.doActionFor(context, action='edit_action', comment='Visited by S
def test_allocation_memory_type_sla(self): def test_allocation_memory_type_sla(self):
return self.check_allocation_category_sla('memory_type', 'ddr2', 'ddr3') return self.check_allocation_category_sla('memory_type', 'ddr2', 'ddr3')
def test_allocation_region_sla(self):
return self.check_allocation_category_sla('region', 'africa',
'america')
def test_allocation_storage_capacity_sla(self): def test_allocation_storage_capacity_sla(self):
return self.check_allocation_category_sla('storage_capacity', 'finite', return self.check_allocation_category_sla('storage_capacity', 'finite',
'infinite') 'infinite')
......
master/bt5/slapos_cloud/bt/revision
View file @ c719f798
271 272
\ No newline at end of file \ No newline at end of file
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/Computer_viewCategoryAsWeb.xml
View file @ c719f798
...@@ -102,6 +102,7 @@ ...@@ -102,6 +102,7 @@
<string>my_local_area_network_type</string> <string>my_local_area_network_type</string>
<string>my_memory_size</string> <string>my_memory_size</string>
<string>my_memory_type</string> <string>my_memory_type</string>
<string>my_region</string>
<string>my_storage_capacity</string> <string>my_storage_capacity</string>
<string>my_storage_interface</string> <string>my_storage_interface</string>
<string>my_storage_redundancy</string> <string>my_storage_redundancy</string>
......
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/Computer_viewCategoryAsWeb/my_region.xml 0 → 100644
View file @ c719f798
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_region</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_category</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Region</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_getRequestDialogJS.xml
View file @ c719f798
...@@ -70,6 +70,7 @@ $(document).ready(function () {\n ...@@ -70,6 +70,7 @@ $(document).ready(function () {\n
\'local_area_network_type\',\n \'local_area_network_type\',\n
\'memory_size\',\n \'memory_size\',\n
\'memory_type\',\n \'memory_type\',\n
\'region\',\n
\'storage_capacity\',\n \'storage_capacity\',\n
\'storage_interface\',\n \'storage_interface\',\n
\'storage_redundancy\',\n \'storage_redundancy\',\n
......
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog.xml
View file @ c719f798
...@@ -106,6 +106,7 @@ ...@@ -106,6 +106,7 @@
<string>your_local_area_network_type</string> <string>your_local_area_network_type</string>
<string>your_memory_size</string> <string>your_memory_size</string>
<string>your_memory_type</string> <string>your_memory_type</string>
<string>your_region</string>
<string>your_storage_capacity</string> <string>your_storage_capacity</string>
<string>your_storage_interface</string> <string>your_storage_interface</string>
<string>your_storage_redundancy</string> <string>your_storage_redundancy</string>
......
master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_region.xml 0 → 100644
View file @ c719f798
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>items</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>your_region</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>items</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_category</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>items</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Region</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: getattr(here.portal_categories[field.getId().replace(\'your_\', \'\', 1)], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_web/bt/revision
View file @ c719f798
37 38
\ 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