diff options
| author |   ying.yunlong <ying.yunlong@zte.com.cn> | 2017-02-14 13:47:52 +0800 |
|---|---|---|
| committer | ying.yunlong <ying.yunlong@zte.com.cn> | 2017-02-14 13:47:52 +0800 |
| commit | 0301e326a86cf77ba29ddc4260bc8e2c29f660a0 (patch) | |
| tree | 9d45cac279153ad25909500b02cc63065aa43bda | |
| parent | 90c1fa5d05f8aefae0fd0f114b479216ba6d8490 (diff) | |
Modify url define of gvnfm instantiation
Change-Id: If3a5de4d08e6e848676bac6e3c156d5732db8452
Issue-Id: GVNFM-12
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
| -rw-r--r-- | lcm/lcm/nf/vnfs/tests/test_vnf_create.py | 6 | ||||
| -rw-r--r-- | lcm/lcm/nf/vnfs/urls.py | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/lcm/lcm/nf/vnfs/tests/test_vnf_create.py b/lcm/lcm/nf/vnfs/tests/test_vnf_create.py index 2fe03ba5..6f241e6f 100644 --- a/lcm/lcm/nf/vnfs/tests/test_vnf_create.py +++ b/lcm/lcm/nf/vnfs/tests/test_vnf_create.py @@ -55,7 +55,7 @@ class TestNsInstantiate(TestCase): self.assertEqual(1, len(jobs)) def test_swagger_ok(self): - response = self.client.get("/gvnfmapi/lcm/v1/swagger.json", format='json') + response = self.client.get("/openoapi/vnflcm/v1/swagger.json", format='json') self.assertEqual(response.status_code, status.HTTP_200_OK) @mock.patch.object(restcall, 'call_req') @@ -66,7 +66,7 @@ class TestNsInstantiate(TestCase): "vnfdId": "111", "vnfInstanceName": "vFW_01", "vnfInstanceDescription": " vFW in Nanjing TIC Edge"} - response = self.client.post("/gvnfmapi/lcm/v1/vnf_instances", data=data, format='json') + response = self.client.post("/openoapi/vnflcm/v1/vnf_instances", data=data, format='json') self.failUnlessEqual(status.HTTP_201_CREATED, response.status_code) context = json.loads(response.content) self.assertTrue(NfInstModel.objects.filter(nfinstid=context['vnfInstanceId']).exists()) @@ -74,7 +74,7 @@ class TestNsInstantiate(TestCase): @mock.patch.object(InstVnf, 'run') def test_instantiate_vnf(self, mock_run): mock_run.re.return_value = None - response = self.client.post("/gvnfmapi/lcm/v1/vnf_instances/12/instantiate", data={}, format='json') + response = self.client.post("/openoapi/vnflcm/v1/vnf_instances/12/instantiate", data={}, format='json') self.failUnlessEqual(status.HTTP_202_ACCEPTED, response.status_code) def test_instantiate_vnf_when_inst_id_not_exist(self): diff --git a/lcm/lcm/nf/vnfs/urls.py b/lcm/lcm/nf/vnfs/urls.py index 73e3e30a..da06cbb3 100644 --- a/lcm/lcm/nf/vnfs/urls.py +++ b/lcm/lcm/nf/vnfs/urls.py @@ -19,18 +19,18 @@ from lcm.nf.vnfs.views import CreateVnfIdentifier, InstantiateVnf, DeleteVnfIden TerminateVnf, QuerySingleVnf, GetOperationStatus, SwaggerJsonView urlpatterns = patterns('', - url(r'^gvnfmapi/lcm/v1/vnf_instances$', CreateVnfIdentifier.as_view()), - url(r'^gvnfmapi/lcm/v1/vnf_instances/(?P<instanceId>[0-9a-zA-Z_-]+)/instantiate$', + url(r'^openoapi/vnflcm/v1/vnf_instances$', CreateVnfIdentifier.as_view()), + url(r'^openoapi/vnflcm/v1/vnf_instances/(?P<instanceId>[0-9a-zA-Z_-]+)/instantiate$', InstantiateVnf.as_view()), - url(r'^gvnfmapi/lcm/v1/vnf_instances/(?P<instanceId>[0-9a-zA-Z_-]+)$', + url(r'^openoapi/vnflcm/v1/vnf_instances/(?P<instanceId>[0-9a-zA-Z_-]+)$', DeleteVnfIdentifier.as_view()), - url(r'^gvnfmapi/lcm/v1/vnf_instances/(?P<instanceId>[0-9a-zA-Z_-]+)/terminate$', + url(r'^openoapi/vnflcm/v1/vnf_instances/(?P<instanceId>[0-9a-zA-Z_-]+)/terminate$', TerminateVnf.as_view()), - url(r'^gvnfmapi/lcm/v1/vnf_instances$', QueryMultipleVnf.as_view()), - url(r'^gvnfmapi/lcm/v1/vnf_instances/(?P<instanceId>[0-9a-zA-Z_-]+)$', QuerySingleVnf.as_view()), - url(r'^gvnfmapi/lcm/v1/vnf_lc_ops/(?P<vnfLcOpId>[0-9a-zA-Z_-]+)&' + url(r'^openoapi/vnflcm/v1/vnf_instances$', QueryMultipleVnf.as_view()), + url(r'^openoapi/vnflcm/v1/vnf_instances/(?P<instanceId>[0-9a-zA-Z_-]+)$', QuerySingleVnf.as_view()), + url(r'^openoapi/vnflcm/v1/vnf_lc_ops/(?P<vnfLcOpId>[0-9a-zA-Z_-]+)&' r'responseId=(?P<responseId>[0-9a-zA-Z_-]+)$', GetOperationStatus.as_view()), - url(r'^gvnfmapi/lcm/v1/swagger.json$', SwaggerJsonView.as_view()), + url(r'^openoapi/vnflcm/v1/swagger.json$', SwaggerJsonView.as_view()), ) urlpatterns = format_suffix_patterns(urlpatterns) |