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
0
Merge Requests
0
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
Klaus Wölfel
slapos.core
Commits
ad22fdcc
Commit
ad22fdcc
authored
Apr 23, 2012
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Explicitly pass all arguments to Person.requestSoftwareInstance.
parent
f54f3e9a
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
20 additions
and
4 deletions
+20
-4
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_requestFromDialog.xml
...skins/vifib_hosting/SoftwareRelease_requestFromDialog.xml
+4
-0
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_orderVifibKVM.xml
...m/portal_skins/vifib_hosting/WebSection_orderVifibKVM.xml
+4
-0
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_setCustomerInformation.xml
...skins/vifib_hosting/WebSection_setCustomerInformation.xml
+4
-1
master/bt5/vifib_web/bt/revision
master/bt5/vifib_web/bt/revision
+1
-1
master/product/Vifib/tests/testVifibSlapComputerPartitionUpdate.py
...oduct/Vifib/tests/testVifibSlapComputerPartitionUpdate.py
+4
-1
master/product/Vifib/tests/testVifibSlapWebService.py
master/product/Vifib/tests/testVifibSlapWebService.py
+3
-1
No files found.
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_requestFromDialog.xml
View file @
ad22fdcc
...
@@ -73,7 +73,11 @@ request_kw = {}\n
...
@@ -73,7 +73,11 @@ request_kw = {}\n
request_kw.update(\n
request_kw.update(\n
software_release=url,\n
software_release=url,\n
software_title=service_title,\n
software_title=service_title,\n
software_type="RootSoftwareInstance",\n
instance_xml=instance_xml,\n
instance_xml=instance_xml,\n
sla_xml="",\n
shared=False,\n
state="started",\n
)\n
)\n
\n
\n
person.requestSoftwareInstance(**request_kw)\n
person.requestSoftwareInstance(**request_kw)\n
...
...
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_orderVifibKVM.xml
View file @
ad22fdcc
...
@@ -69,7 +69,11 @@ request_kw = {}\n
...
@@ -69,7 +69,11 @@ request_kw = {}\n
request_kw.update(\n
request_kw.update(\n
software_release=url,\n
software_release=url,\n
software_title="Vifib KVM %i" % portal.portal_ids.generateNewId(id_group=("vifib", "kvm"), default=1),\n
software_title="Vifib KVM %i" % portal.portal_ids.generateNewId(id_group=("vifib", "kvm"), default=1),\n
software_type="RootSoftwareInstance",\n
instance_xml=instance_xml,\n
instance_xml=instance_xml,\n
sla_xml="",\n
shared=False,\n
state="started",\n
)\n
)\n
\n
\n
person.requestSoftwareInstance(**request_kw)\n
person.requestSoftwareInstance(**request_kw)\n
...
...
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_setCustomerInformation.xml
View file @
ad22fdcc
...
@@ -81,8 +81,11 @@ request_kw = {}\n
...
@@ -81,8 +81,11 @@ request_kw = {}\n
request_kw.update(\n
request_kw.update(\n
software_release=software_release.getUrlString(),\n
software_release=software_release.getUrlString(),\n
software_title=service_title,\n
software_title=service_title,\n
software_type="RootSoftwareInstance",\n
instance_xml=instance_xml,\n
instance_xml=instance_xml,\n
shared=shared,\n
sla_xml="",\n
shared=False,\n
state="started",\n
)\n
)\n
\n
\n
if computer:\n
if computer:\n
...
...
master/bt5/vifib_web/bt/revision
View file @
ad22fdcc
364
365
\ No newline at end of file
\ No newline at end of file
master/product/Vifib/tests/testVifibSlapComputerPartitionUpdate.py
View file @
ad22fdcc
...
@@ -608,8 +608,11 @@ class TestVifibSlapComputerPartitionUpdate(TestVifibSlapWebServiceMixin):
...
@@ -608,8 +608,11 @@ class TestVifibSlapComputerPartitionUpdate(TestVifibSlapWebServiceMixin):
person
.
requestSoftwareInstance
(
person
.
requestSoftwareInstance
(
software_release
=
software_release
.
getUrlString
(),
software_release
=
software_release
.
getUrlString
(),
software_title
=
software_title
,
software_title
=
software_title
,
software_type
=
"RootSoftwareInstance"
,
instance_xml
=
self
.
minimal_correct_xml
,
instance_xml
=
self
.
minimal_correct_xml
,
**
kw
)
sla_xml
=
""
,
shared
=
False
,
state
=
"started"
)
sequence
.
edit
(
root_software_instance_title
=
software_title
)
sequence
.
edit
(
root_software_instance_title
=
software_title
)
def
test_update_not_created_person_request_in_progress
(
self
):
def
test_update_not_created_person_request_in_progress
(
self
):
...
...
master/product/Vifib/tests/testVifibSlapWebService.py
View file @
ad22fdcc
...
@@ -602,9 +602,11 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
...
@@ -602,9 +602,11 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
person
.
requestSoftwareInstance
(
person
.
requestSoftwareInstance
(
software_release
=
software_release
.
getUrlString
(),
software_release
=
software_release
.
getUrlString
(),
software_title
=
software_title
,
software_title
=
software_title
,
software_type
=
"RootSoftwareInstance"
,
instance_xml
=
self
.
minimal_correct_xml
,
instance_xml
=
self
.
minimal_correct_xml
,
sla_xml
=
sequence
.
get
(
'sla_xml'
),
sla_xml
=
sequence
.
get
(
'sla_xml'
),
**
kw
)
shared
=
False
,
state
=
"started"
)
transaction
.
commit
()
transaction
.
commit
()
self
.
tic
()
self
.
tic
()
# Note: This is tricky part. Workflow methods does not return nothing
# Note: This is tricky part. Workflow methods does not return nothing
...
...
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