Skip to content

Commit 2ab2fd1

Browse files
committed
[chores] Updated to dev version of openwisp-users
1 parent 526edbb commit 2ab2fd1

3 files changed

Lines changed: 16 additions & 2 deletions

File tree

openwisp_network_topology/integrations/device/base/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def auto_create_openvpn(cls, node):
5757

5858
Device = load_model('config', 'Device')
5959
device = (
60-
Device.objects.only('id', 'name')
60+
Device.objects.only('id', 'name', 'last_ip', 'management_ip')
6161
.filter(
6262
organization_id=node.organization_id,
6363
config__vpnclient__cert__common_name=common_name,

openwisp_network_topology/integrations/device/overrides.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ def topology_get_nodes_queryset(self):
3030
'user_properties',
3131
'created',
3232
'modified',
33+
'devicenode__device__id',
3334
'devicenode__device__name',
35+
'devicenode__device__last_ip',
36+
'devicenode__device__management_ip',
3437
)
3538
)
3639

@@ -51,7 +54,11 @@ def node_get_queryset(cls, qs):
5154
'organization__is_active',
5255
'label',
5356
'addresses',
57+
'devicenode__device__id',
5458
'devicenode__device__name',
59+
'devicenode__device__name',
60+
'devicenode__device__last_ip',
61+
'devicenode__device__management_ip',
5562
)
5663
)
5764

@@ -75,10 +82,16 @@ def link_get_queryset(cls, qs):
7582
'cost_text',
7683
'source__addresses',
7784
'source__label',
85+
'source__devicenode__device__id',
7886
'source__devicenode__device__name',
87+
'source__devicenode__device__last_ip',
88+
'source__devicenode__device__management_ip',
7989
'target__addresses',
8090
'target__label',
91+
'target__devicenode__device__id',
8192
'target__devicenode__device__name',
93+
'target__devicenode__device__last_ip',
94+
'target__devicenode__device__management_ip',
8295
)
8396
)
8497

requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
openwisp-users~=0.5.1
1+
# TODO set the next point release of openwisp-users when ready
2+
openwisp-users @ https://github.com/openwisp/openwisp-users/tarball/master
23
openwisp-utils[rest]~=0.7.0
34
swapper~=1.1
45
django>=2.2,<3.2

0 commit comments

Comments
 (0)