Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in
Toggle navigation
G
guardian
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
39
Issues
39
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Security & Compliance
Security & Compliance
Dependency List
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
CDS
guardian
Commits
87d0825d
Commit
87d0825d
authored
Feb 04, 2019
by
Jameson Rollins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WIP: system manager variable
parent
4c819122
Pipeline
#47048
passed with stages
in 39 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
3 deletions
+22
-3
lib/guardian/cas.py
lib/guardian/cas.py
+1
-1
lib/guardian/daemon.py
lib/guardian/daemon.py
+9
-2
lib/guardian/system.py
lib/guardian/system.py
+12
-0
No files found.
lib/guardian/cas.py
View file @
87d0825d
...
...
@@ -93,7 +93,7 @@ class CADriver(pcaspy.Driver):
elif
channel
==
'MODE'
:
# value as string
mode
=
guarddb
[
'MODE'
][
'enums'
][
value
]
# reject attempts to set MANAGED mode direct
r
ly without
# reject attempts to set MANAGED mode directly without
# specifying manager
if
mode
==
'MANAGED'
:
return
False
...
...
lib/guardian/daemon.py
View file @
87d0825d
...
...
@@ -97,13 +97,17 @@ class Daemon(object):
# set initial values
self
[
'TIME_INIT'
]
=
int
(
time
.
time
())
self
[
'OP'
]
=
initial_op
self
[
'MODE'
]
=
initial_mode
self
[
'LOGLEVEL'
]
=
self
.
default_loglevel
self
[
'STATE'
]
=
initial_state
or
'INIT'
self
[
'TARGET'
]
=
self
[
'STATE'
]
self
[
'REQUEST'
]
=
initial_request
or
self
.
system
.
request
or
'NONE'
self
[
'NOMINAL'
]
=
self
.
system
.
nominal
or
'NONE'
if
self
.
system
.
manager
:
self
[
'MANAGER'
]
=
self
.
system
.
manager
self
[
'MODE'
]
=
'MANAGED'
else
:
self
[
'MODE'
]
=
initial_mode
self
[
'OP'
]
=
initial_op
self
[
'SPM_MONITOR'
]
=
self
.
system
.
ca_monitor
self
[
'SPM_MONITOR_NOTIFY'
]
=
self
.
system
.
ca_monitor_notify
self
[
'STATUS'
]
=
'INIT'
...
...
@@ -334,6 +338,9 @@ guardian version: {}
if
newnom
!=
self
[
'NOMINAL'
]:
self
[
'NOMINAL'
]
=
newnom
self
.
log
.
info
(
"new nominal state:
%
s"
%
self
[
'NOMINAL'
])
if
self
.
system
.
manager
:
self
[
'MANAGER'
]
=
self
.
system
.
manager
self
[
'MODE'
]
=
'MANAGED'
if
self
.
system
.
ca_monitor
!=
self
[
'SPM_MONITOR'
]:
self
[
'SPM_MONITOR'
]
=
self
.
system
.
ca_monitor
self
.
log
.
info
(
"CA setpoint monitor:
%
s"
%
self
[
'SPM_MONITOR'
])
...
...
lib/guardian/system.py
View file @
87d0825d
...
...
@@ -128,6 +128,7 @@ class GuardSystem(object):
# reset parameters loaded from module
self
.
_initial_request
=
None
self
.
_nominal_state
=
None
self
.
_manager
=
None
self
.
_node_managers
=
{}
# don't recorgnize ca_prefix changes on reset
self
.
_ca_monitor
=
False
...
...
@@ -477,6 +478,12 @@ class GuardSystem(object):
else
:
self
.
_nominal_state
=
None
# set manager
if
hasattr
(
module
,
'_MANAGER'
):
self
.
_manager
=
module
.
_MANAGER
else
:
self
.
_manager
=
None
# add specified edges
if
hasattr
(
module
,
'edges'
):
# verify states
...
...
@@ -600,6 +607,11 @@ class GuardSystem(object):
"""Initial NOMINAL state."""
return
self
.
_nominal_state
@
property
def
manager
(
self
):
"""Initial manager."""
return
self
.
_manager
@
property
def
graph
(
self
):
"""System state graph object."""
...
...
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