Skip to content

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

slapos_*: rename Compute to Compute Node 

libslap must continue to use the same class names for compatibility.

Changes are made to keep the migration as simple as possible:
  * do not change the catalog table/column names
  * do not change the local_role's names and the related categories
  * keep Computer Consumption portal type
  * keep portal_id's group name
  * keep SLA compatibility
  * keep SlapTool compatibility

SlapTool: restore compatibility with Hosting Subscription method
parent ebdff0cc
Expand all Show whitespace changes
Inline Side-by-side
Showing with 5470 additions and 5343 deletions
master/bt5/slapos_accounting/ExtensionTemplateItem/portal_components/extension.erp5.SlapOSAccounting.py
View file @ fba76904
......@@ -36,12 +36,12 @@ def ComputerConsumptionTioXMLFile_parseXml(self, REQUEST=None):
raise Unauthorized
xml = self.getData("")
computer_consumption_model = \
compute_node_consumption_model = \
pkg_resources.resource_string(
'slapos.slap', 'doc/computer_consumption.xsd')
# Validate against the xsd
xsd_model = StringIO.StringIO(computer_consumption_model)
xsd_model = StringIO.StringIO(compute_node_consumption_model)
xmlschema_doc = etree.parse(xsd_model)
xmlschema = etree.XMLSchema(xmlschema_doc)
......
master/bt5/slapos_accounting/PathTemplateItem/service_module/slapos_instance_cleanup.xml
View file @ fba76904
......@@ -101,7 +101,7 @@
<key> <string>aggregated_portal_type</string> </key>
<value>
<tuple>
<string>Computer Partition</string>
<string>Compute Partition</string>
<string>Slave Instance</string>
<string>Software Instance</string>
</tuple>
......
master/bt5/slapos_accounting/PathTemplateItem/service_module/slapos_instance_hosting.xml
View file @ fba76904
......@@ -74,7 +74,7 @@
<key> <string>aggregated_portal_type</string> </key>
<value>
<tuple>
<string>Computer Partition</string>
<string>Compute Partition</string>
<string>Instance Tree</string>
<string>Software Instance</string>
<string>Software Release</string>
......@@ -121,7 +121,7 @@
<key> <string>required_aggregated_portal_type</string> </key>
<value>
<tuple>
<string>Computer Partition</string>
<string>Compute Partition</string>
<string>Instance Tree</string>
<string>Software Instance</string>
<string>Software Release</string>
......
master/bt5/slapos_accounting/PathTemplateItem/service_module/slapos_instance_setup.xml
View file @ fba76904
......@@ -74,7 +74,7 @@
<key> <string>aggregated_portal_type</string> </key>
<value>
<tuple>
<string>Computer Partition</string>
<string>Compute Partition</string>
<string>Slave Instance</string>
<string>Software Instance</string>
</tuple>
......
master/bt5/slapos_accounting/PathTemplateItem/service_module/slapos_instance_subscription.xml
View file @ fba76904
......@@ -74,7 +74,7 @@
<key> <string>aggregated_portal_type</string> </key>
<value>
<tuple>
<string>Computer Partition</string>
<string>Compute Partition</string>
<string>Instance Tree</string>
<string>Software Instance</string>
<string>Software Release</string>
......@@ -121,7 +121,7 @@
<key> <string>required_aggregated_portal_type</string> </key>
<value>
<tuple>
<string>Computer Partition</string>
<string>Compute Partition</string>
<string>Instance Tree</string>
<string>Software Instance</string>
<string>Software Release</string>
......
master/bt5/slapos_accounting/PathTemplateItem/service_module/slapos_netdrive_consumption.xml
View file @ fba76904
......@@ -74,7 +74,7 @@
<key> <string>aggregated_portal_type</string> </key>
<value>
<tuple>
<string>Computer Partition</string>
<string>Compute Partition</string>
<string>Instance Tree</string>
<string>Software Instance</string>
<string>Software Release</string>
......@@ -121,7 +121,7 @@
<key> <string>required_aggregated_portal_type</string> </key>
<value>
<tuple>
<string>Computer Partition</string>
<string>Compute Partition</string>
<string>Instance Tree</string>
<string>Software Instance</string>
<string>Software Release</string>
......
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/OrderBuilder_generateSlapOSAggregatedMovementList.py
View file @ fba76904
......@@ -31,7 +31,7 @@ select_kw.update(
select_dict=select_dict,
left_join_list=select_dict.keys(),
resource__uid=aggregateable_service_uid_list,
default_aggregate_portal_type=ComplexQuery(NegatedQuery(Query(default_aggregate_portal_type='Computer')),
default_aggregate_portal_type=ComplexQuery(NegatedQuery(Query(default_aggregate_portal_type='Compute Node')),
Query(default_aggregate_portal_type=None),logical_operator="OR"),
grouping_reference=None,
sort_on=(('modification_date', 'ASC'),) # the highest chance to find movement which can be delivered
......
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_consumption/Base_jumpToViewLatestDayConsumption.py
View file @ fba76904
portal = context.getPortalObject()
if context.getPortalType() == "Computer":
if context.getPortalType() == "Compute Node":
# Get the Latest Sale Packing List
sale_packing_list_line = portal.portal_catalog.getResultValue(
......@@ -17,4 +17,4 @@ if context.getPortalType() == "Computer":
return sale_packing_list.Base_redirect('Base_viewListMode?proxy_form_id=SalePackingList_view&proxy_field_id=listbox')
# Redirect to web site to hide the indexation process
context.Base_redirect('view', keep_items={'portal_status_message':context.Base_translateString('No Consumption Report for this computer.')})
context.Base_redirect('view', keep_items={'portal_status_message':context.Base_translateString('No Consumption Report for this compute_node.')})
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_consumption/Computer_getLatestCPUPercentLoad.xml → master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_consumption/ComputeNode_getLatestCPUPercentLoad.xml
View file @ fba76904
......@@ -62,7 +62,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Computer_getLatestCPUPercentLoad</string> </value>
<value> <string>ComputeNode_getLatestCPUPercentLoad</string> </value>
</item>
</dictionary>
</pickle>
......
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_consumption/Computer_getWattConsumption.py → master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_consumption/ComputeNode_getWattConsumption.py
View file @ fba76904
......@@ -8,7 +8,7 @@ model_id = context.getWattConsumptionModel("no_model")
# Introduce your Consumption Model here
######
def consumption_model_shuttle_ds61_i7(load):
""" Expected consumed watts for the computer load
""" Expected consumed watts for the compute_node load
"""
if load <= 25:
return 21.5 + 1.06*load
......@@ -16,7 +16,7 @@ def consumption_model_shuttle_ds61_i7(load):
return 48 + 0.29*load
def consumption_model_shuttle_nuc_i7(load):
""" Expected consumed watts for the computer load
""" Expected consumed watts for the compute_node load
"""
if load <= 25:
return 8.5 + 0.46*load
......@@ -24,7 +24,7 @@ def consumption_model_shuttle_nuc_i7(load):
return 20 + 0.08*load
def consumption_model_rikomagic_mk802iv(load):
""" Expected consumed watts for the computer load
""" Expected consumed watts for the compute_node load
"""
if load <= 25:
return 2.2 + 0.04*load
......@@ -40,7 +40,7 @@ model_map = {
"intel_nuc_i7": consumption_model_shuttle_nuc_i7
}
if cpu_load_percentage is None:
cpu_load_percentage = context.Computer_getLatestCPUPercentLoad()
cpu_load_percentage = context.ComputeNode_getLatestCPUPercentLoad()
cpu_load_percentage += partition_increment
......
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_consumption/Computer_getWattConsumption.xml → master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_consumption/ComputeNode_getWattConsumption.xml
View file @ fba76904
......@@ -62,7 +62,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Computer_getWattConsumption</string> </value>
<value> <string>ComputeNode_getWattConsumption</string> </value>
</item>
</dictionary>
</pickle>
......
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Project_getComputerReferenceList.xml → master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_consumption/ComputeNode_getZeroEmissionRatio.xml
View file @ fba76904
......@@ -62,7 +62,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Project_getComputerReferenceList</string> </value>
<value> <string>ComputeNode_getZeroEmissionRatio</string> </value>
</item>
</dictionary>
</pickle>
......
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_consumption/Computer_reportComputerConsumption.py → master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_consumption/ComputeNode_reportComputeNodeConsumption.py
View file @ fba76904
......@@ -3,22 +3,22 @@ if REQUEST is not None:
raise Unauthorized
portal = context.getPortalObject()
computer = context
compute_node = context
reference = "TIOCONS-%s-%s" % (computer.getReference(), source_reference)
reference = "TIOCONS-%s-%s" % (compute_node.getReference(), source_reference)
version = "%s" % context.getPortalObject().portal_ids.generateNewId(
id_group=('slap_tioxml_consumption_reference', reference), default=1)
document = portal.consumption_document_module.newContent(
portal_type="Computer Consumption TioXML File",
source_reference=source_reference,
title="%s consumption (%s)" % (computer.getReference(), source_reference),
title="%s consumption (%s)" % (compute_node.getReference(), source_reference),
reference=reference,
version=version,
data=consumption_xml,
classification="personal",
publication_section="other",
contributor_value=computer,
contributor_value=compute_node,
)
document.submit()
return document.getRelativeUrl()
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_consumption/Computer_reportComputerConsumption.xml → master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_consumption/ComputeNode_reportComputeNodeConsumption.xml
View file @ fba76904
......@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Computer_reportComputerConsumption</string> </value>
<value> <string>ComputeNode_reportComputeNodeConsumption</string> </value>
</item>
</dictionary>
</pickle>
......
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_consumption/ComputerConsumptionTioXMLFile_solveInvoicingGeneration.py
View file @ fba76904
......@@ -19,33 +19,33 @@ if tioxml_dict is None:
document.reject(comment="Not usable TioXML data")
else:
computer = context.getContributorValue(portal_type="Computer")
computer_project_document = computer.Item_getCurrentProjectValue()
compute_node = context.getContributorValue(portal_type="Compute Node")
compute_node_project_document = compute_node.Item_getCurrentProjectValue()
delivery_title = tioxml_dict['title']
computer_project = None
if computer_project_document is not None:
computer_project = computer_project_document.getRelativeUrl()
compute_node_project = None
if compute_node_project_document is not None:
compute_node_project = compute_node_project_document.getRelativeUrl()
movement_list = []
for movement in tioxml_dict["movement"]:
reference = movement['reference']
# It had been reported for the computer itself so it is pure
# It had been reported for the compute_node itself so it is pure
# informative.
if computer.getReference() == reference:
aggregate_value_list = [computer]
person = computer.getSourceAdministrationValue(portal_type="Person")
project = computer_project
if compute_node.getReference() == reference:
aggregate_value_list = [compute_node]
person = compute_node.getSourceAdministrationValue(portal_type="Person")
project = compute_node_project
else:
project = None # For now, else we should calculate this too.
if reference.startswith("slapuser"):
reference = reference.replace("slapuser", "slappart")
# Find the partition / software instance / user
partition = portal.portal_catalog.getResultValue(
parent_uid=computer.getUid(),
parent_uid=compute_node.getUid(),
reference=reference,
portal_type="Computer Partition",
portal_type="Compute Partition",
validation_state="validated")
if partition.getSlapState() != 'busy':
......@@ -85,7 +85,7 @@ else:
)
# Time to create the PL
person = computer.getSourceAdministrationValue(portal_type="Person")
person = compute_node.getSourceAdministrationValue(portal_type="Person")
delivery_template = portal.restrictedTraverse(
portal.portal_preferences.getPreferredInstanceDeliveryTemplate())
delivery = delivery_template.Base_createCloneDocument(batch_mode=1)
......
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_consumption/InstanceTree_getResourceConsumptionDetailList.py
View file @ fba76904
......@@ -41,7 +41,7 @@ elif context.getPortalType() == 'Person':
else:
return []
elif context.getPortalType() in ['Software Instance', 'Instance Tree',
'Computer']:
'Compute Node']:
query_kw['aggregate_uid'] = context.getUid()
else:
return []
......@@ -69,17 +69,17 @@ def setDetailLine(packing_list_line):
portal_type='Instance Tree')
software_instance = packing_list_line.getAggregateValue(
portal_type='Software Instance')
computer_partition = packing_list_line.getAggregateValue(
portal_type='Computer Partition')
compute_partition = packing_list_line.getAggregateValue(
portal_type='Compute Partition')
if software_instance is None:
# In case we found SPL line not aggregated to instance and hosting
return
instance_tree_reference = hosting_s.getReference()
instance_reference = software_instance.getReference()
computer_title = ""
if computer_partition is not None:
computer = computer_partition.getParent()
computer_title = computer.getTitle() if computer.getCpuCore() is None else '%s (%s CPU Cores)' % (computer.getTitle(), computer.getCpuCore())
compute_node_title = ""
if compute_partition is not None:
compute_node = compute_partition.getParent()
compute_node_title = compute_node.getTitle() if compute_node.getCpuCore() is None else '%s (%s CPU Cores)' % (compute_node.getTitle(), compute_node.getCpuCore())
#default_line = {'date': {'hosting_ref': ['hs_title', {'instance_ref': ['inst_title', ['res1', 'res2', 'resN'] ] } ] } }
if not start_date in consumption_dict:
# Add new date line
......@@ -89,7 +89,7 @@ def setDetailLine(packing_list_line):
[software_instance.getTitle(),
[0.0, 0.0, 0.0],
software_instance.getRelativeUrl(),
computer_title
compute_node_title
]
},
hosting_s.getRelativeUrl()
......@@ -102,7 +102,7 @@ def setDetailLine(packing_list_line):
[software_instance.getTitle(),
[0.0, 0.0, 0.0],
software_instance.getRelativeUrl(),
computer_title
compute_node_title
]
},
hosting_s.getRelativeUrl()
......@@ -111,7 +111,7 @@ def setDetailLine(packing_list_line):
if not instance_reference in consumption_dict[start_date][instance_tree_reference][1]:
consumption_dict[start_date][instance_tree_reference][1][instance_reference] = [
software_instance.getTitle(), [0.0, 0.0, 0.0], software_instance.getRelativeUrl(),
computer_title
compute_node_title
]
if packing_list_line.getResourceUid() == cpu_resource_uid:
quantity = round(float(packing_list_line.getQuantity()), 3)
......@@ -134,7 +134,7 @@ for date in sorted(consumption_dict, reverse=True):
for hosting_key in sorted(consumption_dict[date]):
instance_tree_title, instance_dict, hs_url = consumption_dict[date][hosting_key]
for instance_value_list in instance_dict.values():
instance_title, values, instance_url, computer_title = instance_value_list
instance_title, values, instance_url, compute_node_title = instance_value_list
line = newTempBase(portal, instance_url, uid="%s_%s" % (context.getUid(), i))
line.edit(
title=instance_tree_title,
......@@ -143,7 +143,7 @@ for date in sorted(consumption_dict, reverse=True):
cpu_load=values[0],
memory_used=values[1],
disk_used=values[2],
computer_title=computer_title,
compute_node_title=compute_node_title,
hosting_url=hs_url,
instance_url=instance_url
)
......
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_consumption/InstanceTree_viewConsumptionReport/listbox.xml
View file @ fba76904
......@@ -408,8 +408,8 @@
<string>Software Instance</string>
</tuple>
<tuple>
<string>computer_title</string>
<string>Computer</string>
<string>compute_node_title</string>
<string>Compute Node</string>
</tuple>
<tuple>
<string>start_date</string>
......
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_consumption/Person_viewResourceConsumptionReport/listbox.xml
View file @ fba76904
......@@ -408,8 +408,8 @@
<string>Software Instance</string>
</tuple>
<tuple>
<string>computer_title</string>
<string>Computer</string>
<string>compute_node_title</string>
<string>Compute Node</string>
</tuple>
<tuple>
<string>start_date</string>
......
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_consumption/SoftwareInstance_getCurrentDeltaCO2.py
View file @ fba76904
......@@ -2,10 +2,10 @@ from zExceptions import Unauthorized
if REQUEST is not None:
raise Unauthorized
computer_partition_list = context.getAggregateValueList(portal_type="Computer Partition")
compute_partition_list = context.getAggregateValueList(portal_type="Compute Partition")
current_watt = context.SoftwareRelease_getDeltaCO2List(
computer_partition_list, context.SoftwareInstance_getAverageCPULoad()
compute_partition_list, context.SoftwareInstance_getAverageCPULoad()
)
return current_watt.keys()[0]
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_consumption/SoftwareInstance_getFutureDeltaCO2.py
View file @ fba76904
......@@ -2,14 +2,14 @@ from zExceptions import Unauthorized
if REQUEST is not None:
raise Unauthorized
computer_partition_list = context.getAggregateValueList(portal_type="Computer Partition")
compute_partition_list = context.getAggregateValueList(portal_type="Compute Partition")
future_watt = "Not Applicable"
master_node = context.SoftwareInstance_getResilientMasterNode()
if master_node is not None:
future_watt = context.SoftwareRelease_getDeltaCO2List(
computer_partition_list, master_node.SoftwareInstance_getAverageCPULoad()
compute_partition_list, master_node.SoftwareInstance_getAverageCPULoad()
)
future_watt = future_watt.keys()[0]
......
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_consumption/SoftwareInstance_getWattStats.py
View file @ fba76904
computer_partition_list = context.getAggregateValueList(portal_type="Computer Partition")
compute_partition_list = context.getAggregateValueList(portal_type="Compute Partition")
master_node = context.SoftwareInstance_getResilientMasterNode()
current_watt = context.SoftwareRelease_getDeltaCO2List(
computer_partition_list, context.SoftwareInstance_getAverageCPULoad()
compute_partition_list, context.SoftwareInstance_getAverageCPULoad()
)
current_watt = current_watt.keys()
master_node = context.SoftwareInstance_getResilientMasterNode()
if master_node is not None:
future_watt = context.SoftwareRelease_getDeltaCO2List(
computer_partition_list, master_node.SoftwareInstance_getAverageCPULoad()
compute_partition_list, master_node.SoftwareInstance_getAverageCPULoad()
)
future_watt = future_watt.keys()[0]
......
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_consumption/SoftwareRelease_getDeltaCO2List.py
View file @ fba76904
......@@ -9,22 +9,22 @@ else:
partition_delta_co2_dict = {}
for computer_partition in computer_partition_list:
computer = computer_partition.getParentValue()
computer_zero_emission_ratio = computer.Computer_getZeroEmissionRatio()
computer_cpu_load_percentage = computer.Computer_getLatestCPUPercentLoad()
computer_watt = computer.Computer_getWattConsumption(computer_cpu_load_percentage)
for compute_partition in compute_partition_list:
compute_node = compute_partition.getParentValue()
compute_node_zero_emission_ratio = compute_node.ComputeNode_getZeroEmissionRatio()
compute_node_cpu_load_percentage = compute_node.ComputeNode_getLatestCPUPercentLoad()
compute_node_watt = compute_node.ComputeNode_getWattConsumption(compute_node_cpu_load_percentage)
partition_watt = computer.Computer_getWattConsumption(
computer_cpu_load_percentage + partition_average_cpu_load)
partition_watt = compute_node.ComputeNode_getWattConsumption(
compute_node_cpu_load_percentage + partition_average_cpu_load)
delta_watt = (partition_watt-computer_watt)
delta_watt = (partition_watt-compute_node_watt)
delta_co2 = delta_watt - delta_watt*(computer_zero_emission_ratio/100)
delta_co2 = delta_watt - delta_watt*(compute_node_zero_emission_ratio/100)
if delta_co2 in partition_delta_co2_dict:
partition_delta_co2_dict[delta_co2].append(computer_partition)
partition_delta_co2_dict[delta_co2].append(compute_partition)
else:
partition_delta_co2_dict[delta_co2] = [computer_partition]
partition_delta_co2_dict[delta_co2] = [compute_partition]
return partition_delta_co2_dict
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_consumption/SoftwareRelease_getDeltaCO2List.xml
View file @ fba76904
......@@ -50,7 +50,7 @@
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>computer_partition_list, simulated_cpu_load=None</string> </value>
<value> <string>compute_partition_list, simulated_cpu_load=None</string> </value>
</item>
<item>
<key> <string>id</string> </key>
......
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_consumption/WebSection_viewConsuptionReportList/listbox.xml
View file @ fba76904
......@@ -406,8 +406,8 @@
<string>Software Instance</string>
</tuple>
<tuple>
<string>computer_title</string>
<string>Computer</string>
<string>compute_node_title</string>
<string>Compute Node</string>
</tuple>
<tuple>
<string>start_date</string>
......
master/bt5/slapos_accounting/TestTemplateItem/portal_components/test.erp5.testSlapOSContractAlarm.py
View file @ fba76904
......@@ -57,7 +57,7 @@ class TestSlapOSRequestValidationPayment(SlapOSTestCaseMixin):
preference = self.portal.portal_preferences.getActiveSystemPreference()
preference.setPreferredCloudContractEnabled(True)
self.tic()
self._makeComputer()
self._makeComputeNode()
self.software_instance.setAggregate(self.partition.getRelativeUrl())
self.tic()
......@@ -73,7 +73,7 @@ class TestSlapOSRequestValidationPayment(SlapOSTestCaseMixin):
preference = self.portal.portal_preferences.getActiveSystemPreference()
preference.setPreferredCloudContractEnabled(True)
self.tic()
self._makeComputer()
self._makeComputeNode()
self.software_instance.setAggregate(self.partition.getRelativeUrl())
self.tic()
......
master/bt5/slapos_accounting/bt/template_action_path_list
View file @ fba76904
......@@ -3,7 +3,7 @@ Cloud Contract Module | view
Cloud Contract | view
Computer Consumption TioXML File | download
Computer Consumption TioXML File | view
Computer | jump_to_consumption_report_view
Compute Node | jump_to_consumption_report_view
Consumption Document Module | view
Instance Tree | jump_to_related_open_order_line
Instance Tree | periodicity
......
master/bt5/slapos_category/PathTemplateItem/portal_categories/allocation_scope/close/maintenance.xml
View file @ fba76904
......@@ -55,7 +55,7 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Allocation of services is closed due to scheduled maintenance of the computer</string> </value>
<value> <string>Allocation of services is closed due to scheduled maintenance of the compute_node</string> </value>
</item>
<item>
<key> <string>effective_date</string> </key>
......
master/bt5/slapos_category/PathTemplateItem/portal_categories/allocation_scope/close/outdated.xml
View file @ fba76904
......@@ -63,7 +63,7 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Allocation of services is closed because computer didn\'t communicate with master for too long</string> </value>
<value> <string>Allocation of services is closed because compute_node didn\'t communicate with master for too long</string> </value>
</item>
<item>
<key> <string>effective_date</string> </key>
......
master/bt5/slapos_category/PathTemplateItem/portal_categories/allocation_scope/close/termination.xml
View file @ fba76904
......@@ -55,7 +55,7 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Allocation of services is closed due to future termination of the computer</string> </value>
<value> <string>Allocation of services is closed due to future termination of the compute_node</string> </value>
</item>
<item>
<key> <string>effective_date</string> </key>
......
master/bt5/slapos_category/PathTemplateItem/portal_categories/allocation_scope/open/friend.xml
View file @ fba76904
......@@ -55,7 +55,7 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Allocate services for the owner of the friends of the computer</string> </value>
<value> <string>Allocate services for the owner of the friends of the compute_node</string> </value>
</item>
<item>
<key> <string>effective_date</string> </key>
......
master/bt5/slapos_category/PathTemplateItem/portal_categories/allocation_scope/open/personal.xml
View file @ fba76904
......@@ -55,7 +55,7 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Allocate services for the owner of the computer</string> </value>
<value> <string>Allocate services for the owner of the compute_node</string> </value>
</item>
<item>
<key> <string>effective_date</string> </key>
......
master/bt5/slapos_category/PathTemplateItem/portal_categories/base_amount/payroll/report/salary.xml
View file @ fba76904
......@@ -89,7 +89,7 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string>used with getTotalPrice to computer the total of certain prices in an invoice</string> </value>
<value> <string>used with getTotalPrice to compute_node the total of certain prices in an invoice</string> </value>
</item>
<item>
<key> <string>effective_date</string> </key>
......
master/bt5/slapos_category/PathTemplateItem/portal_categories/capacity_scope/close.xml
View file @ fba76904
......@@ -55,7 +55,7 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Computer is overloaded</string> </value>
<value> <string>Compute Node is overloaded</string> </value>
</item>
<item>
<key> <string>effective_date</string> </key>
......
master/bt5/slapos_category/PathTemplateItem/portal_categories/capacity_scope/open.xml
View file @ fba76904
......@@ -55,7 +55,7 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Computer is OK</string> </value>
<value> <string>Compute Node is OK</string> </value>
</item>
<item>
<key> <string>effective_date</string> </key>
......
master/bt5/slapos_category/PathTemplateItem/portal_categories/function/computer.xml
View file @ fba76904
......@@ -107,11 +107,11 @@
</item>
<item>
<key> <string>short_title</string> </key>
<value> <string>Computer Maintenance</string> </value>
<value> <string>Compute Node Maintenance</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Computer Installation and Maintenance</string> </value>
<value> <string>Compute Node Installation and Maintenance</string> </value>
</item>
</dictionary>
</pickle>
......
master/bt5/slapos_category/PathTemplateItem/portal_categories/function/computer/agent.xml
View file @ fba76904
......@@ -89,7 +89,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Computer Maintenance Agent</string> </value>
<value> <string>Compute Node Maintenance Agent</string> </value>
</item>
</dictionary>
</pickle>
......
master/bt5/slapos_category/PathTemplateItem/portal_categories/function/computer/manager.xml
View file @ fba76904
......@@ -89,7 +89,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Computer Maintenance Manager</string> </value>
<value> <string>Compute Node Maintenance Manager</string> </value>
</item>
</dictionary>
</pickle>
......
master/bt5/slapos_category/PathTemplateItem/portal_categories/function/hosting.xml
View file @ fba76904
......@@ -83,7 +83,7 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string>A division in charge of providing location for hosting SlapOS computers</string> </value>
<value> <string>A division in charge of providing location for hosting SlapOS compute_nodes</string> </value>
</item>
<item>
<key> <string>effective_date</string> </key>
......
master/bt5/slapos_category/PathTemplateItem/portal_categories/product_line/computer.xml
View file @ fba76904
......@@ -87,11 +87,11 @@
</item>
<item>
<key> <string>short_title</string> </key>
<value> <string>Computer</string> </value>
<value> <string>Compute Node</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Computer Hardware</string> </value>
<value> <string>Compute Node Hardware</string> </value>
</item>
</dictionary>
</pickle>
......
master/bt5/slapos_category/PathTemplateItem/portal_categories/publication_section/contract/hosting.xml
View file @ fba76904
......@@ -73,7 +73,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Computer Hosting Contract</string> </value>
<value> <string>Compute Node Hosting Contract</string> </value>
</item>
</dictionary>
</pickle>
......
master/bt5/slapos_category/PathTemplateItem/portal_categories/role/computer.xml
View file @ fba76904
......@@ -73,7 +73,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Computer</string> </value>
<value> <string>Compute Node</string> </value>
</item>
</dictionary>
</pickle>
......
master/bt5/slapos_cloud/ActionTemplateItem/portal_types/Computer/computer_usage.xml → master/bt5/slapos_cloud/ActionTemplateItem/portal_types/Compute%20Node/compute_node_usage.xml
View file @ fba76904
......@@ -40,7 +40,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>computer_usage</string> </value>
<value> <string>compute_node_usage</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
......@@ -60,7 +60,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Computer Usage</string> </value>
<value> <string>Compute Node Usage</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
......@@ -77,7 +77,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/Computer_viewCurrentUsageReport</string> </value>
<value> <string>string:${object_url}/ComputeNode_viewCurrentUsageReport</string> </value>
</item>
</dictionary>
</pickle>
......
master/bt5/slapos_cloud/ActionTemplateItem/portal_types/Computer/view_capacity.xml → master/bt5/slapos_cloud/ActionTemplateItem/portal_types/Compute%20Node/view_capacity.xml
View file @ fba76904
......@@ -73,7 +73,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/Computer_viewCapacity</string> </value>
<value> <string>string:${object_url}/ComputeNode_viewCapacity</string> </value>
</item>
</dictionary>
</pickle>
......
master/bt5/slapos_cloud/ActionTemplateItem/portal_types/Computer%20Network/view_computer_list.xml → master/bt5/slapos_cloud/ActionTemplateItem/portal_types/Computer%20Network/view_compute_node_list.xml
View file @ fba76904
......@@ -40,7 +40,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>view_computer_list</string> </value>
<value> <string>view_compute_node_list</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
......@@ -60,7 +60,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Computers</string> </value>
<value> <string>Compute Nodes</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
......@@ -77,7 +77,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/ComputerNetwork_viewComputerList</string> </value>
<value> <string>string:${object_url}/ComputerNetwork_viewComputeNodeList</string> </value>
</item>
</dictionary>
</pickle>
......
master/bt5/slapos_cloud/ActionTemplateItem/portal_types/Software%20Instance/jump_to_computer_partition.xml → master/bt5/slapos_cloud/ActionTemplateItem/portal_types/Software%20Instance/jump_to_compute_partition.xml
View file @ fba76904
......@@ -40,7 +40,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>jump_to_computer_partition</string> </value>
<value> <string>jump_to_compute_partition</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
......@@ -60,7 +60,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Computer Partition</string> </value>
<value> <string>Compute Partition</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
......@@ -79,7 +79,7 @@
<key> <string>text</string> </key>
<value> <string encoding="cdata"><![CDATA[
string:${object_url}/Base_jumpToRelatedObject?base_category=aggregate&portal_type:list=Computer+Partition
string:${object_url}/Base_jumpToRelatedObject?base_category=aggregate&portal_type:list=Compute+Partition
]]></string> </value>
</item>
......
master/bt5/slapos_cloud/ActionTemplateItem/portal_types/Software%20Release/usable_computer.xml → master/bt5/slapos_cloud/ActionTemplateItem/portal_types/Software%20Release/usable_compute_node.xml
View file @ fba76904
......@@ -40,7 +40,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>usable_computer</string> </value>
<value> <string>usable_compute_node</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
......@@ -60,7 +60,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Usable Computer</string> </value>
<value> <string>Usable Compute Node</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
......@@ -77,7 +77,7 @@
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/SoftwareRelease_viewUsableComputerListReport</string> </value>
<value> <string>string:${object_url}/SoftwareRelease_viewUsableComputeNodeListReport</string> </value>
</item>
</dictionary>
</pickle>
......
master/bt5/slapos_cloud/CategoryTemplateItem/portal_categories/group.xml
View file @ fba76904
......@@ -53,7 +53,7 @@
</item>
<item>
<key> <string>acquisition_portal_type</string> </key>
<value> <string>python: [\'Career\', \'Organisation\', \'Person\', \'Computer\']</string> </value>
<value> <string>python: [\'Career\', \'Organisation\', \'Person\', \'Compute Node\']</string> </value>
</item>
<item>
<key> <string>acquisition_sync_value</string> </key>
......
master/bt5/slapos_cloud/CategoryTemplateItem/portal_categories/region.xml
View file @ fba76904
......@@ -55,7 +55,7 @@
</item>
<item>
<key> <string>acquisition_portal_type</string> </key>
<value> <string>python: [\'Address\', \'Organisation\', \'Person\', \'Computer\']</string> </value>
<value> <string>python: [\'Address\', \'Organisation\', \'Person\', \'Compute Node\']</string> </value>
</item>
<item>
<key> <string>acquisition_sync_value</string> </key>
......
master/bt5/slapos_cloud/CategoryTemplateItem/portal_categories/subordination.xml
View file @ fba76904
......@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>acquisition_portal_type</string> </key>
<value> <string>python: [\'Career\', \'Computer\']</string> </value>
<value> <string>python: [\'Career\', \'Compute Node\']</string> </value>
</item>
<item>
<key> <string>acquisition_sync_value</string> </key>
......
master/bt5/slapos_cloud/ExtensionTemplateItem/portal_components/extension.erp5.SlapOSSecurity.py
View file @ fba76904
......@@ -31,28 +31,28 @@ from AccessControl.SecurityManagement import getSecurityManager, \
from AccessControl import Unauthorized
from DateTime import DateTime
def getComputerSecurityCategory(self, base_category_list, user_name,
def getComputeNodeSecurityCategory(self, base_category_list, user_name,
ob, portal_type):
"""
This script returns a list of dictionaries which represent
the security groups which a computer is member of.
the security groups which a compute_node is member of.
"""
category_list = []
computer_list = self.portal_catalog.unrestrictedSearchResults(
portal_type='Computer',
compute_node_list = self.portal_catalog.unrestrictedSearchResults(
portal_type='Compute Node',
user_id=user_name,
validation_state="validated",
limit=2,
)
if len(computer_list) == 1:
if len(compute_node_list) == 1:
for base_category in base_category_list:
if base_category == "role":
category_list.append(
{base_category: ['role/computer']})
elif len(computer_list) > 1:
raise ConsistencyError("Error: There is more than one Computer " \
elif len(compute_node_list) > 1:
raise ConsistencyError("Error: There is more than one Compute Node " \
"with reference '%s'" % user_name)
return category_list
......@@ -103,7 +103,7 @@ def restrictMethodAsShadowUser(self, shadow_document=None, callable_object=None,
raise TypeError('shadow_document and callable_object cannot be None')
relative_url = shadow_document.getRelativeUrl()
if shadow_document.getPortalType() not in ('Person', 'Software Instance',
'Computer'):
'Compute Node'):
raise Unauthorized("%s portal type %r is not supported" % (relative_url,
shadow_document.getPortalType()))
else:
......
master/bt5/slapos_cloud/PathTemplateItem/computer_module/template_computer.xml → master/bt5/slapos_cloud/PathTemplateItem/compute_node_module/template_compute_node.xml
View file @ fba76904
......@@ -2,7 +2,7 @@
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Computer" module="erp5.portal_type"/>
<global name="Compute Node" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
......@@ -62,11 +62,11 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>template_computer</string> </value>
<value> <string>template_compute_node</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Computer</string> </value>
<value> <string>Compute Node</string> </value>
</item>
</dictionary>
</pickle>
......
master/bt5/slapos_cloud/PathTemplateItem/portal_alarms/slapos_free_computer_partition.xml → master/bt5/slapos_cloud/PathTemplateItem/portal_alarms/slapos_free_compute_partition.xml
View file @ fba76904
......@@ -8,11 +8,11 @@
<dictionary>
<item>
<key> <string>active_sense_method_id</string> </key>
<value> <string>Alarm_searchComputerPartitionAndMarkFree</string> </value>
<value> <string>Alarm_searchComputePartitionAndMarkFree</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Automatically find computer partitions which can be marked as free</string> </value>
<value> <string>Automatically find compute partitions which can be marked as free</string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
......@@ -20,7 +20,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>slapos_free_computer_partition</string> </value>
<value> <string>slapos_free_compute_partition</string> </value>
</item>
<item>
<key> <string>periodicity_hour</string> </key>
......@@ -87,7 +87,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Mark computer partition as free</string> </value>
<value> <string>Mark compute partition as free</string> </value>
</item>
</dictionary>
</pickle>
......
master/bt5/slapos_cloud/PathTemplateItem/portal_alarms/slapos_update_computer_capacity_scope.xml → master/bt5/slapos_cloud/PathTemplateItem/portal_alarms/slapos_update_compute_node_capacity_scope.xml
View file @ fba76904
......@@ -8,7 +8,7 @@
<dictionary>
<item>
<key> <string>active_sense_method_id</string> </key>
<value> <string>Alarm_managePublicComputerCapacityScope</string> </value>
<value> <string>Alarm_managePublicComputeNodeCapacityScope</string> </value>
</item>
<item>
<key> <string>description</string> </key>
......@@ -22,7 +22,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>slapos_update_computer_capacity_scope</string> </value>
<value> <string>slapos_update_compute_node_capacity_scope</string> </value>
</item>
<item>
<key> <string>periodicity_day_frequency</string> </key>
......@@ -95,7 +95,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Desactivate Dead Computer</string> </value>
<value> <string>Desactivate Dead Compute Node</string> </value>
</item>
</dictionary>
</pickle>
......
master/bt5/slapos_cloud/PathTemplateItem/product_module/computer.xml → master/bt5/slapos_cloud/PathTemplateItem/product_module/compute_node.xml
View file @ fba76904
......@@ -62,7 +62,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>computer</string> </value>
<value> <string>compute_node</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
......@@ -70,7 +70,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Computer</string> </value>
<value> <string>Compute Node</string> </value>
</item>
</dictionary>
</pickle>
......
master/bt5/slapos_cloud/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
View file @ fba76904
<allowed_content_type_list>
<portal_type id="Computer">
<portal_type id="Compute Node">
<item>Certificate Login</item>
<item>ERP5 Login</item>
</portal_type>
......
master/bt5/slapos_cloud/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
View file @ fba76904
<base_category_list>
<portal_type id="Computer">
<portal_type id="Compute Node">
<item>destination_section</item>
<item>source_administration</item>
</portal_type>
......
master/bt5/slapos_cloud/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
View file @ fba76904
......@@ -5,19 +5,19 @@
<portal_type id="Assignment">
<item>SlaposAssignmentConstraint</item>
</portal_type>
<portal_type id="Computer">
<item>ComputerSlapOSMetadata</item>
<portal_type id="Compute Node">
<item>ComputeNodeSlapOSMetadata</item>
<item>ERP5User</item>
<item>SlaposCapacity</item>
<item>SlaposComputerConstraint</item>
<item>SlaposComputeNodeConstraint</item>
<item>Url</item>
</portal_type>
<portal_type id="Computer Model">
<item>SlaposCapacity</item>
</portal_type>
<portal_type id="Computer Partition">
<item>ComputerPartition</item>
<item>SlaposComputerPartitionConstraint</item>
<portal_type id="Compute Partition">
<item>ComputePartition</item>
<item>SlaposComputePartitionConstraint</item>
</portal_type>
<portal_type id="Email">
<item>SlaposEmailConstraint</item>
......
master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Hosting%20Subscription%20Module.xml
View file @ fba76904
......@@ -38,7 +38,7 @@
\n
ERP5 folders are implemented as CMFBTreeFolder objects\n
and can store up to a million documents on a standard\n
computer.\n
compute_node.\n
ERP5 folders will eventually use in the near future the\n
AdaptableStorage implementation in order to reach performances\n
of 10 or 100 millions of documents in a single folder.\n
......
master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Instance%20Tree%20Module.xml
View file @ fba76904
......@@ -38,7 +38,7 @@
\n
ERP5 folders are implemented as CMFBTreeFolder objects\n
and can store up to a million documents on a standard\n
computer.\n
compute_node.\n
ERP5 folders will eventually use in the near future the\n
AdaptableStorage implementation in order to reach performances\n
of 10 or 100 millions of documents in a single folder.\n
......
master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Software%20Instance%20Module.xml
View file @ fba76904
......@@ -37,7 +37,7 @@
\n
ERP5 folders are implemented as CMFBTreeFolder objects\n
and can store up to a million documents on a standard\n
computer.\n
compute_node.\n
ERP5 folders will eventually use in the near future the\n
AdaptableStorage implementation in order to reach performances\n
of 10 or 100 millions of documents in a single folder.\n
......
master/bt5/slapos_cloud/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
View file @ fba76904
<workflow_chain>
<chain>
<type>Computer</type>
<workflow>computer_slap_interface_workflow, slapos_cloud_interaction_workflow</workflow>
<type>Compute Node</type>
<workflow>compute_node_slap_interface_workflow, slapos_cloud_interaction_workflow</workflow>
</chain>
<chain>
<type>Computer Partition</type>
<workflow>computer_partition_slap_interface_workflow</workflow>
<type>Compute Partition</type>
<workflow>compute_partition_slap_interface_workflow</workflow>
</chain>
<chain>
<type>Hosting Subscription</type>
......
master/bt5/slapos_cloud/PropertySheetTemplateItem/portal_property_sheets/ComputerSlapOSMetadata.xml → master/bt5/slapos_cloud/PropertySheetTemplateItem/portal_property_sheets/ComputeNodeSlapOSMetadata.xml
View file @ fba76904
......@@ -32,7 +32,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>ComputerSlapOSMetadata</string> </value>
<value> <string>ComputeNodeSlapOSMetadata</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
......
master/bt5/slapos_cloud/PropertySheetTemplateItem/portal_property_sheets/ComputerPartition.xml → master/bt5/slapos_cloud/PropertySheetTemplateItem/portal_property_sheets/ComputePartition.xml
View file @ fba76904
......@@ -26,7 +26,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>ComputerPartition</string> </value>
<value> <string>ComputePartition</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
......
master/bt5/slapos_cloud/PropertySheetTemplateItem/portal_property_sheets/ComputerPartition/network_address_property.xml → master/bt5/slapos_cloud/PropertySheetTemplateItem/portal_property_sheets/ComputePartition/network_address_property.xml
View file @ fba76904
......@@ -71,7 +71,7 @@
</item>
<item>
<key> <string>acquisition_portal_type</string> </key>
<value> <string>python: (\'Computer Partition\',)</string> </value>
<value> <string>python: (\'Compute Partition\',)</string> </value>
</item>
<item>
<key> <string>acquisition_sync_value</string> </key>
......@@ -109,7 +109,7 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string>The unique identity of the computer in computer network.</string> </value>
<value> <string>The unique identity of the compute_node in compute_node network.</string> </value>
</item>
<item>
<key> <string>id</string> </key>
......
master/bt5/slapos_cloud/PropertySheetTemplateItem/portal_property_sheets/SlaposComputerConstraint.xml → master/bt5/slapos_cloud/PropertySheetTemplateItem/portal_property_sheets/SlaposComputeNodeConstraint.xml
View file @ fba76904
......@@ -32,7 +32,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>SlaposComputerConstraint</string> </value>
<value> <string>SlaposComputeNodeConstraint</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
......
master/bt5/slapos_cloud/PropertySheetTemplateItem/portal_property_sheets/SlaposComputerPartitionConstraint.xml → master/bt5/slapos_cloud/PropertySheetTemplateItem/portal_property_sheets/SlaposComputePartitionConstraint.xml
View file @ fba76904
......@@ -32,7 +32,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>SlaposComputerPartitionConstraint</string> </value>
<value> <string>SlaposComputePartitionConstraint</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
......
master/bt5/slapos_cloud/PropertySheetTemplateItem/portal_property_sheets/SlaposComputerPartitionConstraint/busy_partition_has_one_related_instance_constraint.xml → master/bt5/slapos_cloud/PropertySheetTemplateItem/portal_property_sheets/SlaposComputePartitionConstraint/busy_partition_has_one_related_instance_constraint.xml
View file @ fba76904
......@@ -32,7 +32,7 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Computer Partition which is busy, shall have one aggregate related instance.</string> </value>
<value> <string>Compute Partition which is busy, shall have one aggregate related instance.</string> </value>
</item>
<item>
<key> <string>id</string> </key>
......
master/bt5/slapos_cloud/PropertySheetTemplateItem/portal_property_sheets/SlaposComputerPartitionConstraint/non_busy_partition_has_no_related_instance_constraint.xml → master/bt5/slapos_cloud/PropertySheetTemplateItem/portal_property_sheets/SlaposComputePartitionConstraint/non_busy_partition_has_no_related_instance_constraint.xml
View file @ fba76904
......@@ -32,7 +32,7 @@
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Computer Partition which is not busy, shall have none aggregate related instance.</string> </value>
<value> <string>Compute Partition which is not busy, shall have none aggregate related instance.</string> </value>
</item>
<item>
<key> <string>id</string> </key>
......
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Alarm_managePublicComputerCapacityScope.py → master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Alarm_managePublicComputeNodeCapacityScope.py
View file @ fba76904
......@@ -7,10 +7,10 @@ category_uid_list = [ i.getUid() for i in category_list if i is not None]
if category_uid_list:
portal.portal_catalog.searchAndActivate(
portal_type='Computer',
portal_type='Compute Node',
default_allocation_scope_uid=category_uid_list,
validation_state="validated",
method_id='Computer_checkAndUpdateCapacityScope',
method_id='ComputeNode_checkAndUpdateCapacityScope',
activate_kw={'tag': tag}
)
context.activate(after_tag=tag).getId()
master/bt5/slapos_pdm/SkinTemplateItem/portal_skins/slapos_pdm/Alarm_computerCheckUpgradeSoftwareRelease.xml → master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Alarm_managePublicComputeNodeCapacityScope.xml
View file @ fba76904
......@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Alarm_computerCheckUpgradeSoftwareRelease</string> </value>
<value> <string>Alarm_managePublicComputeNodeCapacityScope</string> </value>
</item>
</dictionary>
</pickle>
......
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Alarm_managePublicComputerCapacityScope.xml → master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Alarm_searchComputePartitionAndMarkFree.xml
View file @ fba76904
......@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Alarm_managePublicComputerCapacityScope</string> </value>
<value> <string>Alarm_searchComputePartitionAndMarkFree</string> </value>
</item>
</dictionary>
</pickle>
......
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Base_getSoftwareReleaseStateOnComputeNode.py 0 → 100644
View file @ fba76904
compute_node = context.REQUEST.get('here')
software_release = context
return compute_node.ComputeNode_getSoftwareReleaseState(software_release.getUid())
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Base_getSoftwareReleaseStateOnComputer.xml → master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Base_getSoftwareReleaseStateOnComputeNode.xml
View file @ fba76904
......@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Base_getSoftwareReleaseStateOnComputer</string> </value>
<value> <string>Base_getSoftwareReleaseStateOnComputeNode</string> </value>
</item>
</dictionary>
</pickle>
......
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Base_getSoftwareReleaseStateOnComputer.py deleted 100644 → 0
View file @ ebdff0cc
computer = context.REQUEST.get('here')
software_release = context
return computer.Computer_getSoftwareReleaseState(software_release.getUid())
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Base_getSoftwareReleaseUsageOnComputer.py → master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Base_getSoftwareReleaseUsageOnComputeNode.py
View file @ fba76904
current = context.REQUEST.get('here')
if current.getPortalType() == 'Software Release':
software_release = current
computer = context
compute_node = context
else:
computer = current
compute_node = current
software_release = context
return computer.Computer_getSoftwareReleaseUsage(software_release.getUrlString())
return compute_node.ComputeNode_getSoftwareReleaseUsage(software_release.getUrlString())
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Base_getSoftwareReleaseUsageOnComputer.xml → master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Base_getSoftwareReleaseUsageOnComputeNode.xml
View file @ fba76904
......@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Base_getSoftwareReleaseUsageOnComputer</string> </value>
<value> <string>Base_getSoftwareReleaseUsageOnComputeNode</string> </value>
</item>
</dictionary>
</pickle>
......
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/ComputerModule_viewComputerList.xml → master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/ComputeNodeModule_viewComputeNodeList.xml
View file @ fba76904
......@@ -110,7 +110,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>ComputerModule_viewComputerList</string> </value>
<value> <string>ComputeNodeModule_viewComputeNodeList</string> </value>
</item>
<item>
<key> <string>method</string> </key>
......@@ -118,7 +118,7 @@
</item>
<item>
<key> <string>name</string> </key>
<value> <string>ComputerModule_viewComputerList</string> </value>
<value> <string>ComputeNodeModule_viewComputeNodeList</string> </value>
</item>
<item>
<key> <string>pt</string> </key>
......@@ -134,7 +134,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Computers</string> </value>
<value> <string>Compute Nodes</string> </value>
</item>
<item>
<key> <string>unicode_mode</string> </key>
......
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/ComputerModule_viewComputerList/listbox.xml → master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/ComputeNodeModule_viewComputeNodeList/listbox.xml
View file @ fba76904
......@@ -115,8 +115,8 @@
<string>Capacity Quantity</string>
</tuple>
<tuple>
<string>Computer_getFreeComputerPartitionCount</string>
<string>Free Computer Partition</string>
<string>ComputeNode_getFreeComputePartitionCount</string>
<string>Free Compute Partition</string>
</tuple>
<tuple>
<string>subordination_title</string>
......@@ -204,8 +204,8 @@
<value>
<list>
<tuple>
<string>Computer</string>
<string>Computer</string>
<string>Compute Node</string>
<string>Compute Node</string>
</tuple>
</list>
</value>
......@@ -243,7 +243,7 @@
</item>
<item>
<key> <string>selection_name</string> </key>
<value> <string>computer_list_selection</string> </value>
<value> <string>compute_node_list_selection</string> </value>
</item>
<item>
<key> <string>sort_columns</string> </key>
......@@ -286,7 +286,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Computers</string> </value>
<value> <string>Compute Nodes</string> </value>
</item>
</dictionary>
</value>
......
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/ComputerModule_viewComputerList/listbox_available_partition_count.xml → master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/ComputeNodeModule_viewComputeNodeList/listbox_available_partition_count.xml
View file @ fba76904
......@@ -270,7 +270,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: cell.Computer_getRemainingQuantity()</string> </value>
<value> <string>python: cell.ComputeNode_getRemainingQuantity()</string> </value>
</item>
</dictionary>
</pickle>
......
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Computer_afterClone.py → master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/ComputeNode_afterClone.py
View file @ fba76904
"""Hook called when a computer object is closed.
"""Hook called when a compute_node object is closed.
We want to reset reference, which is the user login in ERP5Security.
One exception is when a person object is installed from business template.
"""
if context.getPortalType() != "Computer":
if context.getPortalType() != "Compute Node":
return
context.setUserId(None)
context.Computer_initUserId()
context.ComputeNode_initUserId()
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Computer_afterClone.xml → master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/ComputeNode_afterClone.xml
View file @ fba76904
......@@ -69,7 +69,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Computer_afterClone</string> </value>
<value> <string>ComputeNode_afterClone</string> </value>
</item>
</dictionary>
</pickle>
......
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Computer_applyComputerModel.py → master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/ComputeNode_applyComputerModel.py
View file @ fba76904
computer = context
compute_node = context
Base_translateString = context.Base_translateString
computer_model_portal_type = 'Computer Model'
computer_model = computer.getSpecialiseValue(
computer_model = compute_node.getSpecialiseValue(
portal_type=computer_model_portal_type)
if computer_model is None:
......@@ -32,19 +32,19 @@ else :
new_category_dict = {}
for category in category_list:
if force or not computer.getPropertyList(category):
if force or not compute_node.getPropertyList(category):
v = computer_model.getPropertyList(category)
if v:
new_category_dict[category] = v
for _property in property_list:
if force or not computer.getProperty(_property):
if force or not compute_node.getProperty(_property):
v = computer_model.getProperty(_property)
if v:
new_category_dict[_property] = v
if new_category_dict:
computer.edit(**new_category_dict)
compute_node.edit(**new_category_dict)
message = Base_translateString('Computer Model applied.')
result = True
else:
......
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Computer_applyComputerModel.xml → master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/ComputeNode_applyComputerModel.xml
View file @ fba76904
......@@ -54,7 +54,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Computer_applyComputerModel</string> </value>
<value> <string>ComputeNode_applyComputerModel</string> </value>
</item>
</dictionary>
</pickle>
......
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Computer_checkAndUpdateCapacityScope.py → master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/ComputeNode_checkAndUpdateCapacityScope.py
View file @ fba76904
import json
computer = context
compute_node = context
portal = context.getPortalObject()
from zExceptions import Unauthorized
if REQUEST is not None:
raise Unauthorized
if computer.getAllocationScope() not in ['open/public', 'open/subscription']:
# Don't update non public computer
if compute_node.getAllocationScope() not in ['open/public', 'open/subscription']:
# Don't update non public compute_node
return
can_allocate = True
comment = ''
# First and simple way to see if computer is dead
# modification_date = portal.portal_workflow.getInfoFor(computer, 'time', wf_id='edit_workflow')
# First and simple way to see if compute_node is dead
# modification_date = portal.portal_workflow.getInfoFor(compute_node, 'time', wf_id='edit_workflow')
# if (DateTime() - modification_date) > 1:
# # Computer didn't talk to vifib for 1 days, do not consider it as a trustable public server for now
# # Compute Node didn't talk to vifib for 1 days, do not consider it as a trustable public server for now
# # slapformat is supposed to run at least once per day
# can_allocate = False
# comment = "Computer didn't contact the server for more than one day"
# comment = "Compute Node didn't contact the server for more than one day"
if can_allocate:
# Check if computer has error reported
# Check if compute_node has error reported
memcached_dict = context.Base_getSlapToolMemcachedDict()
try:
d = memcached_dict[computer.getReference()]
d = memcached_dict[compute_node.getReference()]
except KeyError:
can_allocate = False
comment = "Computer didn't contact the server"
comment = "Compute Node didn't contact the server"
else:
log_dict = json.loads(d)
if '#error' in log_dict.get('text', '#error'):
can_allocate = False
comment = 'Computer reported an error'
comment = 'Compute Node reported an error'
# XXX TODO: compare creation date of #ok message
elif int(DateTime()) - int(DateTime(log_dict.get('created_at'))) > 600:
can_allocate = False
comment = "Computer didn't contact for more than 10 minutes"
comment = "Compute Node didn't contact for more than 10 minutes"
if can_allocate:
# Check the computer capacity.
# Check the compute_node capacity.
# there is a arbitrary hardcoded default value: not more than 1000000 (!) instances on
# a computer.
# a compute_node.
default_maximum_value = 1000000
computer_capacity_quantity = computer.getCapacityQuantity(default_maximum_value)
if computer_capacity_quantity == default_maximum_value:
compute_node_capacity_quantity = compute_node.getCapacityQuantity(default_maximum_value)
if compute_node_capacity_quantity == default_maximum_value:
# Verify if Computer Model defines it:
computer_model = computer.getSpecialiseValue(portal_type='Computer Model')
computer_model = compute_node.getSpecialiseValue(portal_type='Computer Model')
if computer_model is not None:
computer_capacity_quantity = computer_model.getCapacityQuantity(default_maximum_value)
compute_node_capacity_quantity = computer_model.getCapacityQuantity(default_maximum_value)
# The update the computer with the initial value.
if computer_capacity_quantity != default_maximum_value:
computer.edit(capacity_quantity=computer_capacity_quantity)
# The update the compute_node with the initial value.
if compute_node_capacity_quantity != default_maximum_value:
compute_node.edit(capacity_quantity=compute_node_capacity_quantity)
software_release_capacity_dict = {}
consumed_capacity = 0
......@@ -94,27 +94,27 @@ if can_allocate:
if allocated_instance is not None:
software_release_capacity = getSoftwareReleaseCapacity(allocated_instance)
consumed_capacity += software_release_capacity
if consumed_capacity >= computer_capacity_quantity:
if consumed_capacity >= compute_node_capacity_quantity:
can_allocate = False
comment = 'Computer capacity limit exceeded (%s >= %s)' % (consumed_capacity, computer_capacity_quantity)
comment = 'Compute Node capacity limit exceeded (%s >= %s)' % (consumed_capacity, compute_node_capacity_quantity)
if can_allocate:
for instance in portal.portal_catalog.portal_catalog(
default_aggregate_relative_url='%s/%%' % computer.getRelativeUrl(),
default_aggregate_relative_url='%s/%%' % compute_node.getRelativeUrl(),
portal_type=['Software Instance', 'Slave Instance'],
validation_state='validated'):
software_release_capacity = getSoftwareReleaseCapacity(instance.getObject())
consumed_capacity += software_release_capacity
if consumed_capacity >= computer_capacity_quantity:
if consumed_capacity >= compute_node_capacity_quantity:
can_allocate = False
comment = 'Computer capacity limit exceeded'
comment = 'Compute Node capacity limit exceeded'
break
# if can_allocate:
# result_list = portal.portal_catalog.portal_catalog(
# parent_uid=computer.getUid(),
# portal_type='Computer Partition',
# parent_uid=compute_node.getUid(),
# portal_type='Compute Partition',
# free_for_request=1,
# limit=1)
# if len(result_list) == 0:
......@@ -123,13 +123,13 @@ if can_allocate:
new_value = None
if can_allocate:
if computer.getCapacityScope() == 'close':
if compute_node.getCapacityScope() == 'close':
new_value = 'open'
else:
if computer.getCapacityScope() == 'open':
if compute_node.getCapacityScope() == 'open':
new_value = 'close'
if new_value is not None:
computer.edit(capacity_scope=new_value)
compute_node.edit(capacity_scope=new_value)
if comment:
portal.portal_workflow.doActionFor(computer, 'edit_action', comment=comment)
portal.portal_workflow.doActionFor(compute_node, 'edit_action', comment=comment)
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/Computer_checkAndUpdateCapacityScope.xml → master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/ComputeNode_checkAndUpdateCapacityScope.xml
View file @ fba76904
......@@ -62,7 +62,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Computer_checkAndUpdateCapacityScope</string> </value>
<value> <string>ComputeNode_checkAndUpdateCapacityScope</string> </value>
</item>
</dictionary>
</pickle>
......
master/bt5/slapos_cloud/bt/description
View file @ fba76904
This diff is collapsed.
master/bt5/slapos_jio/bt/template_path_list
View file @ fba76904
This diff is collapsed.
master/bt5/slapos_pdm/bt/template_path_list
View file @ fba76904
This diff is collapsed.
slapos/slap/slap.py
View file @ fba76904
This diff is collapsed.
slapos/tests/test_slapgrid.py
View file @ fba76904
This diff is collapsed.
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