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
alecs_myu
erp5
Commits
cb167dee
Commit
cb167dee
authored
Jul 18, 2013
by
Benjamin Blanc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
testnode: SlapOSMasterCommunicator: add logs
parent
98a6e3ab
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
4 deletions
+10
-4
erp5/util/testnode/ScalabilityTestRunner.py
erp5/util/testnode/ScalabilityTestRunner.py
+5
-2
erp5/util/testnode/SlapOSMasterCommunicator.py
erp5/util/testnode/SlapOSMasterCommunicator.py
+5
-2
No files found.
erp5/util/testnode/ScalabilityTestRunner.py
View file @
cb167dee
...
...
@@ -61,8 +61,11 @@ class ScalabilityTestRunner():
certificate
=
self
.
testnode
.
test_suite_portal
.
getSlaposAccountCertificate
()
self
.
slapos_controler
.
createSlaposConfigurationFileAccount
(
key
,
certificate
,
self
.
testnode
.
config
)
self
.
slapos_communicator
=
SlapOSMasterCommunicator
.
SlapOSMasterCommunicator
(
key
,
certificate
,
'https://rest.slapos.org/Base_getHateoasMaster'
)
self
.
slapos_communicator
=
SlapOSMasterCommunicator
.
SlapOSMasterCommunicator
(
key
,
certificate
,
self
.
log
,
url
=
'https://rest.slapos.org/Base_getHateoasMaster'
)
self
.
remaining_software_installation_dict
=
{}
# Protection to prevent installation of softwares after checking
...
...
erp5/util/testnode/SlapOSMasterCommunicator.py
View file @
cb167dee
...
...
@@ -27,11 +27,12 @@ class SlapOSMasterCommunicator(object):
print news['news']
"""
def
__init__
(
self
,
certificate_path
,
key_path
,
def
__init__
(
self
,
certificate_path
,
key_path
,
log
,
url
=
'https://rest.slapos.org/Base_getHateoasMaster'
):
# Create connection
api_scheme
,
api_netloc
,
api_path
,
api_query
,
api_fragment
=
urlparse
.
urlsplit
(
url
)
self
.
log
=
log
self
.
log
(
"HTTPS Connection with: %s, cert=%s, key=%s"
%
(
api_netloc
,
key_path
,
certificate_path
))
self
.
connection
=
httplib
.
HTTPSConnection
(
api_netloc
,
key_file
=
key_path
,
cert_file
=
certificate_path
)
# Get master
master_link
=
{
'href'
:
api_path
,
'type'
:
"application/vnd.slapos.org.hal+json; class=slapos.org.master"
}
...
...
@@ -46,6 +47,8 @@ class SlapOSMasterCommunicator(object):
# has been visited)
self
.
hosting_subcriptions_dict
=
{}
self
.
visited_hosting_subcriptions_link_list
=
[]
self
.
log
(
"SlapOSMasterCommunicator will read all hosting subscriptions entries, "
"it may take several time..."
)
self
.
_update_hosting_subscription_informations
()
def
_curl
(
self
,
link
):
...
...
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