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
1
Merge Requests
1
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
Romain Courteaud
slapos.core
Commits
a83878ba
Commit
a83878ba
authored
Oct 27, 2023
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_cloud: drop template_compute_node
parent
d64fafaf
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
14 additions
and
90 deletions
+14
-90
master/bt5/slapos_cloud/PathTemplateItem/compute_node_module/template_compute_node.xml
...emplateItem/compute_node_module/template_compute_node.xml
+0
-74
master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.SlapOSTestCaseMixin.py
...teItem/portal_components/test.erp5.SlapOSTestCaseMixin.py
+2
-2
master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloud.py
...mplateItem/portal_components/test.erp5.testSlapOSCloud.py
+2
-2
master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudComputeNodeSlapInterfaceWorkflow.py
...t.erp5.testSlapOSCloudComputeNodeSlapInterfaceWorkflow.py
+4
-4
master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudComputePartitionSlapInterfaceWorkflow.py
...5.testSlapOSCloudComputePartitionSlapInterfaceWorkflow.py
+2
-2
master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudConstraint.py
.../portal_components/test.erp5.testSlapOSCloudConstraint.py
+4
-4
master/bt5/slapos_cloud/bt/template_path_list
master/bt5/slapos_cloud/bt/template_path_list
+0
-2
No files found.
master/bt5/slapos_cloud/PathTemplateItem/compute_node_module/template_compute_node.xml
deleted
100644 → 0
View file @
d64fafaf
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Compute Node"
module=
"erp5.portal_type"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_Access_contents_information_Permission
</string>
</key>
<value>
<tuple>
<string>
Assignee
</string>
<string>
Assignor
</string>
<string>
Associate
</string>
<string>
Auditor
</string>
<string>
Author
</string>
<string>
Manager
</string>
<string>
Owner
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
_Add_portal_content_Permission
</string>
</key>
<value>
<tuple>
<string>
Assignee
</string>
<string>
Assignor
</string>
<string>
Associate
</string>
<string>
Author
</string>
<string>
Manager
</string>
<string>
Owner
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
_Modify_portal_content_Permission
</string>
</key>
<value>
<tuple>
<string>
Assignee
</string>
<string>
Assignor
</string>
<string>
Associate
</string>
<string>
Author
</string>
<string>
Manager
</string>
<string>
Owner
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
_View_Permission
</string>
</key>
<value>
<tuple>
<string>
Assignee
</string>
<string>
Assignor
</string>
<string>
Associate
</string>
<string>
Auditor
</string>
<string>
Author
</string>
<string>
Manager
</string>
<string>
Owner
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
template_compute_node
</string>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Compute Node
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.SlapOSTestCaseMixin.py
View file @
a83878ba
...
@@ -379,8 +379,8 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
...
@@ -379,8 +379,8 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
return
compute_node
,
partition
return
compute_node
,
partition
def
_makeComputeNode
(
self
,
project
,
allocation_scope
=
'open'
):
def
_makeComputeNode
(
self
,
project
,
allocation_scope
=
'open'
):
self
.
compute_node
=
self
.
portal
.
compute_node_module
.
template_compute_node
\
self
.
compute_node
=
self
.
portal
.
compute_node_module
\
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
newContent
(
portal_type
=
"Compute Node"
)
reference
=
'TESTCOMP-%s'
%
self
.
generateNewId
()
reference
=
'TESTCOMP-%s'
%
self
.
generateNewId
()
self
.
compute_node
.
edit
(
self
.
compute_node
.
edit
(
allocation_scope
=
allocation_scope
,
allocation_scope
=
allocation_scope
,
...
...
master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloud.py
View file @
a83878ba
...
@@ -494,8 +494,8 @@ class TestSlapOSCloudSlapOSComputeNodeMixin_getCacheComputeNodeInformation(
...
@@ -494,8 +494,8 @@ class TestSlapOSCloudSlapOSComputeNodeMixin_getCacheComputeNodeInformation(
self
.
project
=
self
.
addProject
()
self
.
project
=
self
.
addProject
()
# Prepare compute_node
# Prepare compute_node
self
.
compute_node
=
self
.
portal
.
compute_node_module
.
template_compute_node
\
self
.
compute_node
=
self
.
portal
.
compute_node_module
\
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
newContent
(
portal_type
=
"Compute Node"
)
self
.
compute_node
.
edit
(
self
.
compute_node
.
edit
(
title
=
"Compute Node %s"
%
self
.
new_id
,
title
=
"Compute Node %s"
%
self
.
new_id
,
reference
=
"TESTCOMP-%s"
%
self
.
new_id
,
reference
=
"TESTCOMP-%s"
%
self
.
new_id
,
...
...
master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudComputeNodeSlapInterfaceWorkflow.py
View file @
a83878ba
...
@@ -29,8 +29,8 @@ class TestSlapOSCoreComputeNodeSlapInterfaceWorkflow(SlapOSTestCaseMixin):
...
@@ -29,8 +29,8 @@ class TestSlapOSCoreComputeNodeSlapInterfaceWorkflow(SlapOSTestCaseMixin):
SlapOSTestCaseMixin
.
afterSetUp
(
self
)
SlapOSTestCaseMixin
.
afterSetUp
(
self
)
self
.
project
=
self
.
addProject
()
self
.
project
=
self
.
addProject
()
# Clone compute_node document
# Clone compute_node document
self
.
compute_node
=
self
.
portal
.
compute_node_module
.
template_compute_node
\
self
.
compute_node
=
self
.
portal
.
compute_node_module
\
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
newContent
(
portal_type
=
"Compute Node"
)
new_id
=
self
.
generateNewId
()
new_id
=
self
.
generateNewId
()
self
.
compute_node
.
edit
(
self
.
compute_node
.
edit
(
title
=
"compute node %s"
%
(
new_id
,
),
title
=
"compute node %s"
%
(
new_id
,
),
...
@@ -491,8 +491,8 @@ class TestSlapOSCoreComputeNodeSlapInterfaceWorkflowSupply(SlapOSTestCaseMixin):
...
@@ -491,8 +491,8 @@ class TestSlapOSCoreComputeNodeSlapInterfaceWorkflowSupply(SlapOSTestCaseMixin):
self
.
project
=
self
.
addProject
()
self
.
project
=
self
.
addProject
()
# Clone compute_node document
# Clone compute_node document
compute_node
=
portal
.
compute_node_module
.
template_compute_node
\
compute_node
=
portal
.
compute_node_module
\
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
newContent
(
portal_type
=
"Compute Node"
)
# Clone person document
# Clone person document
person_user
=
self
.
makePerson
(
self
.
project
,
new_id
=
self
.
new_id
,
index
=
0
)
person_user
=
self
.
makePerson
(
self
.
project
,
new_id
=
self
.
new_id
,
index
=
0
)
self
.
addProjectProductionManagerAssignment
(
person_user
,
self
.
project
)
self
.
addProjectProductionManagerAssignment
(
person_user
,
self
.
project
)
...
...
master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudComputePartitionSlapInterfaceWorkflow.py
View file @
a83878ba
...
@@ -26,8 +26,8 @@ class TestSlapOSCoreComputePartitionSlapInterfaceWorkflow(SlapOSTestCaseMixin):
...
@@ -26,8 +26,8 @@ class TestSlapOSCoreComputePartitionSlapInterfaceWorkflow(SlapOSTestCaseMixin):
self
.
login
()
self
.
login
()
SlapOSTestCaseMixin
.
afterSetUp
(
self
)
SlapOSTestCaseMixin
.
afterSetUp
(
self
)
# Clone compute_node document
# Clone compute_node document
self
.
compute_node
=
self
.
portal
.
compute_node_module
.
template_compute_node
\
self
.
compute_node
=
self
.
portal
.
compute_node_module
\
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
newContent
(
portal_type
=
"Compute Node"
)
self
.
compute_node
.
edit
(
self
.
compute_node
.
edit
(
title
=
"compute node %s"
%
(
self
.
new_id
,
),
title
=
"compute node %s"
%
(
self
.
new_id
,
),
reference
=
"TESTCOMP-%s"
%
(
self
.
new_id
,
),
reference
=
"TESTCOMP-%s"
%
(
self
.
new_id
,
),
...
...
master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudConstraint.py
View file @
a83878ba
...
@@ -45,8 +45,8 @@ class TestSlapOSConstraintMixin(SlapOSTestCaseMixin):
...
@@ -45,8 +45,8 @@ class TestSlapOSConstraintMixin(SlapOSTestCaseMixin):
class
TestSlapOSComputePartitionConstraint
(
TestSlapOSConstraintMixin
):
class
TestSlapOSComputePartitionConstraint
(
TestSlapOSConstraintMixin
):
def
test_non_busy_partition_has_no_related_instance
(
self
):
def
test_non_busy_partition_has_no_related_instance
(
self
):
compute_node
=
self
.
portal
.
compute_node_module
.
template_compute_node
\
compute_node
=
self
.
portal
.
compute_node_module
\
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
newContent
(
portal_type
=
"Compute Node"
)
partition
=
compute_node
.
newContent
(
portal_type
=
'Compute Partition'
)
partition
=
compute_node
.
newContent
(
portal_type
=
'Compute Partition'
)
self
.
portal
.
portal_workflow
.
_jumpToStateFor
(
partition
,
'free'
)
self
.
portal
.
portal_workflow
.
_jumpToStateFor
(
partition
,
'free'
)
software_instance
=
self
.
portal
.
software_instance_module
\
software_instance
=
self
.
portal
.
software_instance_module
\
...
@@ -84,8 +84,8 @@ class TestSlapOSComputePartitionConstraint(TestSlapOSConstraintMixin):
...
@@ -84,8 +84,8 @@ class TestSlapOSComputePartitionConstraint(TestSlapOSConstraintMixin):
self
.
portal
.
portal_workflow
.
_jumpToStateFor
(
partition
,
'free'
)
self
.
portal
.
portal_workflow
.
_jumpToStateFor
(
partition
,
'free'
)
def
test_busy_partition_has_one_related_instance
(
self
):
def
test_busy_partition_has_one_related_instance
(
self
):
compute_node
=
self
.
portal
.
compute_node_module
.
template_compute_node
\
compute_node
=
self
.
portal
.
compute_node_module
\
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
newContent
(
portal_type
=
"Compute Node"
)
partition
=
compute_node
.
newContent
(
portal_type
=
'Compute Partition'
)
partition
=
compute_node
.
newContent
(
portal_type
=
'Compute Partition'
)
self
.
portal
.
portal_workflow
.
_jumpToStateFor
(
partition
,
'busy'
)
self
.
portal
.
portal_workflow
.
_jumpToStateFor
(
partition
,
'busy'
)
software_instance
=
self
.
portal
.
software_instance_module
\
software_instance
=
self
.
portal
.
software_instance_module
\
...
...
master/bt5/slapos_cloud/bt/template_path_list
View file @
a83878ba
acl_users/slapos_access_token_extraction
acl_users/slapos_access_token_extraction
acl_users/slapos_machine
acl_users/slapos_machine
acl_users/slapos_shadow
acl_users/slapos_shadow
compute_node_module/template_compute_node
compute_node_module/template_compute_node/**
instance_tree_module/template_instance_tree
instance_tree_module/template_instance_tree
person_module/template_member
person_module/template_member
person_module/template_member/**
person_module/template_member/**
...
...
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