update request url

Issue-ID: MODELING-164
Change-Id: I3cb942e4269f6bd4407864eb181cd26d3ef88d71
Signed-off-by: yangyan <yangyanyj@chinamobile.com>

diff --git a/genericparser/jobs/tests/tests.py b/genericparser/jobs/tests/tests.py
index 42231bf..60d6830 100644 (file)
--- a/genericparser/jobs/tests/tests.py
+++ b/genericparser/jobs/tests/tests.py
@@ -28,13 +28,13 @@ class JobsViewTest(TestCase):
     def test_job_normal(self):
         JobModel(jobid=self.job_id, jobtype='VNF', jobaction='INST', resid='1').save()
         JobStatusModel(indexid=1, jobid=self.job_id, status='inst', errcode='0', progress=20, descp='inst').save()
-        response = self.client.get("/api/genericparser/v1/jobs/%s" % self.job_id)
+        response = self.client.get("/api/parser/v1/jobs/%s" % self.job_id)
         self.failUnlessEqual(status.HTTP_200_OK, response.status_code)
 
     def test_job_when_jobid_not_exist(self):
         job_id = 'test_new_job_id'
         JobModel(jobid=self.job_id, jobtype='VNF', jobaction='INST', resid='1').save()
         JobStatusModel(indexid=1, jobid=self.job_id, status='inst', progress=20, descp='inst').save()
-        response = self.client.get("/api/genericparser/v1/jobs/%s" % job_id)
+        response = self.client.get("/api/parser/v1/jobs/%s" % job_id)
         self.assertIn('jobId', response.data)
         self.assertNotIn('responseDescriptor', response.data)

diff --git a/genericparser/jobs/urls.py b/genericparser/jobs/urls.py
index d484703..5cea865 100644 (file)
--- a/genericparser/jobs/urls.py
+++ b/genericparser/jobs/urls.py
@@ -16,5 +16,5 @@ from django.conf.urls import url
 from genericparser.jobs.views import JobView
 
 urlpatterns = [
-    url(r'^api/genericparser/v1/jobs/(?P<job_id>[0-9a-zA-Z_-]+)$', JobView.as_view()),
+    url(r'^api/parser/v1/jobs/(?P<job_id>[0-9a-zA-Z_-]+)$', JobView.as_view()),
 ]

diff --git a/genericparser/samples/tests.py b/genericparser/samples/tests.py
index 81ef49a..53d7a10 100644 (file)
--- a/genericparser/samples/tests.py
+++ b/genericparser/samples/tests.py
@@ -41,5 +41,5 @@ class CallbackSampleTest(unittest.TestCase):
         pass
 
     def test_callback(self):
-        response = self.client.get("/api/genericparser/v1/callback_sample")
+        response = self.client.get("/api/parser/v1/callback_sample")
         self.assertEqual(status.HTTP_204_NO_CONTENT, response.status_code, response.content)

diff --git a/genericparser/samples/urls.py b/genericparser/samples/urls.py
index bb21d5a..853a124 100644 (file)
--- a/genericparser/samples/urls.py
+++ b/genericparser/samples/urls.py
@@ -16,7 +16,7 @@ from django.conf.urls import url
 from genericparser.samples import views
 
 urlpatterns = [
-    url(r'^api/genericparser/v1/mandb/(?P<modelName>[a-zA-Z\-]+)$', views.TablesList.as_view()),
-    url(r'^api/genericparser/v1/callback_sample$', views.CallbackSample.as_view()),
+    url(r'^api/parser/v1/mandb/(?P<modelName>[a-zA-Z\-]+)$', views.TablesList.as_view()),
+    url(r'^api/parser/v1/callback_sample$', views.CallbackSample.as_view()),
     url(r'^samples/$', views.SampleList.as_view())
 ]

diff --git a/genericparser/swagger/management/commands/export_swagger.py b/genericparser/swagger/management/commands/export_swagger.py
index e732246..ed7ea58 100644 (file)
--- a/genericparser/swagger/management/commands/export_swagger.py
+++ b/genericparser/swagger/management/commands/export_swagger.py
@@ -30,7 +30,7 @@ class Command(BaseCommand):
 
     def handle(self, *args, **options):
         self.client = Client()
