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
Hamza
erp5
Commits
9d205730
Commit
9d205730
authored
Jul 18, 2013
by
Benjamin Blanc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
testnode: use hateoas_slapos_master_url parameter
parent
5b5e6b87
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
3 deletions
+4
-3
erp5/tests/testERP5TestNode.py
erp5/tests/testERP5TestNode.py
+1
-0
erp5/util/testnode/ScalabilityTestRunner.py
erp5/util/testnode/ScalabilityTestRunner.py
+1
-1
erp5/util/testnode/SlapOSMasterCommunicator.py
erp5/util/testnode/SlapOSMasterCommunicator.py
+1
-1
erp5/util/testnode/__init__.py
erp5/util/testnode/__init__.py
+1
-1
No files found.
erp5/tests/testERP5TestNode.py
View file @
9d205730
...
@@ -77,6 +77,7 @@ class ERP5TestNode(TestCase):
...
@@ -77,6 +77,7 @@ class ERP5TestNode(TestCase):
config
[
"log_directory"
]
=
self
.
log_directory
config
[
"log_directory"
]
=
self
.
log_directory
config
[
"log_file"
]
=
self
.
log_file
config
[
"log_file"
]
=
self
.
log_file
config
[
"test_suite_master_url"
]
=
None
config
[
"test_suite_master_url"
]
=
None
config
[
"hateoas_slapos_master_url"
]
=
None
config
[
"test_node_title"
]
=
"Foo-Test-Node"
config
[
"test_node_title"
]
=
"Foo-Test-Node"
config
[
"system_temp_folder"
]
=
self
.
system_temp_folder
config
[
"system_temp_folder"
]
=
self
.
system_temp_folder
config
[
"computer_id"
]
=
"COMP-TEST"
config
[
"computer_id"
]
=
"COMP-TEST"
...
...
erp5/util/testnode/ScalabilityTestRunner.py
View file @
9d205730
...
@@ -65,7 +65,7 @@ class ScalabilityTestRunner():
...
@@ -65,7 +65,7 @@ class ScalabilityTestRunner():
cert_path
,
cert_path
,
key_path
,
key_path
,
self
.
log
,
self
.
log
,
url
=
'https://rest.slapos.org/Base_getHateoasMaster'
)
self
.
testnode
.
config
[
'hateoas_slapos_master_url'
]
)
self
.
remaining_software_installation_dict
=
{}
self
.
remaining_software_installation_dict
=
{}
# Protection to prevent installation of softwares after checking
# Protection to prevent installation of softwares after checking
...
...
erp5/util/testnode/SlapOSMasterCommunicator.py
View file @
9d205730
...
@@ -28,7 +28,7 @@ class SlapOSMasterCommunicator(object):
...
@@ -28,7 +28,7 @@ class SlapOSMasterCommunicator(object):
"""
"""
def
__init__
(
self
,
certificate_path
,
key_path
,
log
,
def
__init__
(
self
,
certificate_path
,
key_path
,
log
,
url
=
'https://rest.slapos.org/Base_getHateoasMaster'
):
url
):
# Create connection
# Create connection
api_scheme
,
api_netloc
,
api_path
,
api_query
,
api_fragment
=
urlparse
.
urlsplit
(
url
)
api_scheme
,
api_netloc
,
api_path
,
api_query
,
api_fragment
=
urlparse
.
urlsplit
(
url
)
self
.
log
=
log
self
.
log
=
log
...
...
erp5/util/testnode/__init__.py
View file @
9d205730
...
@@ -78,7 +78,7 @@ def main(*args):
...
@@ -78,7 +78,7 @@ def main(*args):
'software_directory'
,
'software_directory'
,
'proxy_port'
,
'git_binary'
,
'zip_binary'
,
'node_quantity'
,
'proxy_port'
,
'git_binary'
,
'zip_binary'
,
'node_quantity'
,
'test_node_title'
,
'ipv4_address'
,
'ipv6_address'
,
'test_suite_master_url'
,
'test_node_title'
,
'ipv4_address'
,
'ipv6_address'
,
'test_suite_master_url'
,
'slapgrid_partition_binary'
,
'slapgrid_software_binary'
,
'
hateoas_slapos_master_url'
,
'
slapgrid_partition_binary'
,
'slapgrid_software_binary'
,
'slapproxy_binary'
,
'httpd_ip'
,
'httpd_port'
,
'httpd_software_access_port'
,
'slapproxy_binary'
,
'httpd_ip'
,
'httpd_port'
,
'httpd_software_access_port'
,
'computer_id'
,
'server_url'
):
'computer_id'
,
'server_url'
):
CONFIG
[
key
]
=
config
.
get
(
'testnode'
,
key
)
CONFIG
[
key
]
=
config
.
get
(
'testnode'
,
key
)
...
...
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