From 15f4971bde94c58b6088c8361767fc3bd3f473d3 Mon Sep 17 00:00:00 2001
From: Sebastian Lohff <seba@someserver.de>
Date: Sun, 7 Jun 2020 02:19:50 +0200
Subject: [PATCH] Move API from /map/api/ to /api/v1/

---
 bgpdata/api_urls.py                | 21 +++++++++++++++++++++
 bgpdata/templates/bgpdata/map.html |  4 ++--
 bgpdata/urls.py                    | 18 +-----------------
 dnmapper/urls.py                   |  3 +++
 4 files changed, 27 insertions(+), 19 deletions(-)
 create mode 100644 bgpdata/api_urls.py

diff --git a/bgpdata/api_urls.py b/bgpdata/api_urls.py
new file mode 100644
index 0000000..f70ea48
--- /dev/null
+++ b/bgpdata/api_urls.py
@@ -0,0 +1,21 @@
+# This file is part of dnmapper, an AS--level mapping tool
+# Licensed under GNU General Public License v3 or later
+# Written by Sebastian Lohff (seba@someserver.de)
+from django.conf.urls import url, include
+
+from bgpdata.api import ASResource, CrawlResource, CrawlGraphResource, BorderRouterResource, AnnouncementResource
+
+asResource = ASResource()
+crawlResource = CrawlResource()
+crawlGraphResource = CrawlGraphResource()
+borderRouterResource = BorderRouterResource()
+announcementResource = AnnouncementResource()
+
+
+urlpatterns = (
+    url('', include(asResource.urls)),
+    url('', include(crawlResource.urls)),
+    url('', include(crawlGraphResource.urls)),
+    url('', include(borderRouterResource.urls)),
+    url('', include(announcementResource.urls)),
+)
diff --git a/bgpdata/templates/bgpdata/map.html b/bgpdata/templates/bgpdata/map.html
index ee5bfe9..0bb48f0 100644
--- a/bgpdata/templates/bgpdata/map.html
+++ b/bgpdata/templates/bgpdata/map.html
@@ -238,12 +238,12 @@ function click(d) {
 			//});
 
 			if(d.crawled) {
-				$.ajax({url: "/map/api/borderrouter/?AS__crawl={{crawl.pk}}&AS__number=" + d.asnumber, success: function(result) {
+				$.ajax({url: "/api/v1/borderrouter/?AS__crawl={{crawl.pk}}&AS__number=" + d.asnumber, success: function(result) {
 					$("#infowin").html('');
 					$("#infowin").fadeIn('fast', function() {});
 					for(var i=0; i<result.objects.length; i++) {
 						(function(currRouter) {
-							$.ajax({url:"/map/api/announcement/?router="+currRouter.id, success: function(result2) {
+							$.ajax({url:"/api/v1/announcement/?router="+currRouter.id, success: function(result2) {
 								astable  = 'Table for AS'+d.asnumber+' router ID ' + currRouter.routerID;
 								astable += '<table class="table table-bordered">';
 								astable += '<tr><th>Network</th><th>Next Hop</th><th>AS Path</th></tr>';
diff --git a/bgpdata/urls.py b/bgpdata/urls.py
index 6cdd44d..7301c54 100644
--- a/bgpdata/urls.py
+++ b/bgpdata/urls.py
@@ -1,28 +1,12 @@
 # This file is part of dnmapper, an AS--level mapping tool
 # Licensed under GNU General Public License v3 or later
 # Written by Sebastian Lohff (seba@someserver.de)
+from django.conf.urls import url
 
-from django.conf.urls import url, include
-
-from bgpdata.api import ASResource, CrawlResource, CrawlGraphResource, BorderRouterResource, AnnouncementResource
 from bgpdata import views as bgpdata_views
 
-asResource = ASResource()
-crawlResource = CrawlResource()
-crawlGraphResource = CrawlGraphResource()
-borderRouterResource = BorderRouterResource()
-announcementResource = AnnouncementResource()
-
 urlpatterns = (
     url(r'^$', bgpdata_views.overview),
     url(r'^([0-9]+)/$', bgpdata_views.showMap),
     url(r'^new/([0-9]+|live)/$', bgpdata_views.show_new_map),
-
-    # url(r'^api/crawl/(?P<crawlID>\d+)/asses/$', 'bgpdata.api.asses'),
-    # (r'^api/', include(asResource.urls)),
-    url(r'^api/', include(asResource.urls)),
-    url(r'^api/', include(crawlResource.urls)),
-    url(r'^api/', include(crawlGraphResource.urls)),
-    url(r'^api/', include(borderRouterResource.urls)),
-    url(r'^api/', include(announcementResource.urls)),
 )
diff --git a/dnmapper/urls.py b/dnmapper/urls.py
index 40d40cc..a3ad53c 100644
--- a/dnmapper/urls.py
+++ b/dnmapper/urls.py
@@ -5,7 +5,9 @@
 from django.conf.urls import include, url
 from django.contrib import admin
 from django.views.generic import RedirectView
+
 import bgpdata.urls
+import bgpdata.api_urls
 
 urlpatterns = (
     # Examples:
@@ -13,6 +15,7 @@ urlpatterns = (
     # url(r'^blog/', include('blog.urls')),
     url(r'^$', RedirectView.as_view(url='/map/')),
     url(r'^map/', include(bgpdata.urls)),
+    url(r'^api/v1/', include(bgpdata.api_urls)),
 
     url(r'^admin/', admin.site.urls),
 )