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
7b0d12f2
Commit
7b0d12f2
authored
Oct 27, 2023
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_cloud: drop template_instance_tree
parent
b8b04a0d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
191 deletions
+8
-191
master/bt5/slapos_cloud/PathTemplateItem/instance_tree_module/template_instance_tree.xml
...plateItem/instance_tree_module/template_instance_tree.xml
+0
-181
master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.SlapOSTestCaseMixin.py
...teItem/portal_components/test.erp5.SlapOSTestCaseMixin.py
+6
-6
master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudInstanceSlapInterfaceWorkflow.py
...test.erp5.testSlapOSCloudInstanceSlapInterfaceWorkflow.py
+2
-2
master/bt5/slapos_cloud/bt/template_keep_path_list
master/bt5/slapos_cloud/bt/template_keep_path_list
+0
-1
master/bt5/slapos_cloud/bt/template_path_list
master/bt5/slapos_cloud/bt/template_path_list
+0
-1
No files found.
master/bt5/slapos_cloud/PathTemplateItem/instance_tree_module/template_instance_tree.xml
deleted
100644 → 0
View file @
b8b04a0d
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Instance Tree"
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>
_Delete_objects_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>
categories
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
default_reference
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
default_source_reference
</string>
</key>
<value>
<string>
RootSoftwareInstance
</string>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
template_instance_tree
</string>
</value>
</item>
<item>
<key>
<string>
language
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
periodicity_hour
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
periodicity_minute
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
periodicity_month
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
periodicity_month_day
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
periodicity_week
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Instance Tree
</string>
</value>
</item>
<item>
<key>
<string>
root_slave
</string>
</key>
<value>
<int>
0
</int>
</value>
</item>
<item>
<key>
<string>
sla_xml
</string>
</key>
<value>
<string
encoding=
"cdata"
>
<![CDATA[
<?xml version=\'1.0\' encoding=\'utf-8\'?>
\n
<instance>
\n
<parameter
id=
"computer_guid"
>
SOMECOMP
</parameter>
\n
</instance>
\n
]]>
</string>
</value>
</item>
<item>
<key>
<string>
text_content
</string>
</key>
<value>
<string
encoding=
"cdata"
>
<![CDATA[
<?xml version="1.0" encoding="utf-8"?>
\n
<instance>
\n
<parameter
id=
"parameter1"
>
valueof1
</parameter>
\n
<parameter
id=
"parameter2"
>
valueof2
</parameter>
\n
</instance>
]]>
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
Template Instance Tree
</string>
</value>
</item>
<item>
<key>
<string>
url_string
</string>
</key>
<value>
<string>
http://example.com/root/software/release
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.SlapOSTestCaseMixin.py
View file @
7b0d12f2
...
@@ -297,7 +297,7 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
...
@@ -297,7 +297,7 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
self
.
commit
()
self
.
commit
()
# prepare part of tree
# prepare part of tree
self
.
instance_tree
=
self
.
portal
.
instance_tree_module
\
self
.
instance_tree
=
self
.
portal
.
instance_tree_module
\
.
template_instance_tree
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
newContent
(
portal_type
=
"Instance Tree"
)
self
.
software_instance
=
self
.
portal
.
software_instance_module
\
self
.
software_instance
=
self
.
portal
.
software_instance_module
\
[
requested_template_id
].
Base_createCloneDocument
(
batch_mode
=
1
)
[
requested_template_id
].
Base_createCloneDocument
(
batch_mode
=
1
)
...
@@ -472,7 +472,7 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
...
@@ -472,7 +472,7 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
# prepare some trees
# prepare some trees
instance_tree
=
self
.
portal
.
instance_tree_module
\
instance_tree
=
self
.
portal
.
instance_tree_module
\
.
template_instance_tree
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
newContent
(
portal_type
=
"Instance Tree"
)
instance_tree
.
validate
()
instance_tree
.
validate
()
instance_tree
.
edit
(
instance_tree
.
edit
(
title
=
self
.
generateNewSoftwareTitle
(),
title
=
self
.
generateNewSoftwareTitle
(),
...
@@ -500,7 +500,7 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
...
@@ -500,7 +500,7 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
if
with_slave
:
if
with_slave
:
instance_tree
=
self
.
portal
.
instance_tree_module
\
instance_tree
=
self
.
portal
.
instance_tree_module
\
.
template_instance_tree
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
newContent
(
portal_type
=
"Instance Tree"
)
instance_tree
.
validate
()
instance_tree
.
validate
()
instance_tree
.
edit
(
instance_tree
.
edit
(
title
=
self
.
generateNewSoftwareTitle
(),
title
=
self
.
generateNewSoftwareTitle
(),
...
@@ -526,7 +526,7 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
...
@@ -526,7 +526,7 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
self
.
start_requested_slave_instance
.
edit
(
aggregate
=
self
.
compute_node
.
partition1
.
getRelativeUrl
())
self
.
start_requested_slave_instance
.
edit
(
aggregate
=
self
.
compute_node
.
partition1
.
getRelativeUrl
())
instance_tree
=
self
.
portal
.
instance_tree_module
\
instance_tree
=
self
.
portal
.
instance_tree_module
\
.
template_instance_tree
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
newContent
(
portal_type
=
"Instance Tree"
)
instance_tree
.
validate
()
instance_tree
.
validate
()
instance_tree
.
edit
(
instance_tree
.
edit
(
title
=
self
.
generateNewSoftwareTitle
(),
title
=
self
.
generateNewSoftwareTitle
(),
...
@@ -555,7 +555,7 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
...
@@ -555,7 +555,7 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
)
)
instance_tree
=
self
.
portal
.
instance_tree_module
\
instance_tree
=
self
.
portal
.
instance_tree_module
\
.
template_instance_tree
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
newContent
(
portal_type
=
"Instance Tree"
)
instance_tree
.
validate
()
instance_tree
.
validate
()
instance_tree
.
edit
(
instance_tree
.
edit
(
title
=
self
.
generateNewSoftwareTitle
(),
title
=
self
.
generateNewSoftwareTitle
(),
...
@@ -587,7 +587,7 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
...
@@ -587,7 +587,7 @@ class SlapOSTestCaseMixin(testSlapOSMixin):
)
)
instance_tree
=
self
.
portal
.
instance_tree_module
\
instance_tree
=
self
.
portal
.
instance_tree_module
\
.
template_instance_tree
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
newContent
(
portal_type
=
"Instance Tree"
)
instance_tree
.
validate
()
instance_tree
.
validate
()
instance_tree
.
edit
(
instance_tree
.
edit
(
title
=
self
.
generateNewSoftwareTitle
(),
title
=
self
.
generateNewSoftwareTitle
(),
...
...
master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudInstanceSlapInterfaceWorkflow.py
View file @
7b0d12f2
...
@@ -44,7 +44,7 @@ class TestSlapOSCoreInstanceSlapInterfaceWorkflow(SlapOSTestCaseMixin):
...
@@ -44,7 +44,7 @@ class TestSlapOSCoreInstanceSlapInterfaceWorkflow(SlapOSTestCaseMixin):
# prepare part of tree
# prepare part of tree
instance_tree
=
portal
.
instance_tree_module
\
instance_tree
=
portal
.
instance_tree_module
\
.
template_instance_tree
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
newContent
(
portal_type
=
"Instance Tree"
)
self
.
software_instance
=
portal
.
software_instance_module
\
self
.
software_instance
=
portal
.
software_instance_module
\
.
template_software_instance
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
template_software_instance
.
Base_createCloneDocument
(
batch_mode
=
1
)
...
@@ -887,7 +887,7 @@ class TestSlapOSCoreInstanceSlapInterfaceWorkflowTransfer(SlapOSTestCaseMixin):
...
@@ -887,7 +887,7 @@ class TestSlapOSCoreInstanceSlapInterfaceWorkflowTransfer(SlapOSTestCaseMixin):
# prepare part of tree
# prepare part of tree
self
.
instance_tree
=
portal
.
instance_tree_module
\
self
.
instance_tree
=
portal
.
instance_tree_module
\
.
template_instance_tree
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
newContent
(
portal_type
=
"Instance Tree"
)
self
.
software_instance
=
portal
.
software_instance_module
\
self
.
software_instance
=
portal
.
software_instance_module
\
.
template_software_instance
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
template_software_instance
.
Base_createCloneDocument
(
batch_mode
=
1
)
...
...
master/bt5/slapos_cloud/bt/template_keep_path_list
View file @
7b0d12f2
instance_tree_module/template_**
person_module/template_member
person_module/template_member
portal_catalog/**
portal_catalog/**
portal_preferences/slapos_default_site_preference
portal_preferences/slapos_default_site_preference
...
...
master/bt5/slapos_cloud/bt/template_path_list
View file @
7b0d12f2
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
instance_tree_module/template_instance_tree
person_module/template_member
person_module/template_member
person_module/template_member/**
person_module/template_member/**
portal_alarms/slapos_allocate_instance
portal_alarms/slapos_allocate_instance
...
...
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