Commit 595908a3 authored by Romain Courteaud's avatar Romain Courteaud

slapos_cloud: drop usage of Subscription Request

parent 5bf78616
......@@ -49,14 +49,6 @@ def assignComputePartition(software_instance, instance_tree):
if not person.Person_isAllowedToAllocate():
raise Unauthorized('Allocation disallowed')
subscription_reference = None
subscription_request = instance_tree.getAggregateRelatedValue(
portal_type="Subscription Request")
if subscription_request is not None:
subscription_reference = subscription_request.getReference()
if subscription_request.getSimulationState() not in ["ordered", "confirmed", "started"]:
raise Unauthorized("Related Subscription Requested isn't ordered, confirmed or started")
tag = None
try:
sla_dict = software_instance.getSlaXmlAsDict()
......@@ -111,22 +103,13 @@ def assignComputePartition(software_instance, instance_tree):
elif sla_dict.get('mode'):
computer_network_query = '-1'
"""
compute_partition_relative_url = person.Person_restrictMethodAsShadowUser(
shadow_document=person,
callable_object=person.Person_findPartition,
argument_list=[software_instance.getUrlString(), software_instance.getSourceReference(),
software_instance.getPortalType(), sla_dict, computer_network_query,
subscription_reference, instance_tree.isRootSlave()])
"""
compute_partition_relative_url = person.Person_findPartition(
instance_tree,
software_instance.getFollowUpUid(portal_type='Project'),
software_instance.getUrlString(),
software_instance.getSourceReference(),
software_instance.getPortalType(),
sla_dict, computer_network_query,
subscription_reference
sla_dict, computer_network_query
)
return compute_partition_relative_url, tag
......
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