Commit 2ba792be authored by Romain Courteaud's avatar Romain Courteaud

Moved capacity management in slapos_cloud

parent e3753606
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>active_sense_method_id</string> </key> <key> <string>active_sense_method_id</string> </key>
<value> <string>Alarm_desactivateDeadComputer</string> </value> <value> <string>Alarm_managePublicComputerCapacityScope</string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>vifib_desactivate_dead_computer</string> </value> <value> <string>slapos_update_computer_capacity_scope</string> </value>
</item> </item>
<item> <item>
<key> <string>periodicity_day_frequency</string> </key> <key> <string>periodicity_day_frequency</string> </key>
......
<property_sheet_list> <property_sheet_list>
<portal_type id="Computer">
<item>SlaposCapacity</item>
</portal_type>
<portal_type id="Hosting Subscription"> <portal_type id="Hosting Subscription">
<item>HostingSubscription</item> <item>HostingSubscription</item>
<item>SoftwareInstance</item> <item>SoftwareInstance</item>
...@@ -28,4 +31,7 @@ ...@@ -28,4 +31,7 @@
<item>Url</item> <item>Url</item>
<item>VariationRange</item> <item>VariationRange</item>
</portal_type> </portal_type>
<portal_type id="Software Release">
<item>SlaposCapacity</item>
</portal_type>
</property_sheet_list> </property_sheet_list>
\ No newline at end of file
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>VifibCapacity</string> </value> <value> <string>SlaposCapacity</string> </value>
</item> </item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
......
...@@ -56,7 +56,7 @@ portal.portal_catalog.searchAndActivate(\n ...@@ -56,7 +56,7 @@ portal.portal_catalog.searchAndActivate(\n
portal_type=\'Computer\',\n portal_type=\'Computer\',\n
default_allocation_scope_uid=portal.restrictedTraverse("portal_categories/allocation_scope/open/public").getUid(),\n default_allocation_scope_uid=portal.restrictedTraverse("portal_categories/allocation_scope/open/public").getUid(),\n
validation_state="validated",\n validation_state="validated",\n
method_id=\'Computer_checkAndDesactivatePartitionList\',\n method_id=\'Computer_checkAndUpdateCapacityScope\',\n
activate_kw={\'tag\': tag}\n activate_kw={\'tag\': tag}\n
)\n )\n
context.activate(after_tag=tag).getId()\n context.activate(after_tag=tag).getId()\n
...@@ -68,7 +68,7 @@ context.activate(after_tag=tag).getId()\n ...@@ -68,7 +68,7 @@ context.activate(after_tag=tag).getId()\n
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>Alarm_desactivateDeadComputer</string> </value> <value> <string>Alarm_managePublicComputerCapacityScope</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
...@@ -151,7 +151,7 @@ if new_value is not None:\n ...@@ -151,7 +151,7 @@ if new_value is not None:\n
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>Computer_checkAndDesactivatePartitionList</string> </value> <value> <string>Computer_checkAndUpdateCapacityScope</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
142 143
\ No newline at end of file \ No newline at end of file
...@@ -8,5 +8,6 @@ person_module/template_member/** ...@@ -8,5 +8,6 @@ person_module/template_member/**
portal_alarms/promise_slapos_module_id_generator portal_alarms/promise_slapos_module_id_generator
portal_alarms/promise_slapos_pas portal_alarms/promise_slapos_pas
portal_alarms/slapos_allocate_instance portal_alarms/slapos_allocate_instance
portal_alarms/slapos_update_computer_capacity_scope
software_installation_module/template_software_installation software_installation_module/template_software_installation
software_instance_module/template_software_instance software_instance_module/template_software_instance
\ No newline at end of file
Computer | SlaposCapacity
Hosting Subscription | HostingSubscription Hosting Subscription | HostingSubscription
Hosting Subscription | SoftwareInstance Hosting Subscription | SoftwareInstance
Hosting Subscription | TextDocument Hosting Subscription | TextDocument
...@@ -19,3 +20,4 @@ Software Instance | SoftwareInstanceConstraint ...@@ -19,3 +20,4 @@ Software Instance | SoftwareInstanceConstraint
Software Instance | TextDocument Software Instance | TextDocument
Software Instance | Url Software Instance | Url
Software Instance | VariationRange Software Instance | VariationRange
Software Release | SlaposCapacity
\ No newline at end of file
...@@ -2,3 +2,4 @@ SoftwareInstanceConstraint ...@@ -2,3 +2,4 @@ SoftwareInstanceConstraint
SlaveInstanceConstraint SlaveInstanceConstraint
SoftwareInstance SoftwareInstance
HostingSubscription HostingSubscription
SlaposCapacity
\ No newline at end of file
<property_sheet_list>
<portal_type id="Computer">
<item>VifibCapacity</item>
</portal_type>
<portal_type id="Software Release">
<item>VifibCapacity</item>
</portal_type>
</property_sheet_list>
\ No newline at end of file
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Folder" module="OFS.Folder"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_local_properties</string> </key>
<value>
<tuple>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>business_template_skin_layer_priority</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>float</string> </value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key> <string>_objects</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>business_template_skin_layer_priority</string> </key>
<value> <float>60.0</float> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>vifib_slapos_capacity</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
erp5_computer_immobilisation
erp5_software_pdm
\ No newline at end of file
Manage capacity for computer
\ No newline at end of file
portal_alarms/vifib_desactivate_dead_computer
\ No newline at end of file
Computer | VifibCapacity
Software Release | VifibCapacity
\ No newline at end of file
vifib_slapos_capacity
\ No newline at end of file
vifib_slapos_capacity
\ 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