Commit 8f5b1be9 authored by Romain Courteaud's avatar Romain Courteaud

slapos_accounting: source_administration is not used anymore on Compute Node

parent 38dc73d0
...@@ -35,7 +35,6 @@ else: ...@@ -35,7 +35,6 @@ else:
# informative. # informative.
if compute_node.getReference() == reference: if compute_node.getReference() == reference:
aggregate_value_list = [compute_node] aggregate_value_list = [compute_node]
person = compute_node.getSourceAdministrationValue(portal_type="Person")
project = compute_node_project project = compute_node_project
else: else:
project = None # For now, else we should calculate this too. project = None # For now, else we should calculate this too.
...@@ -71,6 +70,7 @@ else: ...@@ -71,6 +70,7 @@ else:
portal_type="Person") portal_type="Person")
except: except:
raise ValueError(instance.getRelativeUrl()) raise ValueError(instance.getRelativeUrl())
person_relative_url = person.getRelativeUrl()
aggregate_value_list = [partition, instance, subscription] aggregate_value_list = [partition, instance, subscription]
...@@ -79,21 +79,20 @@ else: ...@@ -79,21 +79,20 @@ else:
quantity=movement['quantity'], quantity=movement['quantity'],
aggregate_value_list=aggregate_value_list, aggregate_value_list=aggregate_value_list,
resource=movement['resource'], resource=movement['resource'],
person=person.getRelativeUrl(), person=person_relative_url,
project=project project=project
) )
) )
# Time to create the PL # Time to create the PL
person = compute_node.getSourceAdministrationValue(portal_type="Person")
delivery_template = portal.restrictedTraverse( delivery_template = portal.restrictedTraverse(
portal.portal_preferences.getPreferredInstanceDeliveryTemplate()) portal.portal_preferences.getPreferredInstanceDeliveryTemplate())
delivery = delivery_template.Base_createCloneDocument(batch_mode=1) delivery = delivery_template.Base_createCloneDocument(batch_mode=1)
delivery.edit( delivery.edit(
title=delivery_title, title=delivery_title,
destination=person.getRelativeUrl(), #destination=person.getRelativeUrl(),
destination_decision=person.getRelativeUrl(), #destination_decision=person.getRelativeUrl(),
start_date=context.getCreationDate(), start_date=context.getCreationDate(),
) )
......
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