Skip to content

Commit 67be574

Browse files
committed
Export IP Address of Dualstack-Network to netvis data.
This fixed #27
1 parent 51a3b47 commit 67be574

File tree

3 files changed

+40
-1
lines changed

3 files changed

+40
-1
lines changed

Changes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{{$NEXT}}
22

3+
- export-netvis: export Dualstack-Address of network
4+
in field Address2 of node.
5+
36
6.079 2025-03-17 12:53:54+01:00 Europe/Berlin
47

58
- If service has some owner with name "DA_*",

go/pkg/pass1/export-netvis.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ type visBase struct {
5454
Type string `json:"type"`
5555
InArea string `json:"in_area,omitempty"`
5656
Address string `json:"address,omitempty"`
57+
Address2 string `json:"address2,omitempty"`
5758
Neighbors []visNeighbor `json:"neighbors"`
5859
}
5960

@@ -98,6 +99,9 @@ func getVisNetwork(net *network, networks map[string]visNetwork) {
9899
node.Type = "network"
99100
if net.ipType != unnumberedIP {
100101
node.Address = net.ipp.String()
102+
if net2 := net.combined46; net2 != nil {
103+
node.Address2 = net2.ipp.String()
104+
}
101105
}
102106

103107
if a := net.zone.inArea; a != nil {

go/testdata/export-netvis/export.t

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,4 +297,36 @@ network:n1 = { ip = 10.1.1.0/24; }
297297
}
298298
}
299299
}
300-
=END=
300+
=END=
301+
302+
############################################################
303+
=TITLE=One Dualstack Network One Managed Router
304+
=INPUT=
305+
network:n1 = {
306+
ip = 10.1.1.0/24;
307+
ip6 = 2001:0db8:1::/64;
308+
host:h1 = { ip = 10.1.1.5; }
309+
}
310+
router:r1 = {
311+
managed;
312+
model = ASA;
313+
interface:n1 = { ip = 10.1.1.1; hardware = n1; }
314+
}
315+
=OUTPUT=
316+
{
317+
"network": {
318+
"network:n1": {
319+
"address": "10.1.1.0/24",
320+
"address2": "2001:db8:1::/64",
321+
"hosts": ["host:h1"],
322+
"id": "network:n1", "neighbors": [{"id":"router:r1","neighbor_count":1}],
323+
"type": "network"
324+
}
325+
},
326+
"router": {
327+
"router:r1": {
328+
"id":"router:r1", "neighbors": [{"id":"network:n1","neighbor_count":1}],
329+
"type": "router: standard"
330+
}
331+
}
332+
}

0 commit comments

Comments
 (0)