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
Titouan Soulard
slapos.core
Commits
595908a3
Commit
595908a3
authored
Apr 05, 2023
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_cloud: drop usage of Subscription Request
parent
5bf78616
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
18 deletions
+1
-18
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/SoftwareInstance_tryToAllocatePartition.py
...s/slapos_cloud/SoftwareInstance_tryToAllocatePartition.py
+1
-18
No files found.
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/SoftwareInstance_tryToAllocatePartition.py
View file @
595908a3
...
...
@@ -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
...
...
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