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
12341a40
Commit
12341a40
authored
Oct 16, 2012
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Switch to SlapTool way of computer creation.
parent
6cbe82e0
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
59 additions
and
44 deletions
+59
-44
master/product/Vifib/tests/testVifibSlapAllocationScope.py
master/product/Vifib/tests/testVifibSlapAllocationScope.py
+7
-7
master/product/Vifib/tests/testVifibSlapBang.py
master/product/Vifib/tests/testVifibSlapBang.py
+6
-2
master/product/Vifib/tests/testVifibSlapBug.py
master/product/Vifib/tests/testVifibSlapBug.py
+21
-7
master/product/Vifib/tests/testVifibSlapComputerPartitionConnection.py
...t/Vifib/tests/testVifibSlapComputerPartitionConnection.py
+1
-14
master/product/Vifib/tests/testVifibSlapComputerPartitionError.py
...roduct/Vifib/tests/testVifibSlapComputerPartitionError.py
+3
-1
master/product/Vifib/tests/testVifibSlapRegisterComputer.py
master/product/Vifib/tests/testVifibSlapRegisterComputer.py
+9
-3
master/product/Vifib/tests/testVifibSlapRegisterSoftwareRelease.py
...oduct/Vifib/tests/testVifibSlapRegisterSoftwareRelease.py
+3
-1
master/product/Vifib/tests/testVifibSlapWebService.py
master/product/Vifib/tests/testVifibSlapWebService.py
+9
-9
No files found.
master/product/Vifib/tests/testVifibSlapAllocationScope.py
View file @
12341a40
...
@@ -75,7 +75,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
...
@@ -75,7 +75,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
self
.
computer_partition_amount
=
2
self
.
computer_partition_amount
=
2
sequence_list
=
SequenceList
()
sequence_list
=
SequenceList
()
sequence_string
=
self
.
stabilise_accounting
+
"""
sequence_string
=
self
.
stabilise_accounting
+
"""
LoginTestVifibCustomer
Slap
LoginTestVifibCustomer
CustomerRegisterNewComputer
CustomerRegisterNewComputer
Tic
Tic
Logout
Logout
...
@@ -170,7 +170,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
...
@@ -170,7 +170,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
self
.
computer_partition_amount
=
3
self
.
computer_partition_amount
=
3
sequence_list
=
SequenceList
()
sequence_list
=
SequenceList
()
sequence_string
=
self
.
stabilise_accounting
+
"""
sequence_string
=
self
.
stabilise_accounting
+
"""
LoginTestVifibCustomer
Slap
LoginTestVifibCustomer
CustomerRegisterNewComputer
CustomerRegisterNewComputer
Tic
Tic
Logout
Logout
...
@@ -273,7 +273,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
...
@@ -273,7 +273,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
self
.
computer_partition_amount
=
2
self
.
computer_partition_amount
=
2
sequence_list
=
SequenceList
()
sequence_list
=
SequenceList
()
sequence_string
=
self
.
stabilise_accounting
+
"""
sequence_string
=
self
.
stabilise_accounting
+
"""
LoginTestVifibCustomer
Slap
LoginTestVifibCustomer
CustomerRegisterNewComputer
CustomerRegisterNewComputer
Tic
Tic
Logout
Logout
...
@@ -345,7 +345,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
...
@@ -345,7 +345,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
to anybody"""
to anybody"""
sequence_list
=
SequenceList
()
sequence_list
=
SequenceList
()
sequence_string
=
self
.
stabilise_accounting
+
"""
sequence_string
=
self
.
stabilise_accounting
+
"""
LoginTestVifibCustomer
Slap
LoginTestVifibCustomer
CustomerRegisterNewComputer
CustomerRegisterNewComputer
Tic
Tic
Logout
Logout
...
@@ -395,7 +395,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
...
@@ -395,7 +395,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
"""Check that computer's allocation scope is not set it is unavailable"""
"""Check that computer's allocation scope is not set it is unavailable"""
sequence_list
=
SequenceList
()
sequence_list
=
SequenceList
()
sequence_string
=
self
.
stabilise_accounting
+
"""
sequence_string
=
self
.
stabilise_accounting
+
"""
LoginTestVifibCustomer
Slap
LoginTestVifibCustomer
CustomerRegisterNewComputer
CustomerRegisterNewComputer
Tic
Tic
Logout
Logout
...
@@ -442,7 +442,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
...
@@ -442,7 +442,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
sequence_list
.
play
(
self
)
sequence_list
.
play
(
self
)
prepare_open_public_computer
=
TestVifibSlapWebServiceMixin
.
stabilise_accounting
+
"""
prepare_open_public_computer
=
TestVifibSlapWebServiceMixin
.
stabilise_accounting
+
"""
LoginTestVifibCustomer
Slap
LoginTestVifibCustomer
CustomerRegisterNewComputer
CustomerRegisterNewComputer
Tic
Tic
Logout
Logout
...
@@ -766,7 +766,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
...
@@ -766,7 +766,7 @@ class TestVifibSlapAllocationScope(TestVifibSlapWebServiceMixin):
self
.
computer_partition_amount
=
2
self
.
computer_partition_amount
=
2
sequence_list
=
SequenceList
()
sequence_list
=
SequenceList
()
sequence_string
=
self
.
stabilise_accounting
+
"""
sequence_string
=
self
.
stabilise_accounting
+
"""
LoginTestVifibCustomer
Slap
LoginTestVifibCustomer
CustomerRegisterNewComputer
CustomerRegisterNewComputer
Tic
Tic
Logout
Logout
...
...
master/product/Vifib/tests/testVifibSlapBang.py
View file @
12341a40
...
@@ -465,9 +465,11 @@ class TestVifibSlapBang(TestVifibSlapWebServiceMixin):
...
@@ -465,9 +465,11 @@ class TestVifibSlapBang(TestVifibSlapWebServiceMixin):
sequence_string
=
self
.
prepare_published_software_release
+
\
sequence_string
=
self
.
prepare_published_software_release
+
\
"""
"""
# prepare first computer
# prepare first computer
LoginTestVifibCustomer
Slap
LoginTestVifibCustomer
CustomerRegisterNewComputer
CustomerRegisterNewComputer
Tic
Tic
SlapLogout
LoginTestVifibCustomer
SetComputerCoordinatesFromComputerTitle
SetComputerCoordinatesFromComputerTitle
StoreComputerCoordinatesAsC1
StoreComputerCoordinatesAsC1
ComputerSetAllocationScopeOpenPersonal
ComputerSetAllocationScopeOpenPersonal
...
@@ -488,9 +490,11 @@ class TestVifibSlapBang(TestVifibSlapWebServiceMixin):
...
@@ -488,9 +490,11 @@ class TestVifibSlapBang(TestVifibSlapWebServiceMixin):
SlapLogout
SlapLogout
# prepare second computer
# prepare second computer
LoginTestVifibCustomer
Slap
LoginTestVifibCustomer
CustomerRegisterNewComputer
CustomerRegisterNewComputer
Tic
Tic
SlapLogout
LoginTestVifibCustomer
SetComputerCoordinatesFromComputerTitle
SetComputerCoordinatesFromComputerTitle
StoreComputerCoordinatesAsC0
StoreComputerCoordinatesAsC0
ComputerSetAllocationScopeOpenPersonal
ComputerSetAllocationScopeOpenPersonal
...
...
master/product/Vifib/tests/testVifibSlapBug.py
View file @
12341a40
...
@@ -213,9 +213,11 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
...
@@ -213,9 +213,11 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
Logout
Logout
# Create first computer
# Create first computer
LoginTestVifibAdmin
Slap
LoginTestVifibAdmin
CustomerRegisterNewComputer
CustomerRegisterNewComputer
Tic
Tic
SlapLogout
LoginTestVifibAdmin
SetComputerCoordinatesFromComputerTitle
SetComputerCoordinatesFromComputerTitle
ComputerSetAllocationScopeOpenPublic
ComputerSetAllocationScopeOpenPublic
Tic
Tic
...
@@ -311,9 +313,11 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
...
@@ -311,9 +313,11 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
# Now prepare second computer
# Now prepare second computer
LoginTestVifibAdmin
Slap
LoginTestVifibAdmin
CustomerRegisterNewComputer
CustomerRegisterNewComputer
Tic
Tic
SlapLogout
LoginTestVifibAdmin
SetComputerCoordinatesFromComputerTitle
SetComputerCoordinatesFromComputerTitle
ComputerSetAllocationScopeOpenPublic
ComputerSetAllocationScopeOpenPublic
Tic
Tic
...
@@ -534,9 +538,11 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
...
@@ -534,9 +538,11 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
Logout
Logout
# Create first computer
# Create first computer
LoginTestVifibAdmin
Slap
LoginTestVifibAdmin
CustomerRegisterNewComputer
CustomerRegisterNewComputer
Tic
Tic
SlapLogout
LoginTestVifibAdmin
SetComputerCoordinatesFromComputerTitle
SetComputerCoordinatesFromComputerTitle
ComputerSetAllocationScopeOpenPublic
ComputerSetAllocationScopeOpenPublic
Tic
Tic
...
@@ -653,9 +659,11 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
...
@@ -653,9 +659,11 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
Logout
Logout
# Create the computer
# Create the computer
LoginTestVifibAdmin
Slap
LoginTestVifibAdmin
CustomerRegisterNewComputer
CustomerRegisterNewComputer
Tic
Tic
SlapLogout
LoginTestVifibAdmin
SetComputerCoordinatesFromComputerTitle
SetComputerCoordinatesFromComputerTitle
ComputerSetAllocationScopeOpenPublic
ComputerSetAllocationScopeOpenPublic
Tic
Tic
...
@@ -818,9 +826,11 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
...
@@ -818,9 +826,11 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
Logout
Logout
# Create the computer
# Create the computer
LoginTestVifibAdmin
Slap
LoginTestVifibAdmin
CustomerRegisterNewComputer
CustomerRegisterNewComputer
Tic
Tic
SlapLogout
LoginTestVifibAdmin
SetComputerCoordinatesFromComputerTitle
SetComputerCoordinatesFromComputerTitle
ComputerSetAllocationScopeOpenPublic
ComputerSetAllocationScopeOpenPublic
Tic
Tic
...
@@ -990,9 +1000,11 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
...
@@ -990,9 +1000,11 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
Logout
Logout
# Create the computer
# Create the computer
LoginTestVifibAdmin
Slap
LoginTestVifibAdmin
CustomerRegisterNewComputer
CustomerRegisterNewComputer
Tic
Tic
SlapLogout
LoginTestVifibAdmin
SetComputerCoordinatesFromComputerTitle
SetComputerCoordinatesFromComputerTitle
ComputerSetAllocationScopeOpenPublic
ComputerSetAllocationScopeOpenPublic
Tic
Tic
...
@@ -1540,9 +1552,11 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
...
@@ -1540,9 +1552,11 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
"""
+
self
.
stabilise_accounting
+
"""
"""
+
self
.
stabilise_accounting
+
"""
LoginWebUser
Slap
LoginWebUser
CustomerRegisterNewComputer
CustomerRegisterNewComputer
Tic
Tic
SlapLogout
LoginWebUser
SetComputerCoordinatesFromComputerTitle
SetComputerCoordinatesFromComputerTitle
ComputerSetAllocationScopeOpenPersonal
ComputerSetAllocationScopeOpenPersonal
Logout
Logout
...
...
master/product/Vifib/tests/testVifibSlapComputerPartitionConnection.py
View file @
12341a40
...
@@ -25,20 +25,7 @@ class TestVifibSlapComputerPartitionConnection(TestVifibSlapWebServiceMixin):
...
@@ -25,20 +25,7 @@ class TestVifibSlapComputerPartitionConnection(TestVifibSlapWebServiceMixin):
SetSoftwareProductToSoftwareRelease
SetSoftwareProductToSoftwareRelease
PublishByActionSoftwareRelease
PublishByActionSoftwareRelease
Logout
Logout
"""
+
self
.
prepare_formated_computer
+
"""
LoginTestVifibAdmin
CustomerRegisterNewComputer
Tic
SetComputerCoordinatesFromComputerTitle
ComputerSetAllocationScopeOpenPublic
Tic
Logout
SlapLoginCurrentComputer
FormatComputer
Tic
SlapLogout
LoginTestVifibAdmin
LoginTestVifibAdmin
RequestSoftwareInstallation
RequestSoftwareInstallation
Tic
Tic
...
...
master/product/Vifib/tests/testVifibSlapComputerPartitionError.py
View file @
12341a40
...
@@ -14,9 +14,11 @@ class TestVifibSlapComputerPartitionError(TestVifibSlapWebServiceMixin):
...
@@ -14,9 +14,11 @@ class TestVifibSlapComputerPartitionError(TestVifibSlapWebServiceMixin):
"""
"""
sequence_list
=
SequenceList
()
sequence_list
=
SequenceList
()
sequence_string
=
'
\
sequence_string
=
'
\
LoginTestVifibAdmin
\
Slap
LoginTestVifibAdmin
\
CustomerRegisterNewComputer
\
CustomerRegisterNewComputer
\
Tic
\
Tic
\
SlapLogout
\
LoginTestVifibAdmin
\
SetComputerCoordinatesFromComputerTitle
\
SetComputerCoordinatesFromComputerTitle
\
ComputerSetAllocationScopeOpenPublic
\
ComputerSetAllocationScopeOpenPublic
\
Tic
\
Tic
\
...
...
master/product/Vifib/tests/testVifibSlapRegisterComputer.py
View file @
12341a40
...
@@ -60,9 +60,11 @@ class TestVifibSlapRegisterComputer(TestVifibSlapWebServiceMixin):
...
@@ -60,9 +60,11 @@ class TestVifibSlapRegisterComputer(TestVifibSlapWebServiceMixin):
"""
"""
sequence_list
=
SequenceList
()
sequence_list
=
SequenceList
()
sequence_string
=
self
.
stabilise_accounting
+
'
\
sequence_string
=
self
.
stabilise_accounting
+
'
\
LoginTestVifibAdmin
\
Slap
LoginTestVifibAdmin
\
CustomerRegisterNewComputer
\
CustomerRegisterNewComputer
\
Tic
\
Tic
\
SlapLogout
\
SlapLoginTestVifibAdmin
\
SetComputerCoordinatesFromComputerTitle
\
SetComputerCoordinatesFromComputerTitle
\
ComputerSetAllocationScopeOpenPublic
\
ComputerSetAllocationScopeOpenPublic
\
Tic
\
Tic
\
...
@@ -84,17 +86,21 @@ class TestVifibSlapRegisterComputer(TestVifibSlapWebServiceMixin):
...
@@ -84,17 +86,21 @@ class TestVifibSlapRegisterComputer(TestVifibSlapWebServiceMixin):
"""
"""
sequence_list
=
SequenceList
()
sequence_list
=
SequenceList
()
sequence_string
=
self
.
stabilise_accounting
+
'
\
sequence_string
=
self
.
stabilise_accounting
+
'
\
LoginTestVifibAdmin
\
Slap
LoginTestVifibAdmin
\
CustomerRegisterNewComputer
\
CustomerRegisterNewComputer
\
Tic
\
Tic
\
SlapLogout
\
LoginTestVifibAdmin
\
SetComputerCoordinatesFromComputerTitle
\
SetComputerCoordinatesFromComputerTitle
\
ComputerSetAllocationScopeOpenPublic
\
ComputerSetAllocationScopeOpenPublic
\
Tic
\
Tic
\
Logout
\
Logout
\
\
\
LoginTestVifibAdmin
\
Slap
LoginTestVifibAdmin
\
CustomerRegisterNewComputer
\
CustomerRegisterNewComputer
\
Tic
\
Tic
\
SlapLogout
\
LoginTestVifibAdmin
\
SetComputerCoordinatesFromComputerTitle
\
SetComputerCoordinatesFromComputerTitle
\
ComputerSetAllocationScopeOpenPublic
\
ComputerSetAllocationScopeOpenPublic
\
Tic
\
Tic
\
...
...
master/product/Vifib/tests/testVifibSlapRegisterSoftwareRelease.py
View file @
12341a40
...
@@ -14,9 +14,11 @@ class TestVifibSlapRegisterSoftwareRelease(TestVifibSlapWebServiceMixin):
...
@@ -14,9 +14,11 @@ class TestVifibSlapRegisterSoftwareRelease(TestVifibSlapWebServiceMixin):
"""
"""
sequence_list
=
SequenceList
()
sequence_list
=
SequenceList
()
sequence_string
=
self
.
prepare_computer
+
'
\
sequence_string
=
self
.
prepare_computer
+
'
\
LoginTestVifibAdmin
\
Slap
LoginTestVifibAdmin
\
CustomerRegisterNewComputer
\
CustomerRegisterNewComputer
\
Tic
\
Tic
\
SlapLogout
\
LoginTestVifibAdmin
\
SetComputerCoordinatesFromComputerTitle
\
SetComputerCoordinatesFromComputerTitle
\
ComputerSetAllocationScopeOpenPublic
\
ComputerSetAllocationScopeOpenPublic
\
Tic
\
Tic
\
...
...
master/product/Vifib/tests/testVifibSlapWebService.py
View file @
12341a40
...
@@ -667,14 +667,10 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
...
@@ -667,14 +667,10 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
)
)
def
stepCustomerRegisterNewComputer
(
self
,
sequence
,
**
kw
):
def
stepCustomerRegisterNewComputer
(
self
,
sequence
,
**
kw
):
self
.
slap
=
slap
.
slap
()
self
.
slap
.
initializeConnection
(
self
.
server_url
,
timeout
=
None
)
sequence
[
'computer_title'
]
=
str
(
random
())
sequence
[
'computer_title'
]
=
str
(
random
())
request
=
self
.
app
.
REQUEST
self
.
slap
.
requestComputer
(
sequence
[
'computer_title'
])
self
.
getPortal
().
portal_skins
.
changeSkin
(
"Hosting"
)
request
.
set
(
'portal_skin'
,
"Hosting"
)
self
.
portal
.
web_site_module
.
hosting
.
WebSection_registerNewComputer
(
title
=
sequence
[
'computer_title'
])
self
.
getPortal
().
portal_skins
.
changeSkin
(
"View"
)
request
.
set
(
'portal_skin'
,
"View"
)
def
stepSetComputerCoordinatesFromComputerTitle
(
self
,
sequence
,
**
kw
):
def
stepSetComputerCoordinatesFromComputerTitle
(
self
,
sequence
,
**
kw
):
computer
=
self
.
portal
.
portal_catalog
.
getResultValue
(
computer
=
self
.
portal
.
portal_catalog
.
getResultValue
(
...
@@ -920,9 +916,11 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
...
@@ -920,9 +916,11 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
"""
"""
prepare_computer
=
stabilise_accounting
+
"""
prepare_computer
=
stabilise_accounting
+
"""
LoginTestVifibAdmin
Slap
LoginTestVifibAdmin
CustomerRegisterNewComputer
CustomerRegisterNewComputer
CleanTic
CleanTic
SlapLogout
LoginTestVifibAdmin
SetComputerCoordinatesFromComputerTitle
SetComputerCoordinatesFromComputerTitle
ComputerSetAllocationScopeOpenPublic
ComputerSetAllocationScopeOpenPublic
CleanTic
CleanTic
...
@@ -1140,9 +1138,11 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
...
@@ -1140,9 +1138,11 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
prepare_another_computer_sequence_string
=
"""
prepare_another_computer_sequence_string
=
"""
StoreComputerReference
StoreComputerReference
LoginTestVifibAdmin
Slap
LoginTestVifibAdmin
CustomerRegisterNewComputer
CustomerRegisterNewComputer
Tic
Tic
SlapLogout
LoginTestVifibAdmin
SetComputerCoordinatesFromComputerTitle
SetComputerCoordinatesFromComputerTitle
ComputerSetAllocationScopeOpenPublic
ComputerSetAllocationScopeOpenPublic
Tic
Tic
...
...
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