Skip to content

Commit db36ce4

Browse files
author
denisSal
committed
Merge branch 'oikuda-master'
This pull request enables usage of different docker images instead of the default imunes/template one.
2 parents c33add8 + 4e04d53 commit db36ce4

File tree

12 files changed

+521
-417
lines changed

12 files changed

+521
-417
lines changed

config/nodecfg.tcl

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2688,6 +2688,47 @@ proc setNodeServices { node services } {
26882688
}
26892689
}
26902690

2691+
#****f* nodecfg.tcl/getNodeDockerImage
2692+
# NAME
2693+
# getNodeDockerImage -- get node docker image.
2694+
# SYNOPSIS
2695+
# set value [getNodeDockerImage $node]
2696+
# FUNCTION
2697+
# Returns node docker image setting.
2698+
# INPUTS
2699+
# * node -- node id
2700+
# RESULT
2701+
# * status -- docker image identifier
2702+
#****
2703+
proc getNodeDockerImage { node } {
2704+
upvar 0 ::cf::[set ::curcfg]::$node $node
2705+
2706+
return [lindex [lsearch -inline [set $node] "docker-image *"] 1]
2707+
}
2708+
2709+
#****f* nodecfg.tcl/setNodeDockerImage
2710+
# NAME
2711+
# setNodeDockerImage -- set node docker image.
2712+
# SYNOPSIS
2713+
# setNodeDockerImage $node $img
2714+
# FUNCTION
2715+
# Sets node docker image.
2716+
# INPUTS
2717+
# * node -- node id
2718+
# * img -- image identifier
2719+
#****
2720+
proc setNodeDockerImage { node img } {
2721+
upvar 0 ::cf::[set ::curcfg]::$node $node
2722+
2723+
set i [lsearch [set $node] "docker-image *"]
2724+
if { $i >= 0 } {
2725+
set $node [lreplace [set $node] $i $i]
2726+
}
2727+
if { $img != "" } {
2728+
lappend $node [list docker-image $img]
2729+
}
2730+
}
2731+
26912732
#****f* nodecfg.tcl/getNodeDockerAttach
26922733
# NAME
26932734
# getNodeDockerAttach -- get node docker ext ifc attach.

gui/debug.tcl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,6 @@ proc registerModule { module } {
104104
}
105105
}
106106

107-
proc allSnapshotsAvailable {} {
108-
return 1
109-
}
110-
111107
proc logCaller {} {
112108
set r [catch {info level [expr [info level] - 1]} e]
113109
set r2 [catch {info level [expr [info level] - 2]} e2]

gui/mouse.tcl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1336,8 +1336,8 @@ proc button1-release { c x y } {
13361336
# if there is an object beneath the cursor and an object was
13371337
# selected by the button1 procedure create a link between nodes
13381338
if {$destobj != "" && $curobj != "" && $destobj != $curobj} {
1339-
set lnode1 [lindex [$c gettags $curobj] 1]
1340-
set lnode2 [lindex [$c gettags $destobj] 1]
1339+
set lnode1 [lindex [$c gettags $destobj] 1]
1340+
set lnode2 [lindex [$c gettags $curobj] 1]
13411341
if { [ifcByLogicalPeer $lnode1 $lnode2] == "" } {
13421342
set link [newLink $lnode1 $lnode2]
13431343
if { $link != "" } {

0 commit comments

Comments
 (0)