Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
LOFAR
Manage
Activity
Members
Labels
Plan
Issues
Wiki
Jira issues
Open Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
RadioObservatory
LOFAR
Commits
87fa0ce5
Commit
87fa0ce5
authored
9 years ago
by
Jorrit Schaap
Browse files
Options
Downloads
Patches
Plain Diff
Task #8887: use ssdb service/busname from ssdb config
parent
130aeed5
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
SAS/ResourceAssignment/ResourceAssigner/lib/raservice.py
+4
-4
4 additions, 4 deletions
SAS/ResourceAssignment/ResourceAssigner/lib/raservice.py
with
4 additions
and
4 deletions
SAS/ResourceAssignment/ResourceAssigner/lib/raservice.py
+
4
−
4
View file @
87fa0ce5
...
@@ -81,8 +81,8 @@ def main():
...
@@ -81,8 +81,8 @@ def main():
from
lofar.sas.resourceassignment.resourceassignmentservice.config
import
DEFAULT_SERVICENAME
as
RADB_SERVICENAME
from
lofar.sas.resourceassignment.resourceassignmentservice.config
import
DEFAULT_SERVICENAME
as
RADB_SERVICENAME
from
lofar.sas.resourceassignment.resourceassignmentestimator.config
import
DEFAULT_BUSNAME
as
RE_BUSNAME
from
lofar.sas.resourceassignment.resourceassignmentestimator.config
import
DEFAULT_BUSNAME
as
RE_BUSNAME
from
lofar.sas.resourceassignment.resourceassignmentestimator.config
import
DEFAULT_SERVICENAME
as
RE_SERVICENAME
from
lofar.sas.resourceassignment.resourceassignmentestimator.config
import
DEFAULT_SERVICENAME
as
RE_SERVICENAME
SSDB_BUSNAME
=
'
lofar.system
'
#TODO, import from future ssdb config
from
lofar.
sas.
system
status.service.config
import
DEFAULT_SSDB_BUSNAME
SSDB_SERVICENAME
=
'
SSDBService
'
#TODO, import from future ssdb config
from
lofar.sas.systemstatus.service.config
import
DEFAULT_SSDB_SERVICENAME
# Check the invocation arguments
# Check the invocation arguments
parser
=
OptionParser
(
"
%prog [options]
"
,
parser
=
OptionParser
(
"
%prog [options]
"
,
...
@@ -109,10 +109,10 @@ def main():
...
@@ -109,10 +109,10 @@ def main():
default
=
RE_SERVICENAME
,
default
=
RE_SERVICENAME
,
help
=
"
Name of the resource estimator service. [default: %default]
"
)
help
=
"
Name of the resource estimator service. [default: %default]
"
)
parser
.
add_option
(
"
--ssdb_busname
"
,
dest
=
"
ssdb_busname
"
,
type
=
"
string
"
,
parser
.
add_option
(
"
--ssdb_busname
"
,
dest
=
"
ssdb_busname
"
,
type
=
"
string
"
,
default
=
SSDB_BUSNAME
,
default
=
DEFAULT_
SSDB_BUSNAME
,
help
=
"
Name of the bus on which the ssdb service listens. [default: %default]
"
)
help
=
"
Name of the bus on which the ssdb service listens. [default: %default]
"
)
parser
.
add_option
(
"
--ssdb_servicename
"
,
dest
=
"
ssdb_servicename
"
,
type
=
"
string
"
,
parser
.
add_option
(
"
--ssdb_servicename
"
,
dest
=
"
ssdb_servicename
"
,
type
=
"
string
"
,
default
=
SSDB_SERVICENAME
,
default
=
DEFAULT_
SSDB_SERVICENAME
,
help
=
"
Name of the ssdb service. [default: %default]
"
)
help
=
"
Name of the ssdb service. [default: %default]
"
)
parser
.
add_option
(
'
-V
'
,
'
--verbose
'
,
dest
=
'
verbose
'
,
action
=
'
store_true
'
,
help
=
'
verbose logging
'
)
parser
.
add_option
(
'
-V
'
,
'
--verbose
'
,
dest
=
'
verbose
'
,
action
=
'
store_true
'
,
help
=
'
verbose logging
'
)
(
options
,
args
)
=
parser
.
parse_args
()
(
options
,
args
)
=
parser
.
parse_args
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment