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
23
Merge Requests
23
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
nexedi
slapos.core
Commits
75890488
Commit
75890488
authored
Oct 23, 2012
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Drop template_software_release.
Software Release document is created on demand.
parent
310e7ba5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
147 deletions
+18
-147
master/bt5/slapos_cloud/PathTemplateItem/software_release_module/template_software_release.xml
...tem/software_release_module/template_software_release.xml
+0
-105
master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCorePersonRequest.py
...pos_cloud/TestTemplateItem/testSlapOSCorePersonRequest.py
+16
-38
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
+1
-3
No files found.
master/bt5/slapos_cloud/PathTemplateItem/software_release_module/template_software_release.xml
deleted
100644 → 0
View file @
310e7ba5
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Software Release"
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>
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>
Manager
</string>
<string>
Owner
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
_Change_local_roles_Permission
</string>
</key>
<value>
<tuple>
<string>
Assignor
</string>
<string>
Manager
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
_Modify_portal_content_Permission
</string>
</key>
<value>
<tuple>
<string>
Assignee
</string>
<string>
Assignor
</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>
Manager
</string>
<string>
Owner
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
template_software_release
</string>
</value>
</item>
<item>
<key>
<string>
language
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Software Release
</string>
</value>
</item>
<item>
<key>
<string>
short_title
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
Software Release Template
</string>
</value>
</item>
<item>
<key>
<string>
url_protocol
</string>
</key>
<value>
<string>
http
</string>
</value>
</item>
<item>
<key>
<string>
version
</string>
</key>
<value>
<none/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCorePersonRequest.py
View file @
75890488
...
@@ -19,28 +19,6 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
...
@@ -19,28 +19,6 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
self
.
setupPortalCertificateAuthority
()
self
.
setupPortalCertificateAuthority
()
# Clone software release document
software_release
=
portal
.
software_release_module
.
template_software_release
.
\
Base_createCloneDocument
(
batch_mode
=
1
)
software_release
.
edit
(
title
=
"live_test_%s"
%
new_id
,
reference
=
"live_test_%s"
%
new_id
,
url_string
=
self
.
generateNewSoftwareReleaseUrl
(),
)
software_release
.
publish
()
self
.
software_release
=
software_release
new_id
=
self
.
generateNewId
()
software_release
=
portal
.
software_release_module
.
template_software_release
.
\
Base_createCloneDocument
(
batch_mode
=
1
)
software_release
.
edit
(
title
=
"live_test_%s"
%
new_id
,
reference
=
"live_test_%s"
%
new_id
,
url_string
=
self
.
generateNewSoftwareReleaseUrl
(),
)
software_release
.
publish
()
self
.
software_release2
=
software_release
# Clone person document
# Clone person document
person_user
=
portal
.
person_module
.
template_member
.
\
person_user
=
portal
.
person_module
.
template_member
.
\
Base_createCloneDocument
(
batch_mode
=
1
)
Base_createCloneDocument
(
batch_mode
=
1
)
...
@@ -69,7 +47,7 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
...
@@ -69,7 +47,7 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
def
test_Person_requestSoftwareInstance_requiredParameter
(
self
):
def
test_Person_requestSoftwareInstance_requiredParameter
(
self
):
person
=
self
.
getPortalObject
().
ERP5Site_getAuthenticatedMemberPersonValue
()
person
=
self
.
getPortalObject
().
ERP5Site_getAuthenticatedMemberPersonValue
()
software_release
=
self
.
software_release
.
getUrlString
()
software_release
=
self
.
generateNewSoftwareReleaseUrl
()
software_title
=
"test"
software_title
=
"test"
software_type
=
"test"
software_type
=
"test"
instance_xml
=
"""<?xml version="1.0" encoding="utf-8"?>
instance_xml
=
"""<?xml version="1.0" encoding="utf-8"?>
...
@@ -165,7 +143,7 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
...
@@ -165,7 +143,7 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
def
test_Person_requestSoftwareInstance_acceptedState
(
self
):
def
test_Person_requestSoftwareInstance_acceptedState
(
self
):
person
=
self
.
getPortalObject
().
ERP5Site_getAuthenticatedMemberPersonValue
()
person
=
self
.
getPortalObject
().
ERP5Site_getAuthenticatedMemberPersonValue
()
software_release
=
self
.
software_release
.
getUrlString
()
software_release
=
self
.
generateNewSoftwareReleaseUrl
()
software_title
=
"test"
software_title
=
"test"
software_type
=
"test"
software_type
=
"test"
instance_xml
=
"""<?xml version="1.0" encoding="utf-8"?>
instance_xml
=
"""<?xml version="1.0" encoding="utf-8"?>
...
@@ -226,7 +204,7 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
...
@@ -226,7 +204,7 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
def
test_Person_requestSoftwareInstance_returnHostingSubscriptionUrl
(
self
):
def
test_Person_requestSoftwareInstance_returnHostingSubscriptionUrl
(
self
):
person
=
self
.
getPortalObject
().
ERP5Site_getAuthenticatedMemberPersonValue
()
person
=
self
.
getPortalObject
().
ERP5Site_getAuthenticatedMemberPersonValue
()
software_release
=
self
.
software_release
.
getUrlString
()
software_release
=
self
.
generateNewSoftwareReleaseUrl
()
software_title
=
"test"
software_title
=
"test"
software_type
=
"test"
software_type
=
"test"
instance_xml
=
"""<?xml version="1.0" encoding="utf-8"?>
instance_xml
=
"""<?xml version="1.0" encoding="utf-8"?>
...
@@ -253,7 +231,7 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
...
@@ -253,7 +231,7 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
def
test_Person_requestSoftwareInstance_createHostingSubscription
(
self
):
def
test_Person_requestSoftwareInstance_createHostingSubscription
(
self
):
person
=
self
.
getPortalObject
().
ERP5Site_getAuthenticatedMemberPersonValue
()
person
=
self
.
getPortalObject
().
ERP5Site_getAuthenticatedMemberPersonValue
()
software_release
=
self
.
software_release
.
getUrlString
()
software_release
=
self
.
generateNewSoftwareReleaseUrl
()
software_title
=
"test"
software_title
=
"test"
software_type
=
"test"
software_type
=
"test"
instance_xml
=
"""<?xml version="1.0" encoding="utf-8"?>
instance_xml
=
"""<?xml version="1.0" encoding="utf-8"?>
...
@@ -278,7 +256,7 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
...
@@ -278,7 +256,7 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
state
=
state
,
state
=
state
,
)
)
hosting_subscription
=
person
.
REQUEST
.
get
(
'request_hosting_subscription'
)
hosting_subscription
=
person
.
REQUEST
.
get
(
'request_hosting_subscription'
)
self
.
assertEquals
(
software_release
,
self
.
assertEquals
(
software_release
,
hosting_subscription
.
getRootSoftwareReleaseUrl
())
hosting_subscription
.
getRootSoftwareReleaseUrl
())
self
.
assertEquals
(
software_title
,
hosting_subscription
.
getTitle
())
self
.
assertEquals
(
software_title
,
hosting_subscription
.
getTitle
())
self
.
assertEquals
(
software_type
,
hosting_subscription
.
getSourceReference
())
self
.
assertEquals
(
software_type
,
hosting_subscription
.
getSourceReference
())
...
@@ -293,7 +271,7 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
...
@@ -293,7 +271,7 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
def
test_Person_requestSoftwareInstance_HostingSubscriptionNotReindexed
(
self
):
def
test_Person_requestSoftwareInstance_HostingSubscriptionNotReindexed
(
self
):
person
=
self
.
getPortalObject
().
ERP5Site_getAuthenticatedMemberPersonValue
()
person
=
self
.
getPortalObject
().
ERP5Site_getAuthenticatedMemberPersonValue
()
software_release
=
self
.
software_release
.
getUrlString
()
software_release
=
self
.
generateNewSoftwareReleaseUrl
()
software_title
=
"test"
software_title
=
"test"
software_type
=
"test"
software_type
=
"test"
instance_xml
=
"""<?xml version="1.0" encoding="utf-8"?>
instance_xml
=
"""<?xml version="1.0" encoding="utf-8"?>
...
@@ -329,7 +307,7 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
...
@@ -329,7 +307,7 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
def
test_Person_requestSoftwareInstance_updateHostingSubscription
(
self
):
def
test_Person_requestSoftwareInstance_updateHostingSubscription
(
self
):
person
=
self
.
getPortalObject
().
ERP5Site_getAuthenticatedMemberPersonValue
()
person
=
self
.
getPortalObject
().
ERP5Site_getAuthenticatedMemberPersonValue
()
software_release
=
self
.
software_release
.
getUrlString
()
software_release
=
self
.
generateNewSoftwareReleaseUrl
()
software_title
=
"test"
software_title
=
"test"
software_type
=
"test"
software_type
=
"test"
instance_xml
=
"""<?xml version="1.0" encoding="utf-8"?>
instance_xml
=
"""<?xml version="1.0" encoding="utf-8"?>
...
@@ -355,7 +333,7 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
...
@@ -355,7 +333,7 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
transaction
.
commit
()
transaction
.
commit
()
self
.
tic
()
self
.
tic
()
software_release2
=
self
.
software_release
.
getUrlString
()
software_release2
=
self
.
generateNewSoftwareReleaseUrl
()
software_type2
=
"test2"
software_type2
=
"test2"
instance_xml2
=
"""<?xml version='1.0' encoding='utf-8'?>
instance_xml2
=
"""<?xml version='1.0' encoding='utf-8'?>
<instance>
<instance>
...
@@ -384,7 +362,7 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
...
@@ -384,7 +362,7 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
self
.
assertEquals
(
hosting_subscription_reference
,
self
.
assertEquals
(
hosting_subscription_reference
,
hosting_subscription2
.
getReference
())
hosting_subscription2
.
getReference
())
self
.
assertEquals
(
software_release2
,
self
.
assertEquals
(
software_release2
,
hosting_subscription
.
getRootSoftwareReleaseUrl
())
hosting_subscription
.
getRootSoftwareReleaseUrl
())
self
.
assertEquals
(
software_title
,
hosting_subscription
.
getTitle
())
self
.
assertEquals
(
software_title
,
hosting_subscription
.
getTitle
())
self
.
assertEquals
(
software_type2
,
hosting_subscription
.
getSourceReference
())
self
.
assertEquals
(
software_type2
,
hosting_subscription
.
getSourceReference
())
...
@@ -397,7 +375,7 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
...
@@ -397,7 +375,7 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
def
test_Person_requestSoftwareInstance_duplicatedHostingSubscription
(
self
):
def
test_Person_requestSoftwareInstance_duplicatedHostingSubscription
(
self
):
person
=
self
.
getPortalObject
().
ERP5Site_getAuthenticatedMemberPersonValue
()
person
=
self
.
getPortalObject
().
ERP5Site_getAuthenticatedMemberPersonValue
()
software_release
=
self
.
software_release
.
getUrlString
()
software_release
=
self
.
generateNewSoftwareReleaseUrl
()
software_title
=
"test"
software_title
=
"test"
software_type
=
"test"
software_type
=
"test"
instance_xml
=
"""<?xml version="1.0" encoding="utf-8"?>
instance_xml
=
"""<?xml version="1.0" encoding="utf-8"?>
...
@@ -440,7 +418,7 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
...
@@ -440,7 +418,7 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
def
test_Person_requestSoftwareInstance_HostingSubscriptionNewTitle
(
self
):
def
test_Person_requestSoftwareInstance_HostingSubscriptionNewTitle
(
self
):
person
=
self
.
getPortalObject
().
ERP5Site_getAuthenticatedMemberPersonValue
()
person
=
self
.
getPortalObject
().
ERP5Site_getAuthenticatedMemberPersonValue
()
software_release
=
self
.
software_release
.
getUrlString
()
software_release
=
self
.
generateNewSoftwareReleaseUrl
()
software_title
=
"test"
software_title
=
"test"
software_type
=
"test"
software_type
=
"test"
instance_xml
=
"""<?xml version='1.0' encoding='utf-8'?>
instance_xml
=
"""<?xml version='1.0' encoding='utf-8'?>
...
@@ -465,7 +443,7 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
...
@@ -465,7 +443,7 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
transaction
.
commit
()
transaction
.
commit
()
software_release2
=
self
.
software_release
.
getUrlString
()
software_release2
=
self
.
generateNewSoftwareReleaseUrl
()
software_title2
=
"test2"
software_title2
=
"test2"
software_type2
=
"test2"
software_type2
=
"test2"
instance_xml2
=
"""<?xml version='1.0' encoding='utf-8'?>
instance_xml2
=
"""<?xml version='1.0' encoding='utf-8'?>
...
@@ -495,7 +473,7 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
...
@@ -495,7 +473,7 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
self
.
assertNotEquals
(
hosting_subscription
.
getReference
(),
self
.
assertNotEquals
(
hosting_subscription
.
getReference
(),
hosting_subscription2
.
getReference
())
hosting_subscription2
.
getReference
())
self
.
assertEquals
(
software_release2
,
self
.
assertEquals
(
software_release2
,
hosting_subscription2
.
getRootSoftwareReleaseUrl
())
hosting_subscription2
.
getRootSoftwareReleaseUrl
())
self
.
assertEquals
(
software_title2
,
hosting_subscription2
.
getTitle
())
self
.
assertEquals
(
software_title2
,
hosting_subscription2
.
getTitle
())
self
.
assertEquals
(
software_type2
,
hosting_subscription2
.
getSourceReference
())
self
.
assertEquals
(
software_type2
,
hosting_subscription2
.
getSourceReference
())
...
@@ -508,7 +486,7 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
...
@@ -508,7 +486,7 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
def
test_Person_requestSoftwareInstance_deletedHostingSubscription
(
self
):
def
test_Person_requestSoftwareInstance_deletedHostingSubscription
(
self
):
person
=
self
.
getPortalObject
().
ERP5Site_getAuthenticatedMemberPersonValue
()
person
=
self
.
getPortalObject
().
ERP5Site_getAuthenticatedMemberPersonValue
()
software_release
=
self
.
software_release
.
getUrlString
()
software_release
=
self
.
generateNewSoftwareReleaseUrl
()
software_title
=
"test"
software_title
=
"test"
software_type
=
"test"
software_type
=
"test"
instance_xml
=
"""<?xml version="1.0" encoding="utf-8"?>
instance_xml
=
"""<?xml version="1.0" encoding="utf-8"?>
...
@@ -547,7 +525,7 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
...
@@ -547,7 +525,7 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
def
test_Person_requestSoftwareInstance_noConflictWithDeletedHostingSubscription
(
self
):
def
test_Person_requestSoftwareInstance_noConflictWithDeletedHostingSubscription
(
self
):
person
=
self
.
getPortalObject
().
ERP5Site_getAuthenticatedMemberPersonValue
()
person
=
self
.
getPortalObject
().
ERP5Site_getAuthenticatedMemberPersonValue
()
software_release
=
self
.
software_release
.
getUrlString
()
software_release
=
self
.
generateNewSoftwareReleaseUrl
()
software_title
=
"test"
software_title
=
"test"
software_type
=
"test"
software_type
=
"test"
instance_xml
=
"""<?xml version="1.0" encoding="utf-8"?>
instance_xml
=
"""<?xml version="1.0" encoding="utf-8"?>
...
@@ -593,5 +571,5 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
...
@@ -593,5 +571,5 @@ class TestSlapOSCorePersonRequest(TestVifibSlapWebServiceMixin):
)
)
hosting_subscription2
=
person
.
REQUEST
.
get
(
'request_hosting_subscription'
)
hosting_subscription2
=
person
.
REQUEST
.
get
(
'request_hosting_subscription'
)
self
.
assertEquals
(
"start_requested"
,
hosting_subscription2
.
getSlapState
())
self
.
assertEquals
(
"start_requested"
,
hosting_subscription2
.
getSlapState
())
self
.
assertNotEquals
(
hosting_subscription
.
getRelativeUrl
(),
self
.
assertNotEquals
(
hosting_subscription
.
getRelativeUrl
(),
hosting_subscription2
.
getRelativeUrl
())
hosting_subscription2
.
getRelativeUrl
())
master/bt5/slapos_cloud/bt/revision
View file @
75890488
64
65
\ No newline at end of file
\ No newline at end of file
master/bt5/slapos_cloud/bt/template_path_list
View file @
75890488
acl_users/slapos_shadow
acl_users/slapos_shadow
person_module/template_member
person_module/template_member
person_module/template_member/**
person_module/template_member/**
software_release_module/template_software_release
\ No newline at end of file
software_release_module/template_software_release
\ 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