Skip to content

Commit 526edbb

Browse files
authored
[change] Removed deprecated API url #101
Closes #101
1 parent c275a5a commit 526edbb

3 files changed

Lines changed: 0 additions & 35 deletions

File tree

openwisp_network_topology/api/views.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -141,16 +141,6 @@ def post(self, request, pk, format=None):
141141
) % (topology.get_parser_display(), e.__class__.__name__, e)
142142
return Response({'detail': error}, status=400)
143143
success_message = _('data received successfully')
144-
deprecated_url = reverse('receive_topology_deprecated', args=[pk])
145-
if request.path == deprecated_url:
146-
expected_path = reverse('receive_topology', args=[pk])
147-
expected_path = f'{expected_path}?key={key}'
148-
warning = _(
149-
'This URL is depercated and will be removed in '
150-
f'future versions, use {expected_path}'
151-
)
152-
logger.warning(warning)
153-
success_message = f'{success_message}. {warning}'
154144
return Response({'detail': success_message})
155145

156146

openwisp_network_topology/tests/test_api.py

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -105,26 +105,6 @@ def test_receive(self):
105105
self.assertEqual(self.node_model.objects.count(), 2)
106106
self.assertEqual(self.link_model.objects.count(), 1)
107107

108-
def test_receive_with_deprecated_url(self):
109-
self._set_receive()
110-
self.node_model.objects.all().delete()
111-
data = self._load('static/netjson-1-link.json')
112-
t = self.topology_model.objects.first()
113-
path = reverse('receive_topology_deprecated', args=[t.pk])
114-
path = f'{path}?key=test'
115-
response = self.client.post(path, data=data, content_type='text/plain')
116-
self.assertEqual(response.status_code, 200)
117-
expected_path = reverse('receive_topology', args=[t.pk])
118-
expected_path = f'{expected_path}?key=test'
119-
message = (
120-
'data received successfully. '
121-
'This URL is depercated and will be removed in '
122-
f'future versions, use {expected_path}'
123-
)
124-
self.assertEqual(response.data['detail'], message)
125-
self.assertEqual(self.node_model.objects.count(), 2)
126-
self.assertEqual(self.link_model.objects.count(), 1)
127-
128108
def test_receive_404(self):
129109
# topology is set to FETCH strategy
130110
response = self.client.post(self.receive_url, content_type='text/plain')

openwisp_network_topology/utils.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,6 @@ def get_api_urls(views_module):
4444
views_module.network_graph_history,
4545
name='network_graph_history',
4646
),
47-
url(
48-
r'^receive/(?P<pk>[^/\?]+)/$',
49-
views_module.receive_topology,
50-
name='receive_topology_deprecated',
51-
),
5247
url(
5348
r'^topology/(?P<pk>[^/\?]+)/receive/$',
5449
views_module.receive_topology,

0 commit comments

Comments
 (0)