Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
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
Xavier Thompson
erp5
Commits
cddaf0f7
Commit
cddaf0f7
authored
Aug 28, 2017
by
Roque
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Progress on connecting to Slapos master.
parent
c8d33446
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
13 deletions
+35
-13
erp5/util/testnode/ScalabilityTestRunner.py
erp5/util/testnode/ScalabilityTestRunner.py
+33
-11
erp5/util/testnode/SlapOSMasterCommunicator.py
erp5/util/testnode/SlapOSMasterCommunicator.py
+2
-2
No files found.
erp5/util/testnode/ScalabilityTestRunner.py
View file @
cddaf0f7
...
@@ -109,6 +109,7 @@ class ScalabilityTestRunner():
...
@@ -109,6 +109,7 @@ class ScalabilityTestRunner():
#self.slapos_controler.supply(software_path, computer_guid)
#self.slapos_controler.supply(software_path, computer_guid)
#self.slapos_communicator._supply("available")
#self.slapos_communicator._supply("available")
self
.
slapos_communicator
.
_supply
(
"started"
)
# Here make a request via slapos controler ?
# Here make a request via slapos controler ?
return
{
'status_code'
:
0
}
return
{
'status_code'
:
0
}
else
:
else
:
...
@@ -164,7 +165,11 @@ class ScalabilityTestRunner():
...
@@ -164,7 +165,11 @@ class ScalabilityTestRunner():
self
.
slapos_communicator
.
setName
(
instance_title
)
self
.
slapos_communicator
.
setName
(
instance_title
)
self
.
slapos_communicator
.
setRequestParameters
(
request_kw
)
self
.
slapos_communicator
.
setRequestParameters
(
request_kw
)
# ROQUE: request commented because it's failing. Instance manually requested.
# ROQUE: request commented because it's failing. Instance manually requested.
#self.slapos_communicator._request("started")
comp_partition
=
self
.
slapos_communicator
.
_request
(
"started"
)
self
.
log
(
"Requested computer partition: "
)
self
.
log
(
str
(
comp_partition
))
self
.
log
(
"Computer partition certificate:"
)
self
.
log
(
str
(
comp_partition
.
getCertificate
()))
# ROQUE: harcoded state (that should happens in the ._request )
# ROQUE: harcoded state (that should happens in the ._request )
self
.
slapos_communicator
.
forceSetState
(
'started'
)
self
.
slapos_communicator
.
forceSetState
(
'started'
)
self
.
authorize_request
=
False
self
.
authorize_request
=
False
...
@@ -209,7 +214,9 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
...
@@ -209,7 +214,9 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
"""
"""
# TODO : implement -> communication with SlapOS master
# TODO : implement -> communication with SlapOS master
# this simulate a SlapOS answer
# this simulate a SlapOS answer
return
self
.
simulateSlapOSAnswer
()
#return self.simulateSlapOSAnswer()
self
.
log
(
"Current software state: "
+
str
(
self
.
slapos_communicator
.
_getSoftwareState
()))
return
self
.
slapos_communicator
.
_getSoftwareState
()
==
SlapOSMasterCommunicator
.
SOFTWARE_STATE_INSTALLED
def
remainSoftwareToInstall
(
self
):
def
remainSoftwareToInstall
(
self
):
"""
"""
...
@@ -238,6 +245,7 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
...
@@ -238,6 +245,7 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
"""
"""
Wait for 'max_time' an instance specific state
Wait for 'max_time' an instance specific state
"""
"""
# ROQUE: hardcoded max_time because instance installation fails
max_time
=
20
max_time
=
20
self
.
log
(
"Wait for instance state: %s"
%
state
)
self
.
log
(
"Wait for instance state: %s"
%
state
)
start_time
=
time
.
time
()
start_time
=
time
.
time
()
...
@@ -252,7 +260,8 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
...
@@ -252,7 +260,8 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
self
.
log
(
"Do you use instance state propagation in your project?"
)
self
.
log
(
"Do you use instance state propagation in your project?"
)
self
.
log
(
"Instance '%s' will be stopped and test avorted."
%
instance_title
)
self
.
log
(
"Instance '%s' will be stopped and test avorted."
%
instance_title
)
# What if we wanted to stop ?
# What if we wanted to stop ?
self
.
slapos_controler
.
stopInstance
(
instance_title
)
#self.slapos_controler.stopInstance(instance_title)
self
.
slapos_communicator
.
_request
(
'stopped'
)
# XXX: _waitInstance call here ? recursive call ?
# XXX: _waitInstance call here ? recursive call ?
# XXX: sleep 60 seconds.
# XXX: sleep 60 seconds.
time
.
sleep
(
60
)
time
.
sleep
(
60
)
...
@@ -353,12 +362,15 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
...
@@ -353,12 +362,15 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
self
.
launcher_nodes_computer_guid
=
test_configuration
[
'launcher_nodes_computer_guid'
]
self
.
launcher_nodes_computer_guid
=
test_configuration
[
'launcher_nodes_computer_guid'
]
# Create an obfuscated link to the testsuite directory
# Create an obfuscated link to the testsuite directory
self
.
log
(
"### Creating an obfuscated link to the testsuite directory"
)
path_to_suite
=
os
.
path
.
join
(
path_to_suite
=
os
.
path
.
join
(
self
.
testnode
.
config
[
'working_directory'
],
self
.
testnode
.
config
[
'working_directory'
],
node_test_suite
.
reference
)
node_test_suite
.
reference
)
self
.
log
(
"Path to suite: "
+
path_to_suite
)
self
.
obfuscated_link_path
=
os
.
path
.
join
(
self
.
obfuscated_link_path
=
os
.
path
.
join
(
self
.
testnode
.
config
[
'software_directory'
],
self
.
testnode
.
config
[
'software_directory'
],
self
.
randomized_path
)
self
.
randomized_path
)
self
.
log
(
"Obfuscated path: "
+
self
.
obfuscated_link_path
)
if
(
not
os
.
path
.
lexists
(
self
.
obfuscated_link_path
)
and
if
(
not
os
.
path
.
lexists
(
self
.
obfuscated_link_path
)
and
not
os
.
path
.
exists
(
self
.
obfuscated_link_path
)
)
:
not
os
.
path
.
exists
(
self
.
obfuscated_link_path
)
)
:
try
:
try
:
...
@@ -371,14 +383,18 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
...
@@ -371,14 +383,18 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
self
.
log
(
"Sym link : %s %s"
%
(
path_to_suite
,
self
.
obfuscated_link_path
))
self
.
log
(
"Sym link : %s %s"
%
(
path_to_suite
,
self
.
obfuscated_link_path
))
# Construct the ipv6 obfuscated url of the software profile reachable from outside
# Construct the ipv6 obfuscated url of the software profile reachable from outside
self
.
log
(
"Constructing the ipv6 obfuscated url of the software profile reachable from outside"
)
self
.
reachable_address
=
os
.
path
.
join
(
self
.
reachable_address
=
os
.
path
.
join
(
"https://"
,
"["
+
self
.
testnode
.
config
[
'httpd_ip'
]
+
"]"
+
":"
+
self
.
testnode
.
config
[
'httpd_software_access_port'
],
"https://"
,
"["
+
self
.
testnode
.
config
[
'httpd_ip'
]
+
"]"
+
":"
+
self
.
testnode
.
config
[
'httpd_software_access_port'
],
self
.
randomized_path
)
self
.
randomized_path
)
self
.
reachable_profile
=
os
.
path
.
join
(
self
.
reachable_address
,
"software.cfg"
)
self
.
reachable_profile
=
os
.
path
.
join
(
self
.
reachable_address
,
"software.cfg"
)
self
.
log
(
"Reachable address: "
+
self
.
reachable_address
)
self
.
log
(
"Reachable profile: "
+
self
.
reachable_profile
)
# Write the reachable address in the software.cfg file,
# Write the reachable address in the software.cfg file,
# by replacing <obfuscated_url> occurences by the current reachable address.
# by replacing <obfuscated_url> occurences by the current reachable address.
software_file
=
open
(
node_test_suite
.
custom_profile_path
,
"r"
)
software_file
=
open
(
node_test_suite
.
custom_profile_path
,
"r"
)
self
.
log
(
"Writing obfuscated url in software.cfg file: "
+
node_test_suite
.
custom_profile_path
)
file_content
=
software_file
.
readlines
()
file_content
=
software_file
.
readlines
()
new_file_content
=
[]
new_file_content
=
[]
for
line
in
file_content
:
for
line
in
file_content
:
...
@@ -394,9 +410,9 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
...
@@ -394,9 +410,9 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
# Ask for SR installation
# Ask for SR installation
for
computer_guid
in
self
.
involved_nodes_computer_guid
:
for
computer_guid
in
self
.
involved_nodes_computer_guid
:
self
.
slapos_communicator
=
SlapOSMasterCommunicator
.
SoftwareReleaseTester
(
"NAME"
,
self
.
log
,
slap
,
supply
,
order
,
self
.
reachable_profile
,
computer_guid
=
computer_guid
)
self
.
slapos_communicator
=
SlapOSMasterCommunicator
.
SoftwareReleaseTester
(
"NAME"
,
self
.
log
,
slap
,
order
,
supply
,
self
.
reachable_profile
,
computer_guid
=
computer_guid
)
# ROQUE: "_prepareSlapOS" is commented because the instance request is not working (manually created for dev purposes)
# ROQUE: _prepareSlapOS commented because software installation fails.
#
self._prepareSlapOS(self.reachable_profile, computer_guid)
self
.
_prepareSlapOS
(
self
.
reachable_profile
,
computer_guid
)
# From the line below we would not supply any more softwares
# From the line below we would not supply any more softwares
self
.
authorize_supply
=
False
self
.
authorize_supply
=
False
# TODO : remove the line below wich simulate an answer from slapos master
# TODO : remove the line below wich simulate an answer from slapos master
...
@@ -420,8 +436,8 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
...
@@ -420,8 +436,8 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
try
:
try
:
# ROQUE: the instance title is harcoded because the instance request is not working (this one was manually created)
# ROQUE: the instance title is harcoded because the instance request is not working (this one was manually created)
self
.
instance_title
=
"nxdcloud-onlinenet-scalabilitynode-001-TESTINSTANCE"
self
.
instance_title
=
"nxdcloud-onlinenet-scalabilitynode-001-TESTINSTANCE"
self
.
_createInstance
(
self
.
reachable_profile
,
configuration_list
[
0
],
#
self._createInstance(self.reachable_profile, configuration_list[0],
self
.
instance_title
,
node_test_suite
.
test_result
,
node_test_suite
.
test_suite
)
#
self.instance_title, node_test_suite.test_result, node_test_suite.test_suite)
self
.
log
(
"Scalability instance requested."
)
self
.
log
(
"Scalability instance requested."
)
except
:
except
:
self
.
log
(
"Unable to launch instance"
)
self
.
log
(
"Unable to launch instance"
)
...
@@ -468,6 +484,9 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
...
@@ -468,6 +484,9 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
if
not
self
.
launchable
:
if
not
self
.
launchable
:
self
.
log
(
"Current test_suite is not actually launchable."
)
self
.
log
(
"Current test_suite is not actually launchable."
)
return
{
'status_code'
:
1
}
# Unable to continue due to not realizable configuration
return
{
'status_code'
:
1
}
# Unable to continue due to not realizable configuration
if
True
:
self
.
log
(
"FORCE EXIT WITH ERROR UNTIL SOFTWARE INSTALLATION BUG IS FIXED."
)
return
{
'status_code'
:
1
}
configuration_list
=
node_test_suite
.
configuration_list
configuration_list
=
node_test_suite
.
configuration_list
test_list
=
range
(
0
,
len
(
configuration_list
))
test_list
=
range
(
0
,
len
(
configuration_list
))
# create test_result
# create test_result
...
@@ -490,14 +509,16 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
...
@@ -490,14 +509,16 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
# First configuration doesn't need XML configuration update.
# First configuration doesn't need XML configuration update.
if
count
>
0
:
if
count
>
0
:
# Stop instance
# Stop instance
self
.
slapos_controler
.
stopInstance
(
self
.
instance_title
)
#self.slapos_controler.stopInstance(self.instance_title)
self
.
slapos_communicator
.
_request
(
'stopped'
)
self
.
_waitInstance
(
self
.
instance_title
,
'stopped'
)
self
.
_waitInstance
(
self
.
instance_title
,
'stopped'
)
# Update instance XML configuration
# Update instance XML configuration
self
.
_updateInstanceXML
(
configuration
,
self
.
instance_title
,
self
.
_updateInstanceXML
(
configuration
,
self
.
instance_title
,
node_test_suite
.
test_result
,
node_test_suite
.
test_suite
)
node_test_suite
.
test_result
,
node_test_suite
.
test_suite
)
self
.
_waitInstance
(
self
.
instance_title
,
SlapOSMasterCommunicator
.
INSTANCE_STATE_STARTED
)
self
.
_waitInstance
(
self
.
instance_title
,
SlapOSMasterCommunicator
.
INSTANCE_STATE_STARTED
)
# Start instance
# Start instance
self
.
slapos_controler
.
startInstance
(
self
.
instance_title
)
#self.slapos_controler.startInstance(self.instance_title)
self
.
slapos_communicator
.
_request
(
'started'
)
# XXX: Dirty hack used to force haproxy to restart in time
# XXX: Dirty hack used to force haproxy to restart in time
# with all zope informations.
# with all zope informations.
...
@@ -546,7 +567,8 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
...
@@ -546,7 +567,8 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
break
break
# Stop current instance
# Stop current instance
self
.
slapos_controler
.
stopInstance
(
self
.
instance_title
)
#self.slapos_controler.stopInstance(self.instance_title)
self
.
slapos_communicator
.
_request
(
'stopped'
)
self
.
_waitInstance
(
self
.
instance_title
,
'stopped'
)
self
.
_waitInstance
(
self
.
instance_title
,
'stopped'
)
# Delete old instances
# Delete old instances
...
...
erp5/util/testnode/SlapOSMasterCommunicator.py
View file @
cddaf0f7
...
@@ -105,7 +105,7 @@ class SlapOSMasterCommunicator(object):
...
@@ -105,7 +105,7 @@ class SlapOSMasterCommunicator(object):
@
retryOnNetworkFailure
@
retryOnNetworkFailure
def
_supply
(
self
,
state
):
def
_supply
(
self
,
state
):
if
self
.
computer_guid
is
None
:
if
self
.
computer_guid
is
None
:
self
.
_logger
.
log
(
'Nothing to supply for %s.'
%
(
self
.
name
))
self
.
_logger
(
'Nothing to supply for %s.'
%
(
self
.
name
))
return
None
return
None
self
.
_logger
(
"From SlapOSMasterCommunicator"
)
self
.
_logger
(
"From SlapOSMasterCommunicator"
)
self
.
_logger
(
'Supply %s@%s: %s'
,
self
.
url
,
self
.
computer_guid
,
self
.
_logger
(
'Supply %s@%s: %s'
,
self
.
url
,
self
.
computer_guid
,
...
@@ -115,7 +115,7 @@ class SlapOSMasterCommunicator(object):
...
@@ -115,7 +115,7 @@ class SlapOSMasterCommunicator(object):
@
retryOnNetworkFailure
@
retryOnNetworkFailure
def
_request
(
self
,
state
):
def
_request
(
self
,
state
):
self
.
_logger
.
info
(
'Request %s@%s: %s'
,
self
.
url
,
self
.
name
,
state
)
self
.
_logger
(
'Request %s@%s: %s'
,
self
.
url
,
self
.
name
,
state
)
self
.
latest_state
=
state
self
.
latest_state
=
state
return
self
.
slap_order
.
request
(
return
self
.
slap_order
.
request
(
software_release
=
self
.
url
,
software_release
=
self
.
url
,
...
...
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