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
Labels
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Rafael Monnerat
slapos.core
Commits
1995f3c0
Commit
1995f3c0
authored
Oct 23, 2012
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Speedup preparation.
Jump directly into proper inital state of the tree.
parent
3f957fbd
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
31 additions
and
16 deletions
+31
-16
master/bt5/slapos_cloud/PathTemplateItem/software_instance_module/template_software_instance.xml
...m/software_instance_module/template_software_instance.xml
+1
-3
master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCoreSoftwareInstanceRequest.py
...TestTemplateItem/testSlapOSCoreSoftwareInstanceRequest.py
+26
-9
master/bt5/slapos_cloud/bt/revision
master/bt5/slapos_cloud/bt/revision
+1
-1
master/bt5/slapos_cloud/bt/template_path_list
master/bt5/slapos_cloud/bt/template_path_list
+2
-1
master/bt5/vifib_slapos_rest_api_v1_test/bt/revision
master/bt5/vifib_slapos_rest_api_v1_test/bt/revision
+1
-1
master/bt5/vifib_slapos_rest_api_v1_test/bt/template_path_list
...r/bt5/vifib_slapos_rest_api_v1_test/bt/template_path_list
+0
-1
No files found.
master/bt5/
vifib_slapos_rest_api_v1_test
/PathTemplateItem/software_instance_module/template_software_instance.xml
→
master/bt5/
slapos_cloud
/PathTemplateItem/software_instance_module/template_software_instance.xml
View file @
1995f3c0
...
@@ -71,9 +71,7 @@
...
@@ -71,9 +71,7 @@
<item>
<item>
<key>
<string>
categories
</string>
</key>
<key>
<string>
categories
</string>
</key>
<value>
<value>
<tuple>
<tuple/>
<string>
specialise/hosting_subscription_module/template_hosting_subscription
</string>
</tuple>
</value>
</value>
</item>
</item>
<item>
<item>
...
...
master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCoreSoftwareInstanceRequest.py
View file @
1995f3c0
...
@@ -25,10 +25,9 @@ class TestSlapOSCoreSoftwareInstanceRequest(testSlapOSMixin):
...
@@ -25,10 +25,9 @@ class TestSlapOSCoreSoftwareInstanceRequest(testSlapOSMixin):
self
.
setupPortalCertificateAuthority
()
self
.
setupPortalCertificateAuthority
()
safe_xml
=
'<?xml version="1.0" encoding="utf-8"?><instance></instance>'
safe_xml
=
'<?xml version="1.0" encoding="utf-8"?><instance></instance>'
title
=
self
.
generateNewSoftwareTitle
()
self
.
request_kw
=
dict
(
self
.
request_kw
=
dict
(
software_release
=
self
.
generateNewSoftwareReleaseUrl
(),
software_release
=
self
.
generateNewSoftwareReleaseUrl
(),
software_title
=
title
,
software_title
=
self
.
generateNewSoftwareTitle
()
,
software_type
=
self
.
generateNewSoftwareType
(),
software_type
=
self
.
generateNewSoftwareType
(),
instance_xml
=
safe_xml
,
instance_xml
=
safe_xml
,
sla_xml
=
safe_xml
,
sla_xml
=
safe_xml
,
...
@@ -39,18 +38,36 @@ class TestSlapOSCoreSoftwareInstanceRequest(testSlapOSMixin):
...
@@ -39,18 +38,36 @@ class TestSlapOSCoreSoftwareInstanceRequest(testSlapOSMixin):
# prepare part of tree
# prepare part of tree
hosting_subscription
=
portal
.
hosting_subscription_module
\
hosting_subscription
=
portal
.
hosting_subscription_module
\
.
template_hosting_subscription
.
Base_createCloneDocument
(
batch_mode
=
1
)
.
template_hosting_subscription
.
Base_createCloneDocument
(
batch_mode
=
1
)
self
.
software_instance
=
portal
.
software_instance_module
\
.
template_software_instance
.
Base_createCloneDocument
(
batch_mode
=
1
)
hosting_subscription
.
edit
(
hosting_subscription
.
edit
(
title
=
title
,
title
=
self
.
request_kw
[
'software_title'
],
reference
=
"TESTHS-%s"
%
new_id
reference
=
"TESTHS-%s"
%
new_id
,
root_software_release_url
=
self
.
request_kw
[
'software_release'
],
source_reference
=
self
.
request_kw
[
'software_type'
],
text_content
=
self
.
request_kw
[
'instance_xml'
],
sla_xml
=
self
.
request_kw
[
'sla_xml'
],
root_slave
=
self
.
request_kw
[
'shared'
],
predecessor
=
self
.
software_instance
.
getRelativeUrl
()
)
)
hosting_subscription
.
updateLocalRolesOnSecurityGroups
()
hosting_subscription
.
updateLocalRolesOnSecurityGroups
()
hosting_subscription
.
validate
()
hosting_subscription
.
validate
()
hosting_subscription
.
requestStart
(
**
self
.
request_kw
)
self
.
portal
.
portal_workflow
.
_jumpToStateFor
(
hosting_subscription
,
'start_requested'
)
hosting_subscription
.
requestInstance
(
**
self
.
request_kw
)
self
.
software_instance
.
edit
(
self
.
software_instance
=
hosting_subscription
.
getPredecessorValue
(
title
=
self
.
request_kw
[
'software_title'
],
portal_type
=
'Software Instance'
)
reference
=
"TESTSI-%s"
%
new_id
,
root_software_release_url
=
self
.
request_kw
[
'software_release'
],
source_reference
=
self
.
request_kw
[
'software_type'
],
text_content
=
self
.
request_kw
[
'instance_xml'
],
sla_xml
=
self
.
request_kw
[
'sla_xml'
],
specialise
=
hosting_subscription
.
getRelativeUrl
()
)
self
.
portal
.
portal_workflow
.
_jumpToStateFor
(
self
.
software_instance
,
'start_requested'
)
self
.
software_instance
.
validate
()
self
.
software_instance
.
updateLocalRolesOnSecurityGroups
()
self
.
tic
()
self
.
tic
()
# Login as new Software Instance
# Login as new Software Instance
...
...
master/bt5/slapos_cloud/bt/revision
View file @
1995f3c0
69
70
\ No newline at end of file
\ No newline at end of file
master/bt5/slapos_cloud/bt/template_path_list
View file @
1995f3c0
...
@@ -3,4 +3,5 @@ computer_module/template_computer
...
@@ -3,4 +3,5 @@ computer_module/template_computer
computer_module/template_computer/**
computer_module/template_computer/**
hosting_subscription_module/template_hosting_subscription
hosting_subscription_module/template_hosting_subscription
person_module/template_member
person_module/template_member
person_module/template_member/**
person_module/template_member/**
\ No newline at end of file
software_instance_module/template_software_instance
\ No newline at end of file
master/bt5/vifib_slapos_rest_api_v1_test/bt/revision
View file @
1995f3c0
84
85
\ No newline at end of file
\ No newline at end of file
master/bt5/vifib_slapos_rest_api_v1_test/bt/template_path_list
deleted
100644 → 0
View file @
3f957fbd
software_instance_module/template_software_instance
\ No newline at end of file
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