-        response = self.client.get("/api/genericparser/v1/swagger.json")
+        response = self.client.get("/api/parser/v1/swagger.json")
         with open(options['name'], 'w') as swagger_file:
             swagger_file.write(json.dumps(response.data))
         print "swagger api is written to %s" % options['name']

diff --git a/genericparser/swagger/tests.py b/genericparser/swagger/tests.py
index 15471a9..43ea97c 100644 (file)
--- a/genericparser/swagger/tests.py
+++ b/genericparser/swagger/tests.py
@@ -23,6 +23,6 @@ class SwaggerViewTest(unittest.TestCase):
         pass
 
     def test_swagger(self):
-        response = self.client.get("/api/genericparser/v1/swagger.json")
+        response = self.client.get("/api/parser/v1/swagger.json")
         self.assertEqual(status.HTTP_200_OK, response.status_code, response.content)
         self.assertEqual("2.0", response.data.get("swagger"))

diff --git a/genericparser/swagger/urls.py b/genericparser/swagger/urls.py
index cb8198a..2ace5ef 100644 (file)
--- a/genericparser/swagger/urls.py
+++ b/genericparser/swagger/urls.py
@@ -23,10 +23,10 @@ swagger_info = openapi.Info(
     default_version='v1',
     description="""
 
-The `swagger-ui` view can be found [here](/api/genericparser/v1/swagger).
-The `ReDoc` view can be found [here](/api/genericparser/v1/redoc).
-The swagger YAML document can be found [here](/api/genericparser/v1/swagger.yaml).
-The swagger JSON document can be found [here](/api/genericparser/v1/swagger.json)."""
+The `swagger-ui` view can be found [here](/api/parser/v1/swagger).
+The `ReDoc` view can be found [here](/api/parser/v1/redoc).
+The swagger YAML document can be found [here](/api/parser/v1/swagger.yaml).
+The swagger JSON document can be found [here](/api/parser/v1/swagger.json)."""
 )
 
 SchemaView = get_schema_view(
@@ -37,7 +37,7 @@ SchemaView = get_schema_view(
 
 urlpatterns = [
     # url(r'^api/genericparser/v1/swagger.json$', SwaggerJsonView.as_view()),
-    url(r'^api/genericparser/v1/swagger(?P<format>.json|.yaml)$', SchemaView.without_ui(cache_timeout=0), name='schema-json'),
-    url(r'^api/genericparser/v1/swagger$', SchemaView.with_ui('swagger', cache_timeout=0), name='schema-swagger-ui'),
-    url(r'^api/genericparser/v1/redoc$', SchemaView.with_ui('redoc', cache_timeout=0), name='schema-redoc'),
+    url(r'^api/parser/v1/swagger(?P<format>.json|.yaml)$', SchemaView.without_ui(cache_timeout=0), name='schema-json'),
+    url(r'^api/parser/v1/swagger$', SchemaView.with_ui('swagger', cache_timeout=0), name='schema-swagger-ui'),
+    url(r'^api/parser/v1/redoc$', SchemaView.with_ui('redoc', cache_timeout=0), name='schema-redoc'),
 ]

diff --git a/genericparser/urls.py b/genericparser/urls.py
index a3cf4ff..4cf58c8 100644 (file)
--- a/genericparser/urls.py
+++ b/genericparser/urls.py
@@ -19,7 +19,7 @@ from django.contrib import admin
 from genericparser.pub.config.config import REG_TO_MSB_WHEN_START, REG_TO_MSB_REG_URL, REG_TO_MSB_REG_PARAM
 
 urlpatterns = [
-    url(r'^api/genericparser/v1/admin', admin.site.urls),
+    url(r'^api/parser/v1/admin', admin.site.urls),
     url(r'^', include('genericparser.samples.urls')),
     url(r'^', include('genericparser.packages.urls')),
     url(r'^', include('genericparser.jobs.urls')),