Skip to content

Commit

Permalink
Merge branch '5.7.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
lunkwill42 committed Sep 14, 2023
2 parents 99fcbe8 + 3ecbb92 commit d66bf99
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
This changelog format was introduced in NAV 5.4.0. Older changelogs can be
found in the [HISTORY](HISTORY) file.

## Unreleased
## [5.7.0] - 2023-09-07

### Added

Expand Down
4 changes: 2 additions & 2 deletions python/nav/netmap/topology.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def build_netmap_layer2_graph(
_logger.debug("build_netmap_layer2_graph() vlan metadata for _nodes_ done")

if view:
saved_views = view.node_position_set.all()
saved_views = view.node_positions.all()
netmap_graph = _attach_node_positions(netmap_graph, saved_views)
_logger.debug("build_netmap_layer2_graph() view positions and graph done")

Expand Down Expand Up @@ -191,7 +191,7 @@ def build_netmap_layer3_graph(topology_without_metadata, load_traffic=False, vie
metadata[gwpp_u.prefix.vlan.id].append(additional_metadata)

if view:
graph = _attach_node_positions(graph, view.node_position_set.all())
graph = _attach_node_positions(graph, view.node_positions.all())
_logger.debug("build_netmap_layer3_graph() view positions and graph done")
return graph

Expand Down

0 comments on commit d66bf99

Please sign in to comment.