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
16
Merge Requests
16
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
23a99097
Commit
23a99097
authored
Apr 23, 2012
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use destroyed instead of deleted.
Stay consistent with current API
parent
6d6435b9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
12 deletions
+12
-12
master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/person_slap_interface_workflow/scripts/Person_requestSoftwareInstance.xml
...rface_workflow/scripts/Person_requestSoftwareInstance.xml
+4
-4
master/bt5/vifib_slap/bt/revision
master/bt5/vifib_slap/bt/revision
+1
-1
master/bt5/vifib_slapos_core_test/TestTemplateItem/testSlapOSCorePersonRequest.py
...core_test/TestTemplateItem/testSlapOSCorePersonRequest.py
+6
-6
master/bt5/vifib_slapos_core_test/bt/revision
master/bt5/vifib_slapos_core_test/bt/revision
+1
-1
No files found.
master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/person_slap_interface_workflow/scripts/Person_requestSoftwareInstance.xml
View file @
23a99097
...
...
@@ -70,8 +70,8 @@ try:\n
except KeyError:\n
raise TypeError, "Person_requestSoftwareInstance takes exactly 7 arguments"\n
\n
if state not in ["started", "stopped", "de
let
ed"]:\n
raise ValueError, "state should be started, stopped or de
let
ed"\n
if state not in ["started", "stopped", "de
stroy
ed"]:\n
raise ValueError, "state should be started, stopped or de
stroy
ed"\n
elif is_slave not in [True, False]:\n
raise ValueError, "shared should be a boolean"\n
\n
...
...
@@ -97,8 +97,8 @@ if len(request_hosting_subscription_list) > 1:\n
raise NotImplementedError, "Too many hosting subscription %s found" % software_title\n
elif len(request_hosting_subscription_list) == 1:\n
request_hosting_subscription = request_hosting_subscription_list[0].getObject()\n
if request_hosting_subscription.getRootState() == "de
let
ed":\n
raise NotImplementedError, "The system was not able to filter de
let
ed hosting subscription"\n
if request_hosting_subscription.getRootState() == "de
stroy
ed":\n
raise NotImplementedError, "The system was not able to filter de
stroy
ed hosting subscription"\n
else:\n
request_hosting_subscription = None\n
\n
...
...
master/bt5/vifib_slap/bt/revision
View file @
23a99097
699
\ No newline at end of file
700
\ No newline at end of file
master/bt5/vifib_slapos_core_test/TestTemplateItem/testSlapOSCorePersonRequest.py
View file @
23a99097
...
...
@@ -138,7 +138,7 @@ class TestSlapOSCorePersonRequest(ERP5TypeTestCase):
shared
=
True
state
=
"started"
# Only started, stopped, de
let
ed
# Only started, stopped, de
stroy
ed
self
.
assertRaises
(
ValueError
,
person
.
requestSoftwareInstance
,
software_release
=
software_release
,
software_title
=
software_title
,
...
...
@@ -175,15 +175,15 @@ class TestSlapOSCorePersonRequest(ERP5TypeTestCase):
person
.
requestSoftwareInstance
(
software_release
=
software_release
,
software_title
=
"de
let
ed"
,
software_title
=
"de
stroy
ed"
,
software_type
=
software_type
,
instance_xml
=
instance_xml
,
sla_xml
=
sla_xml
,
shared
=
shared
,
state
=
"de
let
ed"
,
state
=
"de
stroy
ed"
,
)
hosting_subscription
=
person
.
REQUEST
.
get
(
'request_hosting_subscription'
)
self
.
assertEquals
(
"de
let
ed"
,
hosting_subscription
.
getRootState
())
self
.
assertEquals
(
"de
stroy
ed"
,
hosting_subscription
.
getRootState
())
def
test_Person_requestSoftwareInstance_returnHostingSubscriptionUrl
(
self
):
person
=
self
.
getPortalObject
().
ERP5Site_getAuthenticatedMemberPersonValue
()
...
...
@@ -452,10 +452,10 @@ class TestSlapOSCorePersonRequest(ERP5TypeTestCase):
instance_xml
=
instance_xml
,
sla_xml
=
sla_xml
,
shared
=
shared
,
state
=
"de
let
ed"
,
state
=
"de
stroy
ed"
,
)
hosting_subscription
=
person
.
REQUEST
.
get
(
'request_hosting_subscription'
)
self
.
assertEquals
(
"de
let
ed"
,
hosting_subscription
.
getRootState
())
self
.
assertEquals
(
"de
stroy
ed"
,
hosting_subscription
.
getRootState
())
transaction
.
commit
()
self
.
tic
()
...
...
master/bt5/vifib_slapos_core_test/bt/revision
View file @
23a99097
1
\ No newline at end of file
2
\ 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