Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Łukasz Nowak
slapos.core
Commits
2ba792be
Commit
2ba792be
authored
Oct 29, 2012
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moved capacity management in slapos_cloud
parent
e3753606
Changes
22
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
19 additions
and
76 deletions
+19
-76
master/bt5/slapos_cloud/PathTemplateItem/portal_alarms/slapos_update_computer_capacity_scope.xml
...m/portal_alarms/slapos_update_computer_capacity_scope.xml
+2
-2
master/bt5/slapos_cloud/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
...rtalTypePropertySheetTemplateItem/property_sheet_list.xml
+6
-0
master/bt5/slapos_cloud/PropertySheetTemplateItem/portal_property_sheets/SlaposCapacity.xml
...eetTemplateItem/portal_property_sheets/SlaposCapacity.xml
+1
-1
master/bt5/slapos_cloud/PropertySheetTemplateItem/portal_property_sheets/SlaposCapacity/capacity_quantity_property.xml
...erty_sheets/SlaposCapacity/capacity_quantity_property.xml
+0
-0
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Alarm_managePublicComputerCapacityScope.xml
.../slapos_cloud/Alarm_managePublicComputerCapacityScope.xml
+2
-2
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Computer_checkAndUpdateCapacityScope.xml
...ins/slapos_cloud/Computer_checkAndUpdateCapacityScope.xml
+1
-1
master/bt5/slapos_cloud/bt/revision
master/bt5/slapos_cloud/bt/revision
+1
-1
master/bt5/slapos_cloud/bt/template_path_list
master/bt5/slapos_cloud/bt/template_path_list
+1
-0
master/bt5/slapos_cloud/bt/template_portal_type_property_sheet_list
.../slapos_cloud/bt/template_portal_type_property_sheet_list
+3
-1
master/bt5/slapos_cloud/bt/template_property_sheet_id_list
master/bt5/slapos_cloud/bt/template_property_sheet_id_list
+2
-1
master/bt5/vifib_slapos_capacity/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
...rtalTypePropertySheetTemplateItem/property_sheet_list.xml
+0
-8
master/bt5/vifib_slapos_capacity/SkinTemplateItem/portal_skins/vifib_slapos_capacity.xml
...y/SkinTemplateItem/portal_skins/vifib_slapos_capacity.xml
+0
-47
master/bt5/vifib_slapos_capacity/bt/dependency_list
master/bt5/vifib_slapos_capacity/bt/dependency_list
+0
-2
master/bt5/vifib_slapos_capacity/bt/description
master/bt5/vifib_slapos_capacity/bt/description
+0
-1
master/bt5/vifib_slapos_capacity/bt/revision
master/bt5/vifib_slapos_capacity/bt/revision
+0
-1
master/bt5/vifib_slapos_capacity/bt/template_format_version
master/bt5/vifib_slapos_capacity/bt/template_format_version
+0
-1
master/bt5/vifib_slapos_capacity/bt/template_path_list
master/bt5/vifib_slapos_capacity/bt/template_path_list
+0
-1
master/bt5/vifib_slapos_capacity/bt/template_portal_type_property_sheet_list
...apos_capacity/bt/template_portal_type_property_sheet_list
+0
-2
master/bt5/vifib_slapos_capacity/bt/template_property_sheet_id_list
.../vifib_slapos_capacity/bt/template_property_sheet_id_list
+0
-1
master/bt5/vifib_slapos_capacity/bt/template_skin_id_list
master/bt5/vifib_slapos_capacity/bt/template_skin_id_list
+0
-1
master/bt5/vifib_slapos_capacity/bt/title
master/bt5/vifib_slapos_capacity/bt/title
+0
-1
master/bt5/vifib_slapos_capacity/bt/version
master/bt5/vifib_slapos_capacity/bt/version
+0
-1
No files found.
master/bt5/
vifib_slapos_capacity/PathTemplateItem/portal_alarms/vifib_desactivate_dead_computer
.xml
→
master/bt5/
slapos_cloud/PathTemplateItem/portal_alarms/slapos_update_computer_capacity_scope
.xml
View file @
2ba792be
...
@@ -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>
...
...
master/bt5/slapos_cloud/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
View file @
2ba792be
<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
master/bt5/
vifib_slapos_capacity/PropertySheetTemplateItem/portal_property_sheets/Vifib
Capacity.xml
→
master/bt5/
slapos_cloud/PropertySheetTemplateItem/portal_property_sheets/Slapos
Capacity.xml
View file @
2ba792be
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
Vifib
Capacity
</string>
</value>
<value>
<string>
Slapos
Capacity
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
portal_type
</string>
</key>
<key>
<string>
portal_type
</string>
</key>
...
...
master/bt5/
vifib_slapos_capacity/PropertySheetTemplateItem/portal_property_sheets/Vifib
Capacity/capacity_quantity_property.xml
→
master/bt5/
slapos_cloud/PropertySheetTemplateItem/portal_property_sheets/Slapos
Capacity/capacity_quantity_property.xml
View file @
2ba792be
File moved
master/bt5/
vifib_slapos_capacity/SkinTemplateItem/portal_skins/vifib_slapos_capacity/Alarm_desactivateDeadComputer
.xml
→
master/bt5/
slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Alarm_managePublicComputerCapacityScope
.xml
View file @
2ba792be
...
@@ -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_checkAnd
DesactivatePartitionList
\',\n
method_id=\'Computer_checkAnd
UpdateCapacityScope
\',\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>
...
...
master/bt5/
vifib_slapos_capacity/SkinTemplateItem/portal_skins/vifib_slapos_capacity/Computer_checkAndDesactivatePartitionList
.xml
→
master/bt5/
slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Computer_checkAndUpdateCapacityScope
.xml
View file @
2ba792be
...
@@ -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_checkAnd
DesactivatePartitionList
</string>
</value>
<value>
<string>
Computer_checkAnd
UpdateCapacityScope
</string>
</value>
</item>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
...
...
master/bt5/slapos_cloud/bt/revision
View file @
2ba792be
142
143
\ No newline at end of file
\ No newline at end of file
master/bt5/slapos_cloud/bt/template_path_list
View file @
2ba792be
...
@@ -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
master/bt5/slapos_cloud/bt/template_portal_type_property_sheet_list
View file @
2ba792be
Computer | SlaposCapacity
Hosting Subscription | HostingSubscription
Hosting Subscription | HostingSubscription
Hosting Subscription | SoftwareInstance
Hosting Subscription | SoftwareInstance
Hosting Subscription | TextDocument
Hosting Subscription | TextDocument
...
@@ -18,4 +19,5 @@ Software Instance | SoftwareInstance
...
@@ -18,4 +19,5 @@ Software Instance | SoftwareInstance
Software Instance | SoftwareInstanceConstraint
Software Instance | SoftwareInstanceConstraint
Software Instance | TextDocument
Software Instance | TextDocument
Software Instance | Url
Software Instance | Url
Software Instance | VariationRange
Software Instance | VariationRange
\ No newline at end of file
Software Release | SlaposCapacity
\ No newline at end of file
master/bt5/slapos_cloud/bt/template_property_sheet_id_list
View file @
2ba792be
SoftwareInstanceConstraint
SoftwareInstanceConstraint
SlaveInstanceConstraint
SlaveInstanceConstraint
SoftwareInstance
SoftwareInstance
HostingSubscription
HostingSubscription
\ No newline at end of file
SlaposCapacity
\ No newline at end of file
master/bt5/vifib_slapos_capacity/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
deleted
100644 → 0
View file @
e3753606
<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
master/bt5/vifib_slapos_capacity/SkinTemplateItem/portal_skins/vifib_slapos_capacity.xml
deleted
100644 → 0
View file @
e3753606
<?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>
master/bt5/vifib_slapos_capacity/bt/dependency_list
deleted
100644 → 0
View file @
e3753606
erp5_computer_immobilisation
erp5_software_pdm
\ No newline at end of file
master/bt5/vifib_slapos_capacity/bt/description
deleted
100644 → 0
View file @
e3753606
Manage capacity for computer
\ No newline at end of file
master/bt5/vifib_slapos_capacity/bt/revision
deleted
100644 → 0
View file @
e3753606
14
\ No newline at end of file
master/bt5/vifib_slapos_capacity/bt/template_format_version
deleted
100644 → 0
View file @
e3753606
1
\ No newline at end of file
master/bt5/vifib_slapos_capacity/bt/template_path_list
deleted
100644 → 0
View file @
e3753606
portal_alarms/vifib_desactivate_dead_computer
\ No newline at end of file
master/bt5/vifib_slapos_capacity/bt/template_portal_type_property_sheet_list
deleted
100644 → 0
View file @
e3753606
Computer | VifibCapacity
Software Release | VifibCapacity
\ No newline at end of file
master/bt5/vifib_slapos_capacity/bt/template_property_sheet_id_list
deleted
100644 → 0
View file @
e3753606
VifibCapacity
\ No newline at end of file
master/bt5/vifib_slapos_capacity/bt/template_skin_id_list
deleted
100644 → 0
View file @
e3753606
vifib_slapos_capacity
\ No newline at end of file
master/bt5/vifib_slapos_capacity/bt/title
deleted
100644 → 0
View file @
e3753606
vifib_slapos_capacity
\ No newline at end of file
master/bt5/vifib_slapos_capacity/bt/version
deleted
100644 → 0
View file @
e3753606
0.1
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment