Commit 12341a40 authored by Łukasz Nowak's avatar Łukasz Nowak

Switch to SlapTool way of computer creation.

parent 6cbe82e0
...@@ -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 SlapLoginTestVifibCustomer
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 SlapLoginTestVifibCustomer
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 SlapLoginTestVifibCustomer
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 SlapLoginTestVifibCustomer
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 SlapLoginTestVifibCustomer
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 SlapLoginTestVifibCustomer
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 SlapLoginTestVifibCustomer
CustomerRegisterNewComputer CustomerRegisterNewComputer
Tic Tic
Logout Logout
......
...@@ -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 SlapLoginTestVifibCustomer
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 SlapLoginTestVifibCustomer
CustomerRegisterNewComputer CustomerRegisterNewComputer
Tic Tic
SlapLogout
LoginTestVifibCustomer
SetComputerCoordinatesFromComputerTitle SetComputerCoordinatesFromComputerTitle
StoreComputerCoordinatesAsC0 StoreComputerCoordinatesAsC0
ComputerSetAllocationScopeOpenPersonal ComputerSetAllocationScopeOpenPersonal
......
...@@ -213,9 +213,11 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin): ...@@ -213,9 +213,11 @@ class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
Logout Logout
# Create first computer # Create first computer
LoginTestVifibAdmin SlapLoginTestVifibAdmin
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 SlapLoginTestVifibAdmin
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 SlapLoginTestVifibAdmin
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 SlapLoginTestVifibAdmin
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 SlapLoginTestVifibAdmin
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 SlapLoginTestVifibAdmin
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 SlapLoginWebUser
CustomerRegisterNewComputer CustomerRegisterNewComputer
Tic Tic
SlapLogout
LoginWebUser
SetComputerCoordinatesFromComputerTitle SetComputerCoordinatesFromComputerTitle
ComputerSetAllocationScopeOpenPersonal ComputerSetAllocationScopeOpenPersonal
Logout Logout
......
...@@ -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
......
...@@ -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 \ SlapLoginTestVifibAdmin \
CustomerRegisterNewComputer \ CustomerRegisterNewComputer \
Tic \ Tic \
SlapLogout \
LoginTestVifibAdmin \
SetComputerCoordinatesFromComputerTitle \ SetComputerCoordinatesFromComputerTitle \
ComputerSetAllocationScopeOpenPublic \ ComputerSetAllocationScopeOpenPublic \
Tic \ Tic \
......
...@@ -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 \ SlapLoginTestVifibAdmin \
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 \ SlapLoginTestVifibAdmin \
CustomerRegisterNewComputer \ CustomerRegisterNewComputer \
Tic \ Tic \
SlapLogout \
LoginTestVifibAdmin \
SetComputerCoordinatesFromComputerTitle \ SetComputerCoordinatesFromComputerTitle \
ComputerSetAllocationScopeOpenPublic \ ComputerSetAllocationScopeOpenPublic \
Tic \ Tic \
Logout \ Logout \
\ \
LoginTestVifibAdmin \ SlapLoginTestVifibAdmin \
CustomerRegisterNewComputer \ CustomerRegisterNewComputer \
Tic \ Tic \
SlapLogout \
LoginTestVifibAdmin \
SetComputerCoordinatesFromComputerTitle \ SetComputerCoordinatesFromComputerTitle \
ComputerSetAllocationScopeOpenPublic \ ComputerSetAllocationScopeOpenPublic \
Tic \ Tic \
......
...@@ -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 \ SlapLoginTestVifibAdmin \
CustomerRegisterNewComputer \ CustomerRegisterNewComputer \
Tic \ Tic \
SlapLogout \
LoginTestVifibAdmin \
SetComputerCoordinatesFromComputerTitle \ SetComputerCoordinatesFromComputerTitle \
ComputerSetAllocationScopeOpenPublic \ ComputerSetAllocationScopeOpenPublic \
Tic \ Tic \
......
...@@ -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 SlapLoginTestVifibAdmin
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 SlapLoginTestVifibAdmin
CustomerRegisterNewComputer CustomerRegisterNewComputer
Tic Tic
SlapLogout
LoginTestVifibAdmin
SetComputerCoordinatesFromComputerTitle SetComputerCoordinatesFromComputerTitle
ComputerSetAllocationScopeOpenPublic ComputerSetAllocationScopeOpenPublic
Tic Tic
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment