diff options
| author |   fujinhua <fu.jinhua@zte.com.cn> | 2017-08-15 09:32:04 +0800 |
|---|---|---|
| committer | fujinhua <fu.jinhua@zte.com.cn> | 2017-08-15 09:32:04 +0800 |
| commit | cc42d7ab095dd50a791a7673e94e524f007ded60 (patch) | |
| tree | 7616927f51aaff02dba58dc780ef9f3dc04d828e | |
| parent | a9283b7d8d179b672bcd42636006b7e66761b44d (diff) | |
Fix url from openoapi to api
Change-Id: I51970b7ceef04e9d94c5900f8d45cd13e8d1bb01
Issue-Id: VFC-96
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
41 files changed, 236 insertions, 234 deletions
diff --git a/lcm/jobs/tests/tests.py b/lcm/jobs/tests/tests.py index 76f9a8d5..3c2b441d 100644 --- a/lcm/jobs/tests/tests.py +++ b/lcm/jobs/tests/tests.py @@ -28,5 +28,5 @@ class JobsViewTest(TestCase): def test_job(self): 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("/openoapi/nslcm/v1/jobs/%s" % self.job_id) + response = self.client.get("/api/nslcm/v1/jobs/%s" % self.job_id) self.failUnlessEqual(status.HTTP_200_OK, response.status_code) diff --git a/lcm/jobs/urls.py b/lcm/jobs/urls.py index 2a163db9..6919d05f 100644 --- a/lcm/jobs/urls.py +++ b/lcm/jobs/urls.py @@ -17,7 +17,7 @@ from rest_framework.urlpatterns import format_suffix_patterns from lcm.jobs.views import JobView urlpatterns = patterns('', - url(r'^openoapi/nslcm/v1/jobs/(?P<job_id>[0-9a-zA-Z_-]+)$', JobView.as_view()), + url(r'^api/nslcm/v1/jobs/(?P<job_id>[0-9a-zA-Z_-]+)$', JobView.as_view()), ) urlpatterns = format_suffix_patterns(urlpatterns) diff --git a/lcm/ns/data/file.json b/lcm/ns/data/file.json index 520f334a..c0583d73 100644 --- a/lcm/ns/data/file.json +++ b/lcm/ns/data/file.json @@ -20,7 +20,7 @@ "method": "POST", "accept": "application/json", "contentType": "application/json", - "url": "http://127.0.0.1:80/openoapi/nslcm/v1/ns/vls", + "url": "http://127.0.0.1:80/api/nslcm/v1/ns/vls", "path": {}, "query": {}, "body": { @@ -270,7 +270,7 @@ "method": "POST", "accept": "application/json", "contentType": "application/json", - "url": "http://127.0.0.1:80/openoapi/nslcm/v1/ns/vnfs", + "url": "http://127.0.0.1:80/api/nslcm/v1/ns/vnfs", "path": {}, "query": {}, "body": { @@ -410,7 +410,7 @@ "method": "GET", "accept": "application/json", "contentType": "application/json", - "url": "http://127.0.0.1:80/openoapi/nslcm/v1/ns/vnfs/{vnfInstId}", + "url": "http://127.0.0.1:80/api/nslcm/v1/ns/vnfs/{vnfInstId}", "path": { "vnfInstId": { "type": "plan", @@ -463,7 +463,7 @@ "method": "POST", "accept": "application/json", "contentType": "application/json", - "url": "http://127.0.0.1:80/openoapi/nslcm/v1/ns/sfcs", + "url": "http://127.0.0.1:80/api/nslcm/v1/ns/sfcs", "path": {}, "query": {}, "body": { @@ -540,7 +540,7 @@ "method": "GET", "accept": "application/json", "contentType": "application/json", - "url": "http://127.0.0.1:80/openoapi/nslcm/v1/ns/sfcs/{sfcInstId}", + "url": "http://127.0.0.1:80/api/nslcm/v1/ns/sfcs/{sfcInstId}", "path": { "sfcInstId": { "type": "plan", @@ -623,7 +623,7 @@ "method": "POST", "accept": "application/json", "contentType": "application/json", - "url": "http://127.0.0.1:80/openoapi/nslcm/v1/jobs/{jobId}", + "url": "http://127.0.0.1:80/api/nslcm/v1/jobs/{jobId}", "path": { "jobId": { "type": "plan", @@ -663,7 +663,7 @@ "method": "POST", "accept": "application/json", "contentType": "application/json", - "url": "http://127.0.0.1:80/openoapi/nslcm/v1/jobs/{jobId}", + "url": "http://127.0.0.1:80/api/nslcm/v1/jobs/{jobId}", "path": { "jobId": { "type": "plan", @@ -703,7 +703,7 @@ "method": "POST", "accept": "application/json", "contentType": "application/json", - "url": "http://127.0.0.1:80/openoapi/nslcm/v1/jobs/{jobId}", + "url": "http://127.0.0.1:80/api/nslcm/v1/jobs/{jobId}", "path": { "jobId": { "type": "plan", @@ -743,7 +743,7 @@ "method": "POST", "accept": "application/json", "contentType": "application/json", - "url": "http://127.0.0.1:80/openoapi/nslcm/v1/ns/{nsInstanceId}/postdeal", + "url": "http://127.0.0.1:80/api/nslcm/v1/ns/{nsInstanceId}/postdeal", "path": { "nsInstanceId": { "type": "plan", @@ -775,7 +775,7 @@ "method": "POST", "accept": "application/json", "contentType": "application/json", - "url": "http://127.0.0.1:80/openoapi/nslcm/v1/jobs/{jobId}", + "url": "http://127.0.0.1:80/api/nslcm/v1/jobs/{jobId}", "path": { "jobId": { "type": "plan", diff --git a/lcm/ns/data/init/init.bpel b/lcm/ns/data/init/init.bpel index 781b1326..9e824733 100644 --- a/lcm/ns/data/init/init.bpel +++ b/lcm/ns/data/init/init.bpel @@ -273,7 +273,7 @@ <assign name="createVL_URL"> <copy> <from> - <literal>http://127.0.0.1:80/openoapi/nslcm/v1/ns/vls</literal> + <literal>http://127.0.0.1:80/api/nslcm/v1/ns/vls</literal> </from> <to variable="url"></to> </copy> @@ -473,7 +473,7 @@ <assign name="jobstatus_URL"> <copy> <from> - <literal>http://127.0.0.1:80/openoapi/nslcm/v1/jobs/{jobId}</literal> + <literal>http://127.0.0.1:80/api/nslcm/v1/jobs/{jobId}</literal> </from> <to variable="url"></to> </copy> @@ -600,7 +600,7 @@ <assign name="createVNF_URL"> <copy> <from> - <literal>http://127.0.0.1:80/openoapi/nslcm/v1/ns/vnfs</literal> + <literal>http://127.0.0.1:80/api/nslcm/v1/ns/vnfs</literal> </from> <to variable="url"></to> </copy> @@ -734,7 +734,7 @@ <assign name="query_vnf_nslcm_URL"> <copy> <from> - <literal>http://127.0.0.1:80/openoapi/nslcm/v1/ns/vnfs/{vnfInstId}</literal> + <literal>http://127.0.0.1:80/api/nslcm/v1/ns/vnfs/{vnfInstId}</literal> </from> <to variable="url"></to> </copy> @@ -912,7 +912,7 @@ <assign name="jobstatus_URL"> <copy> <from> - <literal>http://127.0.0.1:80/openoapi/nslcm/v1/jobs/{jobId}</literal> + <literal>http://127.0.0.1:80/api/nslcm/v1/jobs/{jobId}</literal> </from> <to variable="url"></to> </copy> @@ -1039,7 +1039,7 @@ <assign name="createSFC_URL"> <copy> <from> - <literal>http://127.0.0.1:80/openoapi/nslcm/v1/ns/sfcs</literal> + <literal>http://127.0.0.1:80/api/nslcm/v1/ns/sfcs</literal> </from> <to variable="url"></to> </copy> @@ -1197,7 +1197,7 @@ <assign name="querySFC_URL"> <copy> <from> - <literal>http://127.0.0.1:80/openoapi/nslcm/v1/ns/sfcs/{sfcInstId}</literal> + <literal>http://127.0.0.1:80/api/nslcm/v1/ns/sfcs/{sfcInstId}</literal> </from> <to variable="url"></to> </copy> @@ -1375,7 +1375,7 @@ <assign name="jobstatus_URL"> <copy> <from> - <literal>http://127.0.0.1:80/openoapi/nslcm/v1/jobs/{jobId}</literal> + <literal>http://127.0.0.1:80/api/nslcm/v1/jobs/{jobId}</literal> </from> <to variable="url"></to> </copy> @@ -1510,7 +1510,7 @@ <assign name="post_do_URL"> <copy> <from> - <literal>http://127.0.0.1:80/openoapi/nslcm/v1/ns/{nsInstanceId}/postdeal</literal> + <literal>http://127.0.0.1:80/api/nslcm/v1/ns/{nsInstanceId}/postdeal</literal> </from> <to variable="url"></to> </copy> @@ -1602,7 +1602,7 @@ <assign name="jobstatus_URL"> <copy> <from> - <literal>http://127.0.0.1:80/openoapi/nslcm/v1/jobs/{jobId}</literal> + <literal>http://127.0.0.1:80/api/nslcm/v1/jobs/{jobId}</literal> </from> <to variable="url"></to> </copy> diff --git a/lcm/ns/sfcs/create_flowcla.py b/lcm/ns/sfcs/create_flowcla.py index 346a8bcf..214f2d99 100644 --- a/lcm/ns/sfcs/create_flowcla.py +++ b/lcm/ns/sfcs/create_flowcla.py @@ -76,7 +76,7 @@ class CreateFlowClassifier(object): "dest_ip_range": self.concat_str(self.dest_ip_range) } # req_param = json.JSONEncoder().encoding(data) - # url = "/openoapi/sdncdriver/v1.0/createflowclassfier" + # url = "/api/sdncdriver/v1.0/createflowclassfier" # ret = req_by_msb(url,"POST", data) # if ret[0] > 0: # logger.error('Send Flow Classifier request to Driver failed.') diff --git a/lcm/ns/sfcs/create_port_chain.py b/lcm/ns/sfcs/create_port_chain.py index a3e98e09..b7bd840a 100644 --- a/lcm/ns/sfcs/create_port_chain.py +++ b/lcm/ns/sfcs/create_port_chain.py @@ -58,7 +58,7 @@ class CreatePortChain(object): "symmetric": self.symmetric } - # url = "/openoapi/sdncdriver/v1.0/createchain" + # url = "/api/sdncdriver/v1.0/createchain" # req_param = json.JSONEncoder.encoding(data) # ret = req_by_msb(url, "POST", req_param) # ret = req_by_msb("OPENAPI_CREATE_SERVICE_PORT_CHAIN",data) @@ -75,7 +75,7 @@ class CreatePortChain(object): # try: # logger.warn("query sdncontroller by id begins:") # - # url = "/openoapi/extsys/v1/sdncontrollers/%s" % (self.sdnControllerId) + # url = "/api/extsys/v1/sdncontrollers/%s" % (self.sdnControllerId) # ret = req_by_msb(url, "GET") # if ret[0] > 0: # logger.error('query sdncontroller failed.') diff --git a/lcm/ns/sfcs/urls.py b/lcm/ns/sfcs/urls.py index a47f840a..97252677 100644 --- a/lcm/ns/sfcs/urls.py +++ b/lcm/ns/sfcs/urls.py @@ -18,12 +18,12 @@ from lcm.ns.sfcs.detail_views import SfcDetailView from lcm.ns.sfcs.views import SfcView, SfcInstanceView, PortPairGpView, FlowClaView, PortChainView urlpatterns = patterns('', - url(r'^openoapi/nslcm/v1/ns/sfcs$', SfcView.as_view()), - url(r'^openoapi/nslcm/v1/ns/sfcs/(?P<sfc_inst_id>[0-9a-zA-Z_-]+)$', SfcDetailView.as_view()), - url(r'^openoapi/nslcm/v1/ns/sfc_instance$', SfcInstanceView.as_view()), - url(r'^openoapi/nslcm/v1/ns/create_port_pair_group$', PortPairGpView.as_view()), - url(r'^openoapi/nslcm/v1/ns/create_flow_classifier$', FlowClaView.as_view()), - url(r'^openoapi/nslcm/v1/ns/create_port_chain$', PortChainView.as_view()), + url(r'^api/nslcm/v1/ns/sfcs$', SfcView.as_view()), + url(r'^api/nslcm/v1/ns/sfcs/(?P<sfc_inst_id>[0-9a-zA-Z_-]+)$', SfcDetailView.as_view()), + url(r'^api/nslcm/v1/ns/sfc_instance$', SfcInstanceView.as_view()), + url(r'^api/nslcm/v1/ns/create_port_pair_group$', PortPairGpView.as_view()), + url(r'^api/nslcm/v1/ns/create_flow_classifier$', FlowClaView.as_view()), + url(r'^api/nslcm/v1/ns/create_port_chain$', PortChainView.as_view()), ) urlpatterns = format_suffix_patterns(urlpatterns) diff --git a/lcm/ns/swagger.json b/lcm/ns/swagger.json index 2664027e..430a04d8 100644 --- a/lcm/ns/swagger.json +++ b/lcm/ns/swagger.json @@ -4,7 +4,7 @@ "version": "1.0.0", "title": "ZTE vManager Service rest API" }, - "basePath": "/openoapi/nslcm/v1", + "basePath": "/api/nslcm/v1", "tags": [ { "name": "lcm Resource" diff --git a/lcm/ns/tests/sfcs/test_create_flow_classifier.py b/lcm/ns/tests/sfcs/test_create_flow_classifier.py index eb149dca..275d0cb5 100644 --- a/lcm/ns/tests/sfcs/test_create_flow_classifier.py +++ b/lcm/ns/tests/sfcs/test_create_flow_classifier.py @@ -37,11 +37,11 @@ # "context": json.dumps(nsd_model) # } # mock_vals = { -# "/openoapi/extsys/v1/sdncontrollers/test": +# "/api/extsys/v1/sdncontrollers/test": # [0, json.JSONEncoder().encode({"url": "url_1"}), '200'], -# "/openoapi/sdncdriver/v1.0/createflowclassfier": +# "/api/sdncdriver/v1.0/createflowclassfier": # [0, json.JSONEncoder().encode({"id": "test_id_1"}), '200'], -# "/openoapi/microservices/v1/services": +# "/api/microservices/v1/services": # [0, None, '200'] # # } @@ -50,7 +50,7 @@ # return mock_vals[args[4]] # # mock_call_req.side_effect = side_effect -# resp = self.client.post("/openoapi/nslcm/v1/ns/create_flow_classifier", data) +# resp = self.client.post("/api/nslcm/v1/ns/create_flow_classifier", data) # ret = FPInstModel.objects.get(fpinstid="fp_inst_1") # self.assertEqual(resp.status_code, status.HTTP_200_OK) # self.assertEqual("test_id_1", ret.flowclassifiers) diff --git a/lcm/ns/tests/sfcs/test_create_port_chain.py b/lcm/ns/tests/sfcs/test_create_port_chain.py index ab68681b..e8844362 100644 --- a/lcm/ns/tests/sfcs/test_create_port_chain.py +++ b/lcm/ns/tests/sfcs/test_create_port_chain.py @@ -39,11 +39,11 @@ # "context": json.dumps(nsd_model) # } # mock_vals = { -# "/openoapi/extsys/v1/sdncontrollers/test_sdncontrollerid": +# "/api/extsys/v1/sdncontrollers/test_sdncontrollerid": # [0, json.JSONEncoder().encode({"url": "url_1"}), '200'], -# "/openoapi/sdncdriver/v1.0/createportchain": +# "/api/sdncdriver/v1.0/createportchain": # [0, json.JSONEncoder().encode({"id": "test_id_1"}), '200'], -# "/openoapi/microservices/v1/services": +# "/api/microservices/v1/services": # [0, None, '200'] # } # @@ -51,7 +51,7 @@ # return mock_vals[args[4]] # # mock_call_req.side_effect = side_effect -# resp = self.client.post("/openoapi/nslcm/v1/ns/create_port_chain", data) +# resp = self.client.post("/api/nslcm/v1/ns/create_port_chain", data) # ret = FPInstModel.objects.get(fpinstid="fp_inst_1") # self.assertEqual(resp.status_code, status.HTTP_200_OK) # self.assertEqual("test_id_1", ret.sfcid) diff --git a/lcm/ns/tests/sfcs/test_create_port_pair_group.py b/lcm/ns/tests/sfcs/test_create_port_pair_group.py index a63b6307..b7e73879 100644 --- a/lcm/ns/tests/sfcs/test_create_port_pair_group.py +++ b/lcm/ns/tests/sfcs/test_create_port_pair_group.py @@ -61,13 +61,13 @@ # "context": json.dumps(nsd_model) # } # mock_vals = { -# "/openoapi/extsys/v1/sdncontrollers/sdn_controller_1": +# "/api/extsys/v1/sdncontrollers/sdn_controller_1": # [0, json.JSONEncoder().encode({"url": "url_1"}), '200'], -# "/openoapi/sdncdriver/v1.0/createportpair": +# "/api/sdncdriver/v1.0/createportpair": # [0, json.JSONEncoder().encode({"id": "createportpair_id"}), '200'], -# "/openoapi/sdncdriver/v1.0/createportpairgroup": +# "/api/sdncdriver/v1.0/createportpairgroup": # [0, json.JSONEncoder().encode({"id": "createportpairgroup_id"}), '200'], -# "/openoapi/microservices/v1/services": +# "/api/microservices/v1/services": # [0, None, '200'] # } # @@ -75,7 +75,7 @@ # return mock_vals[args[4]] # # mock_call_req.side_effect = side_effect -# resp = self.client.post("/openoapi/nslcm/v1/ns/create_port_pair_group", data) +# resp = self.client.post("/api/nslcm/v1/ns/create_port_pair_group", data) # rest = json.loads(FPInstModel.objects.get(fpinstid="fp_inst_1").portpairgroups)[0] # self.assertEqual(resp.status_code, status.HTTP_200_OK) # self.assertEqual("createportpairgroup_id", rest["groupid"]) diff --git a/lcm/ns/tests/sfcs/test_sfc.py b/lcm/ns/tests/sfcs/test_sfc.py index cabead00..4fced43b 100644 --- a/lcm/ns/tests/sfcs/test_sfc.py +++ b/lcm/ns/tests/sfcs/test_sfc.py @@ -53,7 +53,7 @@ # "sdncontrollerid": "sdnControllerId_1" # } # -# resp = self.client.post("/openoapi/nslcm/v1/ns/sfc_instance", data, format='json') +# resp = self.client.post("/api/nslcm/v1/ns/sfc_instance", data, format='json') # self.assertEqual(resp.status_code, status.HTTP_200_OK) # # @mock.patch.object(extsys, "get_sdn_controller_by_id") @@ -66,7 +66,7 @@ # } # mock_create_flow_classfier.return_value = [0, json.dumps({'id': '1'})] # mock_get_sdn_controller_by_id.return_value = json.loads('{"test":"test_name","url":"url_add"}') -# resp = self.client.post("/openoapi/nslcm/v1/ns/create_flow_classifier", data) +# resp = self.client.post("/api/nslcm/v1/ns/create_flow_classifier", data) # self.assertEqual(resp.status_code, status.HTTP_200_OK) # # @mock.patch.object(extsys, "get_sdn_controller_by_id") @@ -83,7 +83,7 @@ # mock_create_port_pair.return_value = [0, json.dumps({'id': '1'})] # mock_create_port_pair_group.return_value = [0, json.dumps({'id': '1'})] # mock_get_sdn_controller_by_id.return_value = json.loads('{"test":"test_name","url":"url_add"}') -# resp = self.client.post("/openoapi/nslcm/v1/ns/create_port_pair_group", data) +# resp = self.client.post("/api/nslcm/v1/ns/create_port_pair_group", data) # self.assertEqual(resp.status_code, status.HTTP_200_OK) # # @mock.patch.object(extsys, "get_sdn_controller_by_id") @@ -99,7 +99,7 @@ # self.update_fp_inst_data() # mock_create_port_chain.return_value = [0, json.dumps({'id': '1'})] # mock_get_sdn_controller_by_id.return_value = json.loads('{"test":"test_name","url":"url_add"}') -# resp = self.client.post("/openoapi/nslcm/v1/ns/create_port_chain", data) +# resp = self.client.post("/api/nslcm/v1/ns/create_port_chain", data) # self.assertEqual(resp.status_code, status.HTTP_200_OK) # # # @mock.patch.object(restcall, 'call_req') @@ -112,7 +112,7 @@ # # "sdncontrollerid": "sdnControllerId_1" # # } # # -# # resp = self.client.post("/openoapi/nslcm/v1/ns/sfc", data, format='json') +# # resp = self.client.post("/api/nslcm/v1/ns/sfc", data, format='json') # # self.assertEqual(resp.status_code, status.HTTP_200_OK) # # def update_fp_inst_data(self): diff --git a/lcm/ns/tests/sfcs/test_sfc_instance.py b/lcm/ns/tests/sfcs/test_sfc_instance.py index f0f90648..981376fd 100644 --- a/lcm/ns/tests/sfcs/test_sfc_instance.py +++ b/lcm/ns/tests/sfcs/test_sfc_instance.py @@ -38,7 +38,7 @@ # "fpindex": "fpd_1", # "sdncontrollerid": "sdnControllerId_1" # } -# resp = self.client.post("/openoapi/nslcm/v1/ns/sfc_instance", data, format='json') +# resp = self.client.post("/api/nslcm/v1/ns/sfc_instance", data, format='json') # # vnffg = VNFFGInstModel.objects.get(vnffginstid="vnffg_inst_1") # ret = FPInstModel.objects.get(fpinstid=resp.data["fpinstid"]) diff --git a/lcm/ns/tests/sfcs/test_sfcdetailview.py b/lcm/ns/tests/sfcs/test_sfcdetailview.py index d82f224d..851f6c81 100644 --- a/lcm/ns/tests/sfcs/test_sfcdetailview.py +++ b/lcm/ns/tests/sfcs/test_sfcdetailview.py @@ -40,7 +40,7 @@ class TestSfcDetailViews(TestCase): def test_sfc_delete_failed(self): - response = self.client.delete("/openoapi/nslcm/v1/ns/sfcs/%s" % "notExist") + response = self.client.delete("/api/nslcm/v1/ns/sfcs/%s" % "notExist") expect_resp_data = {"result": 0, "detail": "sfc is not exist or has been already deleted"} self.assertEqual(status.HTTP_202_ACCEPTED, response.status_code) self.assertEqual(expect_resp_data, response.data) @@ -65,13 +65,13 @@ class TestSfcDetailViews(TestCase): sfcid="10", flowclassifiers="11", portpairgroups=json.JSONEncoder().encode([{"groupid":"98","portpair":"99"}]) ).save() - response = self.client.delete("/openoapi/nslcm/v1/ns/sfcs/%s" % sfc_inst_id) + response = self.client.delete("/api/nslcm/v1/ns/sfcs/%s" % sfc_inst_id) expect_resp_data = {"result": 0, "detail": "delete sfc success"} self.assertEqual(expect_resp_data, response.data) def test_sfc_get_failed(self): sfc_inst_id="10" - response = self.client.get("/openoapi/nslcm/v1/ns/sfcs/%s" % sfc_inst_id) + response = self.client.get("/api/nslcm/v1/ns/sfcs/%s" % sfc_inst_id) self.assertEqual(status.HTTP_404_NOT_FOUND, response.status_code) def test_sfc_get_success(self): @@ -80,7 +80,7 @@ class TestSfcDetailViews(TestCase): symmetric="5", policyinfo="6", forworderpaths="7", status="8", sdncontrollerid="9", sfcid="10", flowclassifiers="11", portpairgroups="12").save() - response = self.client.get("/openoapi/nslcm/v1/ns/sfcs/%s" % sfc_inst_id) + response = self.client.get("/api/nslcm/v1/ns/sfcs/%s" % sfc_inst_id) expect_resp_data={'sfcName': 'xxx', 'sfcInstId': '10', 'sfcStatus': '8'} self.assertEqual(expect_resp_data, response.data) diff --git a/lcm/ns/tests/sfcs/tests.py b/lcm/ns/tests/sfcs/tests.py index f93bc4c5..d3d2e3cd 100644 --- a/lcm/ns/tests/sfcs/tests.py +++ b/lcm/ns/tests/sfcs/tests.py @@ -50,7 +50,7 @@ class TestSfcDetailViews(TestCase): @mock.patch.object(restcall, "call_req") def test_delete_sfc(self, mock_req_by_rest): mock_req_by_rest.return_value = [0, '{"test":"test_name","url":"url_add"}'] - response = self.client.delete("/openoapi/nslcm/v1/ns/sfcs/%s" % self.sfc_inst_id) + response = self.client.delete("/api/nslcm/v1/ns/sfcs/%s" % self.sfc_inst_id) self.assertEqual(status.HTTP_202_ACCEPTED, response.status_code) expect_resp_data = {"result": 0, "detail": "delete sfc success"} self.assertEqual(expect_resp_data, response.data) @@ -60,18 +60,18 @@ class TestSfcDetailViews(TestCase): if FPInstModel.objects.filter(fpinstid=self.sfc_inst_id): self.fail() - response = self.client.delete("/openoapi/nslcm/v1/ns/sfcs/%s" % "notExist") + response = self.client.delete("/api/nslcm/v1/ns/sfcs/%s" % "notExist") self.assertEqual(status.HTTP_202_ACCEPTED, response.status_code) expect_resp_data = {"result": 0, "detail": "sfc is not exist or has been already deleted"} self.assertEqual(expect_resp_data, response.data) def test_query_sfc(self): - response = self.client.get("/openoapi/nslcm/v1/ns/sfcs/%s" % self.sfc_inst_id) + response = self.client.get("/api/nslcm/v1/ns/sfcs/%s" % self.sfc_inst_id) self.assertEqual(status.HTTP_200_OK, response.status_code) expect_resp_data = {'sfcInstId': self.sfc_inst_id, 'sfcStatus': self.status, 'sfcName': "xxx"} self.assertEqual(expect_resp_data, response.data) - response = self.client.get("/openoapi/nslcm/v1/ns/sfcs/%s" % "notExist") + response = self.client.get("/api/nslcm/v1/ns/sfcs/%s" % "notExist") self.assertEqual(status.HTTP_404_NOT_FOUND, response.status_code) diff --git a/lcm/ns/tests/test_ns_create.py b/lcm/ns/tests/test_ns_create.py index 1182184a..0f230565 100644 --- a/lcm/ns/tests/test_ns_create.py +++ b/lcm/ns/tests/test_ns_create.py @@ -35,5 +35,5 @@ class TestNsInstantiate(TestCase): 'nsdid': self.nsd_id, 'nsname': 'ns', 'description': 'description'} - response = self.client.post("/openoapi/nslcm/v1/ns", data=data) + response = self.client.post("/api/nslcm/v1/ns", data=data) self.failUnlessEqual(status.HTTP_201_CREATED, response.status_code) diff --git a/lcm/ns/tests/test_ns_instant.py b/lcm/ns/tests/test_ns_instant.py index ed20c052..955284ce 100644 --- a/lcm/ns/tests/test_ns_instant.py +++ b/lcm/ns/tests/test_ns_instant.py @@ -37,13 +37,13 @@ class TestNsInstant(TestCase): def test_ns_instant_ok(self, mock_convert_nsd_model, mock_call_req): mock_convert_nsd_model.return_value = self.context mock_vals = { - "/openoapi/catalog/v1/csars/7/files?relativePath=abc.yaml": + "/api/catalog/v1/csars/7/files?relativePath=abc.yaml": [0, '{"downloadUri":"http://test.yaml", "localPath":"./test.yaml"}', '200'], - "/openoapi/tosca/v1/indirect/plan": + "/api/tosca/v1/indirect/plan": [0, '{"description":"", "metadata":{}, "nodes":[]}', '200'], - "/openoapi/catalog/v1/servicetemplates/2/operations": + "/api/catalog/v1/servicetemplates/2/operations": [0, '[{"name":"LCM", "processId":"{http://www.open-o.org/tosca/nfv/2015/12}init-16"}]', '200'], - "/openoapi/wso2bpel/v1/process/instance": + "/api/wso2bpel/v1/process/instance": [0, '{"status": 1}', '200']} def side_effect(*args): @@ -56,10 +56,10 @@ class TestNsInstant(TestCase): 'nsInstanceId': "123", 'instanceId': "234", 'resourceUrl': "", 'callbackId': "", 'additionalParamForVnf': "[{\"b\":1},{\"c\":{\"d\":\"2\"}}]", 'additionalParamForNs': "[{\"a\":3},{\"e\":{\"f\":\"4\"}}]", 'flavorParams': ""} - resp = self.client.post("/openoapi/nslcm/v1/ns/123/instantiate", data, format='json') + resp = self.client.post("/api/nslcm/v1/ns/123/instantiate", data, format='json') self.assertEqual(resp.status_code, status.HTTP_200_OK) """ def test_swagger_ok(self): - resp = self.client.get("/openoapi/nslcm/v1/swagger.json", format='json') + resp = self.client.get("/api/nslcm/v1/swagger.json", format='json') self.assertEqual(resp.status_code, status.HTTP_200_OK) diff --git a/lcm/ns/tests/test_ns_manual_scale.py b/lcm/ns/tests/test_ns_manual_scale.py index cd7ccc01..67c6f858 100644 --- a/lcm/ns/tests/test_ns_manual_scale.py +++ b/lcm/ns/tests/test_ns_manual_scale.py @@ -47,13 +47,13 @@ class TestNsManualScale(TestCase): def test_ns_instant_ok(self, mock_convert_nsd_model, mock_call_req): mock_convert_nsd_model.return_value = self.context mock_vals = { - "/openoapi/catalog/v1/csars/7/files?relativePath=abc.yaml": + "/api/catalog/v1/csars/7/files?relativePath=abc.yaml": [0, '{"downloadUri":"http://test.yaml", "localPath":"./test.yaml"}', '200'], - "/openoapi/tosca/v1/indirect/plan": + "/api/tosca/v1/indirect/plan": [0, '{"description":"", "metadata":{}, "nodes":[]}', '200'], - "/openoapi/catalog/v1/servicetemplates/2/operations": + "/api/catalog/v1/servicetemplates/2/operations": [0, '[{"name":"LCM", "processId":"{http://www.open-o.org/tosca/nfv/2015/12}init-16"}]', '200'], - "/openoapi/wso2bpel/v1/process/instance": + "/api/wso2bpel/v1/process/instance": [0, '{"status": 1}', '200']} def side_effect(*args): @@ -66,7 +66,7 @@ class TestNsManualScale(TestCase): 'nsInstanceId': "123", 'instanceId': "234", 'resourceUrl': "", 'callbackId': "", 'additionalParamForVnf': "[{\"b\":1},{\"c\":{\"d\":\"2\"}}]", 'additionalParamForNs': "[{\"a\":3},{\"e\":{\"f\":\"4\"}}]", 'flavorParams': ""} - resp = self.client.post("/openoapi/nslcm/v1/ns/123/instantiate", data, format='json') + resp = self.client.post("/api/nslcm/v1/ns/123/instantiate", data, format='json') self.assertEqual(resp.status_code, status.HTTP_200_OK) """ @mock.patch.object(NSManualScaleService, 'run') @@ -75,7 +75,7 @@ class TestNsManualScale(TestCase): 'nsdid': self.nsd_id, 'nsname': 'ns', 'description': 'description'} - response = self.client.post("/openoapi/nslcm/v1/ns/%s/scale"%self.nsd_id, data=data) + response = self.client.post("/api/nslcm/v1/ns/%s/scale"%self.nsd_id, data=data) self.failUnlessEqual(status.HTTP_202_ACCEPTED, response.status_code) @mock.patch.object(restcall, 'call_req') @@ -89,5 +89,5 @@ class TestNsManualScale(TestCase): self.assertTrue(NSInstModel.objects.get(id=self.ns_inst_id).status, NS_INST_STATUS.ACTIVE) def test_swagger_ok(self): - resp = self.client.get("/openoapi/nslcm/v1/swagger.json", format='json') + resp = self.client.get("/api/nslcm/v1/swagger.json", format='json') self.assertEqual(resp.status_code, status.HTTP_200_OK) diff --git a/lcm/ns/tests/tests_ns_terminate.py b/lcm/ns/tests/tests_ns_terminate.py index 2ea1fa45..b12a4569 100644 --- a/lcm/ns/tests/tests_ns_terminate.py +++ b/lcm/ns/tests/tests_ns_terminate.py @@ -54,10 +54,10 @@ class TestTerminateNsViews(TestCase): req_data = { "terminationType": "forceful", "gracefulTerminationTimeout": "600"} - response = self.client.post("/openoapi/nslcm/v1/ns/%s/terminate" % self.ns_inst_id, data=req_data) + response = self.client.post("/api/nslcm/v1/ns/%s/terminate" % self.ns_inst_id, data=req_data) self.failUnlessEqual(status.HTTP_202_ACCEPTED, response.status_code) - response = self.client.delete("/openoapi/nslcm/v1/ns/%s" % self.ns_inst_id) + response = self.client.delete("/api/nslcm/v1/ns/%s" % self.ns_inst_id) self.failUnlessEqual(status.HTTP_204_NO_CONTENT, response.status_code) @mock.patch.object(restcall, "call_req") @@ -65,13 +65,13 @@ class TestTerminateNsViews(TestCase): job_id = JobUtil.create_job("VNF", JOB_TYPE.TERMINATE_VNF, self.nf_inst_id) mock_vals = { - "/openoapi/nslcm/v1/ns/vls/1": + "/api/nslcm/v1/ns/vls/1": [0, json.JSONEncoder().encode({"jobId": self.job_id}), '200'], - "/openoapi/nslcm/v1/ns/sfcs/1": + "/api/nslcm/v1/ns/sfcs/1": [0, json.JSONEncoder().encode({"jobId": self.job_id}), '200'], - "/openoapi/nslcm/v1/ns/vnfs/1": + "/api/nslcm/v1/ns/vnfs/1": [0, json.JSONEncoder().encode({}), '200'], - "/openoapi/ztevmanagerdriver/v1/jobs/" + self.job_id + "&responseId=0": + "/api/ztevmanagerdriver/v1/jobs/" + self.job_id + "&responseId=0": [0, json.JSONEncoder().encode({"jobid": self.job_id, "responsedescriptor": {"progress": "100", "status": JOB_MODEL_STATUS.FINISHED, diff --git a/lcm/ns/tests/vls/tests.py b/lcm/ns/tests/vls/tests.py index 30062984..78514cea 100644 --- a/lcm/ns/tests/vls/tests.py +++ b/lcm/ns/tests/vls/tests.py @@ -87,7 +87,7 @@ class TestVlViews(TestCase): "nsInstanceId": self.ns_inst_id, "context": json.JSONEncoder().encode(self.context), "vlindex": vl_id} - response = self.client.post("/openoapi/nslcm/v1/ns/vls", data=req_data) + response = self.client.post("/api/nslcm/v1/ns/vls", data=req_data) self.assertEqual(status.HTTP_201_CREATED, response.status_code) self.assertEqual(0, response.data["result"]) @@ -104,7 +104,7 @@ class TestVlViews(TestCase): '{"test":"test_name","name":"vim_name","type":"type_name","url":"url_add"' ',"userName":"user_name","password":"password","tenant":"tenant"}'] mock_create_network.return_value = [1, (1)] - response = self.client.post("/openoapi/nslcm/v1/ns/vls", data=req_data) + response = self.client.post("/api/nslcm/v1/ns/vls", data=req_data) retinfo = {"detail": "vl instantiation failed, detail message: Send post vl request to vim failed."} self.assertEqual(retinfo["detail"], response.data["detail"]) @@ -134,7 +134,7 @@ class TestVlDetailViews(TestCase): mock_req_by_rest.return_value = [0, '{"test":"test_name","name":"vim_name","type":"type_name","url":"url_add"' ',"userName":"user_name","password":"password","tenant":"tenant"}'] - response = self.client.delete("/openoapi/nslcm/v1/ns/vls/%s" % self.vl_inst_id) + response = self.client.delete("/api/nslcm/v1/ns/vls/%s" % self.vl_inst_id) self.assertEqual(status.HTTP_202_ACCEPTED, response.status_code) expect_resp_data = {"result": 0, "detail": "delete vl success"} self.assertEqual(expect_resp_data, response.data) @@ -144,16 +144,16 @@ class TestVlDetailViews(TestCase): if VLInstModel.objects.filter(vlinstanceid=self.vl_inst_id): self.fail() - response = self.client.delete("/openoapi/nslcm/v1/ns/vls/%s" % "notExist") + response = self.client.delete("/api/nslcm/v1/ns/vls/%s" % "notExist") self.assertEqual(status.HTTP_202_ACCEPTED, response.status_code) expect_resp_data = {"result": 0, "detail": "vl is not exist or has been already deleted"} self.assertEqual(expect_resp_data, response.data) def test_query_vl(self): - response = self.client.get("/openoapi/nslcm/v1/ns/vls/%s" % self.vl_inst_id) + response = self.client.get("/api/nslcm/v1/ns/vls/%s" % self.vl_inst_id) self.assertEqual(status.HTTP_200_OK, response.status_code) expect_resp_data = {'vlId': self.vl_inst_id, 'vlName': self.vl_name, 'vlStatus': "active"} self.assertEqual(expect_resp_data, response.data) - response = self.client.get("/openoapi/nslcm/v1/ns/vls/%s" % "notExist") + response = self.client.get("/api/nslcm/v1/ns/vls/%s" % "notExist") self.assertEqual(status.HTTP_404_NOT_FOUND, response.status_code) diff --git a/lcm/ns/tests/vnfs/tests.py b/lcm/ns/tests/vnfs/tests.py index ffd0eea3..8ac7c962 100644 --- a/lcm/ns/tests/vnfs/tests.py +++ b/lcm/ns/tests/vnfs/tests.py @@ -42,7 +42,7 @@ class TestGetVnfViews(TestCase): NfInstModel.objects.all().delete() def test_get_vnf(self): - response = self.client.get("/openoapi/nslcm/v1/ns/vnfs/%s" % self.nf_inst_id) + response = self.client.get("/api/nslcm/v1/ns/vnfs/%s" % self.nf_inst_id) self.failUnlessEqual(status.HTTP_200_OK, response.status_code) context = json.loads(response.content) self.failUnlessEqual(self.nf_inst_id, context['vnfInstId']) @@ -74,7 +74,7 @@ class TestCreateVnfViews(TestCase): @mock.patch.object(CreateVnfs, 'run') def test_create_vnf(self, mock_run): - response = self.client.post("/openoapi/nslcm/v1/ns/vnfs", data=self.data) + response = self.client.post("/api/nslcm/v1/ns/vnfs", data=self.data) self.failUnlessEqual(status.HTTP_202_ACCEPTED, response.status_code) context = json.loads(response.content) self.assertTrue(NfInstModel.objects.filter(nfinstid=context['vnfInstId']).exists()) @@ -82,15 +82,15 @@ class TestCreateVnfViews(TestCase): @mock.patch.object(restcall, 'call_req') def test_create_vnf_thread(self, mock_call_req): mock_vals = { - "/openoapi/ztevmanagerdriver/v1/1/vnfs": + "/api/ztevmanagerdriver/v1/1/vnfs": [0, json.JSONEncoder().encode({"jobId": self.job_id, "vnfInstanceId": 3}), '200'], - "/openoapi/extsys/v1/vnfms/1": + "/api/extsys/v1/vnfms/1": [0, json.JSONEncoder().encode({"name": 'vnfm1'}), '200'], - "/openoapi/resmgr/v1/vnf": + "/api/resmgr/v1/vnf": [0, json.JSONEncoder().encode({}), '200'], - "/openoapi/resmgr/v1/vnfinfo": + "/api/resmgr/v1/vnfinfo": [0, json.JSONEncoder().encode({}), '200'], - "/openoapi/ztevmanagerdriver/v1/jobs/" + self.job_id + "&responseId=0": + "/api/ztevmanagerdriver/v1/jobs/" + self.job_id + "&responseId=0": [0, json.JSONEncoder().encode({"jobid": self.job_id, "responsedescriptor": {"progress": "100", "status": JOB_MODEL_STATUS.FINISHED, @@ -149,7 +149,7 @@ class TestTerminateVnfViews(TestCase): "terminationType": "forceful", "gracefulTerminationTimeout": "600"} - response = self.client.post("/openoapi/nslcm/v1/ns/vnfs/%s" % self.nf_inst_id, data=req_data) + response = self.client.post("/api/nslcm/v1/ns/vnfs/%s" % self.nf_inst_id, data=req_data) self.failUnlessEqual(status.HTTP_201_CREATED, response.status_code) @mock.patch.object(restcall, "call_req") @@ -163,13 +163,13 @@ class TestTerminateVnfViews(TestCase): self.failUnlessEqual(1, 0) mock_vals = { - "/openoapi/ztevmanagerdriver/v1/1/vnfs/111/terminate": + "/api/ztevmanagerdriver/v1/1/vnfs/111/terminate": [0, json.JSONEncoder().encode({"jobId": job_id}), '200'], - "/openoapi/extsys/v1/vnfms/1": + "/api/extsys/v1/vnfms/1": [0, json.JSONEncoder().encode({"name": 'vnfm1', "type": 'ztevmanagerdriver'}), '200'], - "/openoapi/resmgr/v1/vnf/1": + "/api/resmgr/v1/vnf/1": [0, json.JSONEncoder().encode({"jobId": job_id}), '200'], - "/openoapi/ztevmanagerdriver/v1/1/jobs/" + job_id + "?responseId=0": + "/api/ztevmanagerdriver/v1/1/jobs/" + job_id + "?responseId=0": [0, json.JSONEncoder().encode({"jobId": job_id, "responsedescriptor": {"progress": "100", "status": JOB_MODEL_STATUS.FINISHED, @@ -287,9 +287,9 @@ class TestScaleVnfViews(TestCase): mock_vals = { - "/openoapi/ztevmanagerdriver/v1/1/vnfs/111/terminate": + "/api/ztevmanagerdriver/v1/1/vnfs/111/terminate": [0, json.JSONEncoder().encode({"jobId": job_id}), '200'], - "/openoapi/ztevmanagerdriver/v1/1/vnfs/111/terminate": + "/api/ztevmanagerdriver/v1/1/vnfs/111/terminate": [0, json.JSONEncoder().encode({"jobId": job_id}), '200'] } NFManualScaleService(self.nf_inst_id, req_data).run() diff --git a/lcm/ns/tests/vnfs/verify_test.py b/lcm/ns/tests/vnfs/verify_test.py index 59cdbea9..c2d355e3 100644 --- a/lcm/ns/tests/vnfs/verify_test.py +++ b/lcm/ns/tests/vnfs/verify_test.py @@ -25,5 +25,5 @@ class TestGetVnfViews(TestCase): pass def test_verify_vnfs(self): - response = self.client.post("/openoapi/nslcm/v1/vnfonboarding", data=self.data) + response = self.client.post("/api/nslcm/v1/vnfonboarding", data=self.data) self.failUnlessEqual(status.HTTP_202_ACCEPTED, response.status_code)
\ No newline at end of file diff --git a/lcm/ns/urls.py b/lcm/ns/urls.py index 1efd963e..eeb3511c 100644 --- a/lcm/ns/urls.py +++ b/lcm/ns/urls.py @@ -18,16 +18,16 @@ from lcm.ns.views import CreateNSView, NSInstView, TerminateNSView, NSDetailView NSManualScaleView urlpatterns = patterns('', - url(r'^openoapi/nslcm/v1/ns$', CreateNSView.as_view()), - url(r'^openoapi/nslcm/v1/swagger.json$', SwaggerJsonView.as_view()), - url(r'^openoapi/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/instantiate$', + url(r'^api/nslcm/v1/ns$', CreateNSView.as_view()), + url(r'^api/nslcm/v1/swagger.json$', SwaggerJsonView.as_view()), + url(r'^api/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/instantiate$', NSInstView.as_view()), - url(r'^openoapi/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/terminate$', + url(r'^api/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/terminate$', TerminateNSView.as_view()), - url(r'^openoapi/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)$', NSDetailView.as_view()), - url(r'^openoapi/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/postdeal$', + url(r'^api/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)$', NSDetailView.as_view()), + url(r'^api/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/postdeal$', NSInstPostDealView.as_view()), - url(r'^openoapi/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/scale$', + url(r'^api/nslcm/v1/ns/(?P<ns_instance_id>[0-9a-zA-Z_-]+)/scale$', NSManualScaleView.as_view()), ) diff --git a/lcm/ns/views.py b/lcm/ns/views.py index ffe35a49..88ca5428 100644 --- a/lcm/ns/views.py +++ b/lcm/ns/views.py @@ -139,7 +139,7 @@ class NSInstPostDealView(APIView): "fileUri":file_url } req_param = json.JSONEncoder().encode(input_data) - policy_engine_url = 'openoapi/polengine/v1/policyinfo' + policy_engine_url = 'api/polengine/v1/policyinfo' ret = req_by_msb(policy_engine_url, "POST", req_param) if ret[0] != 0: logger.error("Failed to send ns policy req") diff --git a/lcm/ns/vls/urls.py b/lcm/ns/vls/urls.py index cad8ba34..a6f6adc5 100644 --- a/lcm/ns/vls/urls.py +++ b/lcm/ns/vls/urls.py @@ -18,8 +18,8 @@ from rest_framework.urlpatterns import format_suffix_patterns from lcm.ns.vls.views import VlView, VlDetailView urlpatterns = patterns('', - url(r'^openoapi/nslcm/v1/ns/vls$', VlView.as_view()), - url(r'^openoapi/nslcm/v1/ns/vls/(?P<vl_inst_id>[0-9a-zA-Z_-]+)$', VlDetailView.as_view()), + url(r'^api/nslcm/v1/ns/vls$', VlView.as_view()), + url(r'^api/nslcm/v1/ns/vls/(?P<vl_inst_id>[0-9a-zA-Z_-]+)$', VlDetailView.as_view()), ) urlpatterns = format_suffix_patterns(urlpatterns) diff --git a/lcm/ns/vnfs/urls.py b/lcm/ns/vnfs/urls.py index 4ab427b9..0a1ba178 100644 --- a/lcm/ns/vnfs/urls.py +++ b/lcm/ns/vnfs/urls.py @@ -17,14 +17,14 @@ from rest_framework.urlpatterns import format_suffix_patterns from lcm.ns.vnfs.views import NfView, NfDetailView, NfGrant, LcmNotify, NfScaleView, NfVerifyView urlpatterns = patterns('', - url(r'^openoapi/nslcm/v1/ns/vnfs$', NfView.as_view()), - url(r'^openoapi/nslcm/v1/ns/vnfs/(?P<vnfinstid>[0-9a-zA-Z_-]+)$', NfDetailView.as_view()), - url(r'^openoapi/nslcm/v1/ns/grantvnf$', NfGrant.as_view()), - url(r'^openoapi/nslcm/v1/ns/(?P<vnfmid>[0-9a-zA-Z_-]+)' + url(r'^api/nslcm/v1/ns/vnfs$', NfView.as_view()), + url(r'^api/nslcm/v1/ns/vnfs/(?P<vnfinstid>[0-9a-zA-Z_-]+)$', NfDetailView.as_view()), + url(r'^api/nslcm/v1/ns/grantvnf$', NfGrant.as_view()), + url(r'^api/nslcm/v1/ns/(?P<vnfmid>[0-9a-zA-Z_-]+)' r'/vnfs/(?P<vnfInstanceId>[0-9a-zA-Z_-]+)/Notify$', LcmNotify.as_view()), - url(r'^openoapi/nslcm/v1/ns/vnfs/(?P<vnfinstid>[0-9a-zA-Z_-]+)/scaling$', NfScaleView.as_view()), - url(r'^openoapi/nslcm/v1/vnfonboarding$', NfVerifyView.as_view()), + url(r'^api/nslcm/v1/ns/vnfs/(?P<vnfinstid>[0-9a-zA-Z_-]+)/scaling$', NfScaleView.as_view()), + url(r'^api/nslcm/v1/vnfonboarding$', NfVerifyView.as_view()), ) urlpatterns = format_suffix_patterns(urlpatterns) diff --git a/lcm/ns/vnfs/verify_vnfs.py b/lcm/ns/vnfs/verify_vnfs.py index e40e27a3..aa6761b1 100644 --- a/lcm/ns/vnfs/verify_vnfs.py +++ b/lcm/ns/vnfs/verify_vnfs.py @@ -61,7 +61,7 @@ class VerifyVnfs(threading.Thread): "csarId":self.data["PackageID"], "labVimId":ignore_case_get(self.verify_config, "labVimId") } - ret = req_by_msb("/openoapi/nslcm/v1/vnfpackage", "POST", json.JSONEncoder().encode(onboarding_data)) + ret = req_by_msb("/api/nslcm/v1/vnfpackage", "POST", json.JSONEncoder().encode(onboarding_data)) if ret[0] != 0: raise NSLCMException("Failed to call vnf onboarding: %s" % ret[1]) rsp_data = json.JSONDecoder().decode(ret[1]) @@ -79,7 +79,7 @@ class VerifyVnfs(threading.Thread): "additionalParamForVnf": vnf_param, "vnfIndex": "1" } - ret = req_by_msb("/openoapi/nslcm/v1/ns/vnfs", "POST", json.JSONEncoder().encode(inst_data)) + ret = req_by_msb("/api/nslcm/v1/ns/vnfs", "POST", json.JSONEncoder().encode(inst_data)) if ret[0] != 0: raise NSLCMException("Failed to call inst vnf: %s" % ret[1]) rsp_data = json.JSONDecoder().decode(ret[1]) @@ -115,7 +115,7 @@ class VerifyVnfs(threading.Thread): "terminationType": "forceful", "gracefulTerminationTimeout": "600" } - ret = req_by_msb("/openoapi/nslcm/v1/ns/vnfs/%s" % self.vnf_inst_id, "POST", json.JSONEncoder().encode(term_data)) + ret = req_by_msb("/api/nslcm/v1/ns/vnfs/%s" % self.vnf_inst_id, "POST", json.JSONEncoder().encode(term_data)) if ret[0] != 0: raise NSLCMException("Failed to call term vnf: %s" % ret[1]) rsp_data = json.JSONDecoder().decode(ret[1]) @@ -136,7 +136,7 @@ class VerifyVnfs(threading.Thread): while count < retry_count: count = count + 1 time.sleep(interval_second) - ret = req_by_msb("/openoapi/nslcm/v1/jobs/%s?responseId=%s" % (job_id, response_id), "GET") + ret = req_by_msb("/api/nslcm/v1/jobs/%s?responseId=%s" % (job_id, response_id), "GET") if ret[0] != 0: logger.error("Failed to query job: %s:%s", ret[2], ret[1]) continue diff --git a/lcm/packages/tests/test_nf.py b/lcm/packages/tests/test_nf.py index eec5adb8..516a6b02 100644 --- a/lcm/packages/tests/test_nf.py +++ b/lcm/packages/tests/test_nf.py @@ -160,7 +160,7 @@ class TestNfPackage(TestCase): @mock.patch.object(NfOnBoardingThread, 'run') def test_nf_pkg_on_boarding_normal(self, mock_run): - resp = self.client.post("/openoapi/nslcm/v1/vnfpackage", { + resp = self.client.post("/api/nslcm/v1/vnfpackage", { "csarId": "1", "vimIds": ["1"] }, format='json') @@ -190,10 +190,10 @@ class TestNfPackage(TestCase): @mock.patch.object(restcall, 'call_req') def test_nf_on_boarding_when_nfd_already_exists(self, mock_call_req): mock_vals = { - "/openoapi/catalog/v1/csars/2": + "/api/catalog/v1/csars/2": [0, json.JSONEncoder().encode({ "onBoardState": "onBoardFailed", "processState": "deleteFailed"}), '200'], - "/openoapi/catalog/v1/servicetemplates/queryingrawdata": + "/api/catalog/v1/servicetemplates/queryingrawdata": [0, json.JSONEncoder().encode(self.vnfd_raw_data), '200']} def side_effect(*args): @@ -213,22 +213,22 @@ class TestNfPackage(TestCase): mock__init__, mock_download_file_from_http, mock_call_req): mock_download_file_from_http.return_value = True, "/root/package" mock_vals = { - "/openoapi/catalog/v1/csars/2": + "/api/catalog/v1/csars/2": [0, json.JSONEncoder().encode({ "onBoardState": "onBoardFailed", "processState": "deleteFailed"}), '200'], - "/openoapi/catalog/v1/servicetemplates/queryingrawdata": + "/api/catalog/v1/servicetemplates/queryingrawdata": [0, json.JSONEncoder().encode(self.vnfd_raw_data), '200'], - "/openoapi/catalog/v1/csars/2/files?relativePath=/SoftwareImages/image-lb": + "/api/catalog/v1/csars/2/files?relativePath=/SoftwareImages/image-lb": [0, json.JSONEncoder().encode({ "csar_file_info": [{"downloadUri": "8"}, {"localPath": "9"}]}), '200'], - "/openoapi/extsys/v1/vims": + "/api/extsys/v1/vims": [0, json.JSONEncoder().encode([{ "vimId": "1", "type": VIM_OPENSTACK, "url": "/root/package", "userName": "tom", "password": "tom", "tenant": "10"}]), '200'], - "/openoapi/catalog/v1/csars/2?onBoardState=onBoarded": [0, '{}', 200], - "/openoapi/catalog/v1/csars/2?operationalState=Enabled": [0, '{}', 200], - "/openoapi/catalog/v1/csars/2?processState=normal": [0, '{}', 200]} + "/api/catalog/v1/csars/2?onBoardState=onBoarded": [0, '{}', 200], + "/api/catalog/v1/csars/2?operationalState=Enabled": [0, '{}', 200], + "/api/catalog/v1/csars/2?processState=normal": [0, '{}', 200]} mock_create_image.return_value = [0, {"id": "30", "name": "jerry", "res_type": 0}] mock__init__.return_value = None mock_get_image.return_value = [0, {"id": "30", "name": "jerry", "size": "60", "status": "active"}] @@ -251,16 +251,16 @@ class TestNfPackage(TestCase): nf_package.SLEEP_INTERVAL_SECONDS = 1 mock_download_file_from_http.return_value = True, "/root/package" mock_vals = { - "/openoapi/catalog/v1/csars/3": + "/api/catalog/v1/csars/3": [0, json.JSONEncoder().encode({"onBoardState": "onBoardFailed", "processState": "deleteFailed"}), '200'], - "/openoapi/catalog/v1/servicetemplates/queryingrawdata": + "/api/catalog/v1/servicetemplates/queryingrawdata": [0, json.JSONEncoder().encode(self.vnfd_raw_data), '200'], - "/openoapi/catalog/v1/csars/3/files?relativePath=/SoftwareImages/image-lb": + "/api/catalog/v1/csars/3/files?relativePath=/SoftwareImages/image-lb": [0, json.JSONEncoder().encode({ "csar_file_info": [{"downloadUri": "8"}, {"localPath": "9"}]}), '200'], - "/openoapi/catalog/v1/csars/3?processState=onBoardFailed": [0, '{}', 200], - "/openoapi/extsys/v1/vims": + "/api/catalog/v1/csars/3?processState=onBoardFailed": [0, '{}', 200], + "/api/extsys/v1/vims": [0, json.JSONEncoder().encode([{ "vimId": "1", "type": VIM_OPENSTACK, "url": "/root/package", "userName": "tom", @@ -284,16 +284,16 @@ class TestNfPackage(TestCase): mock__init__, mock_download_file_from_http, mock_call_req): mock_download_file_from_http.return_value = True, "/root/package" mock_vals = { - "/openoapi/catalog/v1/csars/5": + "/api/catalog/v1/csars/5": [0, json.JSONEncoder().encode({ "onBoardState": "onBoardFailed", "processState": "deleteFailed"}), '200'], - "/openoapi/catalog/v1/servicetemplates/queryingrawdata": + "/api/catalog/v1/servicetemplates/queryingrawdata": [0, json.JSONEncoder().encode(self.vnfd_raw_data), '200'], - "/openoapi/catalog/v1/csars/5/files?relativePath=/SoftwareImages/image-lb": + "/api/catalog/v1/csars/5/files?relativePath=/SoftwareImages/image-lb": [0, json.JSONEncoder().encode({ "csar_file_info": [{"downloadUri": "8"}, {"localPath": "9"}]}), '200'], - "/openoapi/catalog/v1/csars/5?processState=onBoardFailed": [0, '{}', 200], - "/openoapi/extsys/v1/vims": + "/api/catalog/v1/csars/5?processState=onBoardFailed": [0, '{}', 200], + "/api/extsys/v1/vims": [0, json.JSONEncoder().encode([{ "vimId": "1", "type": VIM_OPENSTACK, "url": "/root/package", "userName": "tom", @@ -321,7 +321,7 @@ class TestNfPackage(TestCase): VnfPackageFileModel(id="1", filename="filename", imageid="00001", vimid="1", vimuser="001", tenant="12", status="1", vnfpid="13").save() NfInstModel(nfinstid="1", mnfinstid="001", nf_name="name", package_id="13").save() - resp = self.client.get("/openoapi/nslcm/v1/vnfpackage/13") + resp = self.client.get("/api/nslcm/v1/vnfpackage/13") self.assertEqual(resp.status_code, status.HTTP_200_OK) expect_data = { "csarId": '13', @@ -394,15 +394,15 @@ class TestNfPackage(TestCase): @mock.patch.object(restcall, 'call_req') def test_delete_csarr_when_exception(self, mock_call_req, mock_delete_image, mock_init_): mock_vals = { - ("/openoapi/catalog/v1/csars/1", "DELETE"): + ("/api/catalog/v1/csars/1", "DELETE"): [1, "{}", "400"], - ("/openoapi/catalog/v1/csars/1?processState=deleting", "PUT"): + ("/api/catalog/v1/csars/1?processState=deleting", "PUT"): [0, "{}", "200"], - ("/openoapi/catalog/v1/csars/1?processState=deleteFailed", "PUT"): + ("/api/catalog/v1/csars/1?processState=deleteFailed", "PUT"): [0, "{}", "200"], - ("/openoapi/catalog/v1/csars/1", "GET"): + ("/api/catalog/v1/csars/1", "GET"): [0, json.JSONEncoder().encode({"processState": "normal"}), "200"], - ("/openoapi/extsys/v1/vims", "GET"): + ("/api/extsys/v1/vims", "GET"): [0, json.JSONEncoder().encode([{"vimId": "002", "url": "url_test", "userName": "test01", @@ -425,15 +425,15 @@ class TestNfPackage(TestCase): @mock.patch.object(restcall, 'call_req') def test_delete_csar_when_successfully(self, mock_call_req, mock_delete_image, mock_init_): mock_vals = { - ("/openoapi/catalog/v1/csars/1", "DELETE"): + ("/api/catalog/v1/csars/1", "DELETE"): [0, json.JSONEncoder().encode({"successfully": "successfully"}), "200"], - ("/openoapi/catalog/v1/csars/1?processState=deleting", "PUT"): + ("/api/catalog/v1/csars/1?processState=deleting", "PUT"): [0, json.JSONEncoder().encode({"successfully": "successfully"}), "200"], - ("/openoapi/catalog/v1/csars/1?processState=deleteFailed", "PUT"): + ("/api/catalog/v1/csars/1?processState=deleteFailed", "PUT"): [0, json.JSONEncoder().encode({"successfully": "successfully"}), "200"], - ("/openoapi/catalog/v1/csars/1", "GET"): + ("/api/catalog/v1/csars/1", "GET"): [0, json.JSONEncoder().encode({"notProcessState": "notProcessState"}), "200"], - ("/openoapi/extsys/v1/vims", "GET"): + ("/api/extsys/v1/vims", "GET"): [0, json.JSONEncoder().encode([{ "vimId": "002", "url": "url_test", @@ -462,7 +462,7 @@ class TestNfPackage(TestCase): def test_get_nf_csars_normal(self): NfPackageModel(uuid="01", nfpackageid="1", vnfdid="2").save() - resp = self.client.get("/openoapi/nslcm/v1/vnfpackage") + resp = self.client.get("/api/nslcm/v1/vnfpackage") self.assertEqual(resp.status_code, status.HTTP_200_OK) self.assertEqual(1, len(resp.data["csars"])) self.assertEqual("1", resp.data["csars"][0]["csarId"]) diff --git a/lcm/packages/tests/test_ns.py b/lcm/packages/tests/test_ns.py index 391297df..d41fe9c5 100644 --- a/lcm/packages/tests/test_ns.py +++ b/lcm/packages/tests/test_ns.py @@ -144,7 +144,7 @@ class TestNsPackage(TestCase): @mock.patch.object(restcall, 'call_req') def test_ns_pkg_on_boarding_when_on_boarded(self, mock_call_req): mock_call_req.return_value = [0, json.JSONEncoder().encode({"onBoardState": "onBoarded"}), '200'] - resp = self.client.post("/openoapi/nslcm/v1/nspackage", {"csarId": "1"}, format='json') + resp = self.client.post("/api/nslcm/v1/nspackage", {"csarId": "1"}, format='json') self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED) self.assertEqual("failed", resp.data["status"]) self.assertEqual("CSAR(1) already onBoarded.", resp.data["statusDescription"]) @@ -153,9 +153,9 @@ class TestNsPackage(TestCase): def test_ns_pkg_on_boarding_when_nsd_already_exists(self, mock_call_req): self.set_nsd_metadata(key="id", val="2") mock_vals = { - "/openoapi/catalog/v1/csars/2": + "/api/catalog/v1/csars/2": [0, json.JSONEncoder().encode({"onBoardState": "non-onBoarded"}), '200'], - "/openoapi/catalog/v1/servicetemplates/queryingrawdata": + "/api/catalog/v1/servicetemplates/queryingrawdata": [0, json.JSONEncoder().encode(self.nsd_raw_data), '200']} def side_effect(*args): @@ -163,7 +163,7 @@ class TestNsPackage(TestCase): mock_call_req.side_effect = side_effect NSDModel(id="1", nsd_id="2").save() - resp = self.client.post("/openoapi/nslcm/v1/nspackage", {"csarId": "2"}, format='json') + resp = self.client.post("/api/nslcm/v1/nspackage", {"csarId": "2"}, format='json') self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED) self.assertEqual("failed", resp.data["status"]) self.assertEqual("NSD(2) already exists.", resp.data["statusDescription"]) @@ -173,16 +173,16 @@ class TestNsPackage(TestCase): self.set_nsd_metadata(key="id", val="2") self.set_nsd_vnf_id(val="3") mock_vals = { - "/openoapi/catalog/v1/csars/3": + "/api/catalog/v1/csars/3": [0, json.JSONEncoder().encode({"onBoardState": "non-onBoarded"}), '200'], - "/openoapi/catalog/v1/servicetemplates/queryingrawdata": + "/api/catalog/v1/servicetemplates/queryingrawdata": [0, json.JSONEncoder().encode(self.nsd_raw_data), '200']} def side_effect(*args): return mock_vals[args[4]] mock_call_req.side_effect = side_effect - resp = self.client.post("/openoapi/nslcm/v1/nspackage", {"csarId": "3"}, format='json') + resp = self.client.post("/api/nslcm/v1/nspackage", {"csarId": "3"}, format='json') self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED) self.assertEqual("failed", resp.data["status"]) self.assertEqual("VNF package(3) is not onBoarded.", resp.data["statusDescription"]) @@ -192,11 +192,11 @@ class TestNsPackage(TestCase): self.set_nsd_metadata(key="id", val="2") self.set_nsd_vnf_id(val="6") mock_vals = { - "/openoapi/catalog/v1/csars/4": + "/api/catalog/v1/csars/4": [0, json.JSONEncoder().encode({"onBoardState": "non-onBoarded"}), '200'], - "/openoapi/catalog/v1/servicetemplates/queryingrawdata": + "/api/catalog/v1/servicetemplates/queryingrawdata": [0, json.JSONEncoder().encode(self.nsd_raw_data), '200'], - "/openoapi/catalog/v1/csars/5": + "/api/catalog/v1/csars/5": [0, json.JSONEncoder().encode({"onBoardState": "non-onBoarded"}), '200'], } def side_effect(*args): @@ -204,7 +204,7 @@ class TestNsPackage(TestCase): mock_call_req.side_effect = side_effect NfPackageModel(uuid="1", nfpackageid="5", vnfdid="6").save() - resp = self.client.post("/openoapi/nslcm/v1/nspackage", {"csarId": "4"}, format='json') + resp = self.client.post("/api/nslcm/v1/nspackage", {"csarId": "4"}, format='json') self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED) self.assertEqual("failed", resp.data["status"]) self.assertEqual("VNF package(5) is not onBoarded on catalog.", resp.data["statusDescription"]) @@ -218,17 +218,17 @@ class TestNsPackage(TestCase): self.set_nsd_metadata(key="version", val="6") self.set_nsd_vnf_id(val="7") mock_vals = { - "/openoapi/catalog/v1/csars/5": + "/api/catalog/v1/csars/5": [0, json.JSONEncoder().encode({ "onBoardState": "non-onBoarded", "createTime": "2016-05-15 12:30:34", "modifyTime": "2016-05-15 12:30:34"}), '200'], - "/openoapi/catalog/v1/servicetemplates/queryingrawdata": + "/api/catalog/v1/servicetemplates/queryingrawdata": [0, json.JSONEncoder().encode(self.nsd_raw_data), '200'], - "/openoapi/catalog/v1/csars/6": + "/api/catalog/v1/csars/6": [0, json.JSONEncoder().encode({"onBoardState": "onBoarded"}), '200'], - "/openoapi/catalog/v1/csars/5?operationalState=Enabled": [0, '{}', 200], - "/openoapi/catalog/v1/csars/5?onBoardState=onBoarded": [0, "OK", '200']} + "/api/catalog/v1/csars/5?operationalState=Enabled": [0, '{}', 200], + "/api/catalog/v1/csars/5?onBoardState=onBoarded": [0, "OK", '200']} def side_effect(*args): return mock_vals[args[4]] @@ -236,7 +236,7 @@ class TestNsPackage(TestCase): mock_call_req.side_effect = side_effect NfPackageModel(uuid="1", nfpackageid="6", vnfdid="7").save() - resp = self.client.post("/openoapi/nslcm/v1/nspackage", {"csarId": "5"}, format='json') + resp = self.client.post("/api/nslcm/v1/nspackage", {"csarId": "5"}, format='json') self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED) self.assertEqual("success", resp.data["status"]) self.assertEqual("CSAR(5) onBoarded successfully.", resp.data["statusDescription"]) @@ -248,7 +248,7 @@ class TestNsPackage(TestCase): @mock.patch.object(restcall, 'call_req') def test_delete_csar_when_id_not_exist(self, mock_call_req): mock_call_req.return_value = [0, "", '204'] - resp = self.client.delete("/openoapi/nslcm/v1/nspackage/6") + resp = self.client.delete("/api/nslcm/v1/nspackage/6") self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED) self.assertEqual("success", resp.data["status"]) self.assertEqual("Delete CSAR(6) successfully.", resp.data["statusDescription"]) @@ -260,7 +260,7 @@ class TestNsPackage(TestCase): NSDModel(id="7", nsd_id="2").save() NSInstModel(id="1", nspackage_id="7").save() - resp = self.client.delete("/openoapi/nslcm/v1/nspackage/7") + resp = self.client.delete("/api/nslcm/v1/nspackage/7") self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED) self.assertEqual("success", resp.data["status"]) self.assertEqual("Set deletionPending to True of CSAR(7) successfully.", @@ -272,14 +272,14 @@ class TestNsPackage(TestCase): NSDModel(id="8", nsd_id="2").save() - resp = self.client.delete("/openoapi/nslcm/v1/nspackage/8") + resp = self.client.delete("/api/nslcm/v1/nspackage/8") self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED) self.assertEqual("success", resp.data["status"]) self.assertEqual("Delete CSAR(8) successfully.", resp.data["statusDescription"]) ############################################################################################################### def test_delete_pending_csar_when_id_not_exist(self): - resp = self.client.delete("/openoapi/nslcm/v1/nspackage/9/deletionpending") + resp = self.client.delete("/api/nslcm/v1/nspackage/9/deletionpending") self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED) self.assertEqual("success", resp.data["status"]) self.assertEqual("Delete pending CSAR(9) successfully.", resp.data["statusDescription"]) @@ -288,7 +288,7 @@ class TestNsPackage(TestCase): def test_delete_pending_csar_when_pending_is_false(self, mock_call_req): mock_call_req.return_value = [0, '{"deletionPending": "false"}', '200'] NSDModel(id="10", nsd_id="2").save() - resp = self.client.delete("/openoapi/nslcm/v1/nspackage/10/deletionpending") + resp = self.client.delete("/api/nslcm/v1/nspackage/10/deletionpending") self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED) self.assertEqual("failed", resp.data["status"]) self.assertEqual("CSAR(10) need not to be deleted.", resp.data["statusDescription"]) @@ -298,7 +298,7 @@ class TestNsPackage(TestCase): mock_call_req.return_value = [0, '{"deletionPending": "true"}', '200'] NSDModel(id="11", nsd_id="2").save() NSInstModel(id="1", nspackage_id="11").save() - resp = self.client.delete("/openoapi/nslcm/v1/nspackage/11/deletionpending") + resp = self.client.delete("/api/nslcm/v1/nspackage/11/deletionpending") self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED) self.assertEqual("failed", resp.data["status"]) self.assertEqual("CSAR(11) is in using, cannot be deleted.", resp.data["statusDescription"]) @@ -309,7 +309,7 @@ class TestNsPackage(TestCase): [0, '{"deletionPending": "true"}', '200'], [0, "OK", '204']] NSDModel(id="12", nsd_id="2").save() - resp = self.client.delete("/openoapi/nslcm/v1/nspackage/12/deletionpending") + resp = self.client.delete("/api/nslcm/v1/nspackage/12/deletionpending") self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED) self.assertEqual("success", resp.data["status"]) self.assertEqual("Delete CSAR(12) successfully.", resp.data["statusDescription"]) @@ -337,7 +337,7 @@ class TestNsPackage(TestCase): NSInstModel(id="1", nspackage_id="13", name="11").save() NSInstModel(id="2", nspackage_id="13", name="22").save() - resp = self.client.get("/openoapi/nslcm/v1/nspackage/13") + resp = self.client.get("/api/nslcm/v1/nspackage/13") self.assertEqual(resp.status_code, status.HTTP_200_OK) expect_data = {"nsInstanceInfo": [{"nsInstanceId": "1", "nsInstanceName": "11"}, {"nsInstanceId": "2", "nsInstanceName": "22"}], "csarId": "13", @@ -351,7 +351,7 @@ class TestNsPackage(TestCase): ############################################################################################################### def test_disable_csar_when_id_not_exist_table(self): - resp = self.client.put("/openoapi/nslcm/v1/nspackage/14/disabled") + resp = self.client.put("/api/nslcm/v1/nspackage/14/disabled") self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED) self.assertEqual("failed", resp.data["status"]) self.assertEqual("CSAR(14) does not exist.", resp.data["statusDescription"]) @@ -360,7 +360,7 @@ class TestNsPackage(TestCase): def test_disable_csar_when_csar_is_disabled(self, mock_call_req): NSDModel(id="15", nsd_id="2").save() mock_call_req.return_value = [0, json.JSONEncoder().encode({"operationalState": "Disabled"}), '200'] - resp = self.client.put("/openoapi/nslcm/v1/nspackage/15/disabled") + resp = self.client.put("/api/nslcm/v1/nspackage/15/disabled") self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED) self.assertEqual("failed", resp.data["status"]) self.assertEqual("CSAR(15) already disabled.", resp.data["statusDescription"]) @@ -369,23 +369,23 @@ class TestNsPackage(TestCase): def test_disable_csar_successfully(self, mock_call_req): NSDModel(id="16", nsd_id="2").save() mock_vals = { - "/openoapi/catalog/v1/csars/16": + "/api/catalog/v1/csars/16": [0, json.JSONEncoder().encode({"operationalState": "Enabled"}), '200'], - "/openoapi/catalog/v1/csars/16?operationState=Disabled": + "/api/catalog/v1/csars/16?operationState=Disabled": [0, "OK", '200']} def side_effect(*args): return mock_vals[args[4]] mock_call_req.side_effect = side_effect - resp = self.client.put("/openoapi/nslcm/v1/nspackage/16/disabled") + resp = self.client.put("/api/nslcm/v1/nspackage/16/disabled") self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED) self.assertEqual("success", resp.data["status"]) self.assertEqual("Set operationState to Disabled of CSAR(16) successfully.", resp.data["statusDescription"]) ############################################################################################################### def test_enable_csar_when_id_not_exist_table(self): - resp = self.client.put("/openoapi/nslcm/v1/nspackage/17/enabled") + resp = self.client.put("/api/nslcm/v1/nspackage/17/enabled") self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED) self.assertEqual("failed", resp.data["status"]) self.assertEqual("CSAR(17) does not exist.", resp.data["statusDescription"]) @@ -394,7 +394,7 @@ class TestNsPackage(TestCase): def test_enable_csar_when_csar_is_enabled(self, mock_call_req): NSDModel(id="18", nsd_id="2").save() mock_call_req.return_value = [0, json.JSONEncoder().encode({"operationalState": "Enabled"}), '200'] - resp = self.client.put("/openoapi/nslcm/v1/nspackage/18/enabled") + resp = self.client.put("/api/nslcm/v1/nspackage/18/enabled") self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED) self.assertEqual("failed", resp.data["status"]) self.assertEqual("CSAR(18) already enabled.", resp.data["statusDescription"]) @@ -403,16 +403,16 @@ class TestNsPackage(TestCase): def test_enable_csar_successfully(self, mock_call_req): NSDModel(id="19", nsd_id="2").save() mock_vals = { - "/openoapi/catalog/v1/csars/19": + "/api/catalog/v1/csars/19": [0, json.JSONEncoder().encode({"operationalState": "Disabled"}), '200'], - "/openoapi/catalog/v1/csars/19?operationState=Enabled": + "/api/catalog/v1/csars/19?operationState=Enabled": [0, "OK", '200']} def side_effect(*args): return mock_vals[args[4]] mock_call_req.side_effect = side_effect - resp = self.client.put("/openoapi/nslcm/v1/nspackage/19/enabled") + resp = self.client.put("/api/nslcm/v1/nspackage/19/enabled") self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED) self.assertEqual("success", resp.data["status"]) self.assertEqual("Set operationState to Enabled of CSAR(19) successfully.", resp.data["statusDescription"])
\ No newline at end of file diff --git a/lcm/packages/urls.py b/lcm/packages/urls.py index 89432c9b..0f67d86b 100644 --- a/lcm/packages/urls.py +++ b/lcm/packages/urls.py @@ -17,15 +17,15 @@ from rest_framework.urlpatterns import format_suffix_patterns from lcm.packages import views urlpatterns = [ - url(r'^openoapi/nslcm/v1/nspackage/(?P<csarId>[0-9a-zA-Z\-\_]+)$', views.ns_access_csar, name='ns_access_csar'), - url(r'^openoapi/nslcm/v1/nspackage$', views.ns_on_boarding, name='ns_on_boarding'), - url(r'^openoapi/nslcm/v1/nspackage/(?P<csarId>[0-9a-zA-Z\-\_]+)/deletionpending$', + url(r'^api/nslcm/v1/nspackage/(?P<csarId>[0-9a-zA-Z\-\_]+)$', views.ns_access_csar, name='ns_access_csar'), + url(r'^api/nslcm/v1/nspackage$', views.ns_on_boarding, name='ns_on_boarding'), + url(r'^api/nslcm/v1/nspackage/(?P<csarId>[0-9a-zA-Z\-\_]+)/deletionpending$', views.ns_delete_pending_csar, name='ns_delete_pending_csar'), - url(r'^openoapi/nslcm/v1/nspackage/(?P<csarId>[0-9a-zA-Z\-\_]+)/(?P<operation>(disabled|enabled))$', + url(r'^api/nslcm/v1/nspackage/(?P<csarId>[0-9a-zA-Z\-\_]+)/(?P<operation>(disabled|enabled))$', views.ns_set_state_csar, name='ns_set_state_csar'), - url(r'^openoapi/nslcm/v1/vnfpackage/(?P<csarId>[0-9a-zA-Z\-\_]+)$', views.nf_access_csar, name='nf_access_csar'), - url(r'^openoapi/nslcm/v1/vnfpackage$', views.nf_on_boarding, name='nf_on_boarding'), - url(r'^openoapi/nslcm/v1/vnfpackage/(?P<csarId>[0-9a-zA-Z\-\_]+)/deletionpending$', + url(r'^api/nslcm/v1/vnfpackage/(?P<csarId>[0-9a-zA-Z\-\_]+)$', views.nf_access_csar, name='nf_access_csar'), + url(r'^api/nslcm/v1/vnfpackage$', views.nf_on_boarding, name='nf_on_boarding'), + url(r'^api/nslcm/v1/vnfpackage/(?P<csarId>[0-9a-zA-Z\-\_]+)/deletionpending$', views.nf_delete_pending_csar, name='nf_delete_pending_csar'), ] urlpatterns = format_suffix_patterns(urlpatterns) diff --git a/lcm/pub/config/config.py b/lcm/pub/config/config.py index 1a3c013f..952de29d 100644 --- a/lcm/pub/config/config.py +++ b/lcm/pub/config/config.py @@ -35,11 +35,11 @@ DB_PASSWD = "inventory" # [register] REG_TO_MSB_WHEN_START = True -REG_TO_MSB_REG_URL = "/openoapi/microservices/v1/services" +REG_TO_MSB_REG_URL = "/api/microservices/v1/services" REG_TO_MSB_REG_PARAM = { "serviceName": "nslcm", "version": "v1", - "url": "/openoapi/nslcm/v1", + "url": "/api/nslcm/v1", "protocol": "REST", "visualRange": "1", "nodes": [{ diff --git a/lcm/pub/database/models.py b/lcm/pub/database/models.py index cb40c08d..ffe8a395 100644 --- a/lcm/pub/database/models.py +++ b/lcm/pub/database/models.py @@ -25,6 +25,7 @@ class NSDModel(models.Model): description = models.CharField(db_column='DESCRIPTION', max_length=200, null=True, blank=True) version = models.CharField(db_column='VERSION', max_length=200, null=True, blank=True) nsd_model = models.TextField(db_column='NSDMODEL', max_length=65535, null=True, blank=True) + nsd_path = models.CharField(db_column='NSDPATH', max_length=300, null=True, blank=True) class NSInstModel(models.Model): @@ -55,6 +56,7 @@ class NfPackageModel(models.Model): vnfdversion = models.CharField(db_column='VNFDVERSION', max_length=255) vnfversion = models.CharField(db_column='VNFVERSION', max_length=255) vnfdmodel = models.TextField(db_column='VNFDMODEL', max_length=65535, blank=True, null=True) + vnfd_path = models.CharField(db_column='VNFDPATH', max_length=300, null=True, blank=True) class Meta: db_table = 'NFVO_NFPACKAGE' diff --git a/lcm/pub/msapi/catalog.py b/lcm/pub/msapi/catalog.py index 24444657..db54a781 100644 --- a/lcm/pub/msapi/catalog.py +++ b/lcm/pub/msapi/catalog.py @@ -28,7 +28,7 @@ P_STATUS_DELETING, P_STATUS_DELETEFAILED = "deleting", "deleteFailed" def query_csar_from_catalog(csar_id, key=''): - ret = req_by_msb("/openoapi/catalog/v1/csars/%s" % csar_id, "GET") + ret = req_by_msb("/api/catalog/v1/csars/%s" % csar_id, "GET") if ret[0] != 0: logger.error("Status code is %s, detail is %s.", ret[2], ret[1]) if ret[2] == '404': @@ -40,7 +40,7 @@ def query_csar_from_catalog(csar_id, key=''): def query_rawdata_from_catalog(csar_id, input_parameters=[]): req_param = json.JSONEncoder().encode({"csarId": csar_id, "inputParameters": input_parameters}) - ret = req_by_msb("/openoapi/catalog/v1/servicetemplates/queryingrawdata", "POST", req_param) + ret = req_by_msb("/api/catalog/v1/servicetemplates/queryingrawdata", "POST", req_param) if ret[0] != 0: logger.error("Status code is %s, detail is %s.", ret[2], ret[1]) raise NSLCMException("Failed to query rawdata of CSAR(%s) from catalog." % csar_id) @@ -48,7 +48,7 @@ def query_rawdata_from_catalog(csar_id, input_parameters=[]): def set_csar_state(csar_id, prop, val): - ret = req_by_msb("/openoapi/catalog/v1/csars/%s?%s=%s" % (csar_id, prop, val), "PUT") + ret = req_by_msb("/api/catalog/v1/csars/%s?%s=%s" % (csar_id, prop, val), "PUT") if ret[0] != 0: logger.error("Status code is %s, detail is %s.", ret[2], ret[1]) return [1, "Failed to set %s to %s of CSAR(%s)." % (prop, val, csar_id)] @@ -56,7 +56,7 @@ def set_csar_state(csar_id, prop, val): def delete_csar_from_catalog(csar_id): - ret = req_by_msb("/openoapi/catalog/v1/csars/%s" % csar_id, "DELETE") + ret = req_by_msb("/api/catalog/v1/csars/%s" % csar_id, "DELETE") if ret[0] != 0 and ret[2] != '404': logger.error("Status code is %s, detail is %s.", ret[2], ret[1]) set_csar_state(csar_id, "processState", P_STATUS_DELETEFAILED) @@ -65,7 +65,7 @@ def delete_csar_from_catalog(csar_id): def get_download_url_from_catalog(csar_id, relative_path): - ret = req_by_msb("/openoapi/catalog/v1/csars/%s/files?relativePath=%s" % (csar_id, relative_path), "GET") + ret = req_by_msb("/api/catalog/v1/csars/%s/files?relativePath=%s" % (csar_id, relative_path), "GET") if ret[0] != 0: logger.error("Status code is %s, detail is %s.", ret[2], ret[1]) raise NSLCMException("Failed to get download url of CSAR(%s)." % csar_id) @@ -74,7 +74,7 @@ def get_download_url_from_catalog(csar_id, relative_path): def get_process_id(name, srv_template_id): - ret = req_by_msb('/openoapi/catalog/v1/servicetemplates/%s/operations' % srv_template_id, 'GET') + ret = req_by_msb('/api/catalog/v1/servicetemplates/%s/operations' % srv_template_id, 'GET') if ret[0] != 0: raise NSLCMException('Failed to get service[%s,%s] process id' % (name, srv_template_id)) items = json.JSONDecoder().decode(ret[1]) @@ -84,7 +84,7 @@ def get_process_id(name, srv_template_id): raise NSLCMException('service[%s,%s] process id not exist' % (name, srv_template_id)) def get_servicetemplate_id(nsd_id): - ret = req_by_msb('/openoapi/catalog/v1/servicetemplates', 'GET') + ret = req_by_msb('/api/catalog/v1/servicetemplates', 'GET') if ret[0] != 0: raise NSLCMException('Failed to get servicetemplates info') stpls = json.JSONDecoder().decode(ret[1]) @@ -94,7 +94,7 @@ def get_servicetemplate_id(nsd_id): raise NSLCMException('servicetemplate(%s) does not exist.' % nsd_id) def get_servicetemplate(nsd_id): - ret = req_by_msb('/openoapi/catalog/v1/servicetemplates', 'GET') + ret = req_by_msb('/api/catalog/v1/servicetemplates', 'GET') if ret[0] != 0: raise NSLCMException('Failed to get servicetemplates info') stpls = json.JSONDecoder().decode(ret[1]) diff --git a/lcm/pub/msapi/extsys.py b/lcm/pub/msapi/extsys.py index 0b766630..d834ea10 100644 --- a/lcm/pub/msapi/extsys.py +++ b/lcm/pub/msapi/extsys.py @@ -22,7 +22,7 @@ logger = logging.getLogger(__name__) def get_vims(): - ret = req_by_msb("/openoapi/extsys/v1/vims", "GET") + ret = req_by_msb("/api/extsys/v1/vims", "GET") if ret[0] != 0: logger.error("Status code is %s, detail is %s.", ret[2], ret[1]) raise NSLCMException("Failed to query vims from extsys.") @@ -30,7 +30,7 @@ def get_vims(): def get_vim_by_id(vim_id): - ret = req_by_msb("/openoapi/extsys/v1/vims/%s" % vim_id, "GET") + ret = req_by_msb("/api/extsys/v1/vims/%s" % vim_id, "GET") if ret[0] != 0: logger.error("Status code is %s, detail is %s.", ret[2], ret[1]) raise NSLCMException("Failed to query vim(%s) from extsys." % vim_id) @@ -38,7 +38,7 @@ def get_vim_by_id(vim_id): def get_sdn_controller_by_id(sdn_ontroller_id): - ret = req_by_msb("/openoapi/extsys/v1/sdncontrollers/%s" % sdn_ontroller_id, "GET") + ret = req_by_msb("/api/extsys/v1/sdncontrollers/%s" % sdn_ontroller_id, "GET") if ret[0] != 0: logger.error("Failed to query sdn ontroller(%s) from extsys. detail is %s.", sdn_ontroller_id, ret[1]) raise NSLCMException("Failed to query sdn ontroller(%s) from extsys." % sdn_ontroller_id) @@ -46,7 +46,7 @@ def get_sdn_controller_by_id(sdn_ontroller_id): def get_vnfm_by_id(vnfm_inst_id): - uri = '/openoapi/extsys/v1/vnfms/%s' % vnfm_inst_id + uri = '/api/extsys/v1/vnfms/%s' % vnfm_inst_id ret = req_by_msb(uri, "GET") if ret[0] > 0: logger.error('Send get VNFM information request to extsys failed.') @@ -54,7 +54,7 @@ def get_vnfm_by_id(vnfm_inst_id): return json.JSONDecoder().decode(ret[1]) def select_vnfm(vnfm_type, vim_id): - uri = '/openoapi/extsys/v1/vnfms' + uri = '/api/extsys/v1/vnfms' ret = req_by_msb(uri, "GET") if ret[0] > 0: logger.error("Failed to call %s: %s", uri, ret[1]) diff --git a/lcm/pub/msapi/nslcm.py b/lcm/pub/msapi/nslcm.py index e62ad4ca..70cb7086 100644 --- a/lcm/pub/msapi/nslcm.py +++ b/lcm/pub/msapi/nslcm.py @@ -22,14 +22,14 @@ logger = logging.getLogger(__name__) def call_from_ns_cancel_resource(res_type, instid): method = "DELETE" if res_type == 'vl': - uri = '/openoapi/nslcm/v1/ns/vls/%s' % instid + uri = '/api/nslcm/v1/ns/vls/%s' % instid elif res_type == 'sfc': - uri = '/openoapi/nslcm/v1/ns/sfcs/%s' % instid + uri = '/api/nslcm/v1/ns/sfcs/%s' % instid else: # vnf method = "POST" - uri = '/openoapi/nslcm/v1/ns/vnfs/%s' % instid + uri = '/api/nslcm/v1/ns/vnfs/%s' % instid req_param = {} ret = req_by_msb(uri, method, json.dumps(req_param)) logger.info("[NS terminate] call vnfm [%s] result:%s" % (res_type, ret)) diff --git a/lcm/pub/msapi/resmgr.py b/lcm/pub/msapi/resmgr.py index d1fcc69d..fd8275af 100644 --- a/lcm/pub/msapi/resmgr.py +++ b/lcm/pub/msapi/resmgr.py @@ -22,7 +22,7 @@ logger = logging.getLogger(__name__) def create_vl(req_param): - ret = req_by_msb("/openoapi/resmgr/v1/vl", "POST", json.JSONEncoder().encode(req_param)) + ret = req_by_msb("/api/resmgr/v1/vl", "POST", json.JSONEncoder().encode(req_param)) if ret[0] != 0: logger.error("Failed to create vl to resmgr. detail is %s.", ret[1]) #raise NSLCMException('Failed to create vl to resmgr.') @@ -30,14 +30,14 @@ def create_vl(req_param): def delete_vl(vl_inst_id): - ret = req_by_msb("/openoapi/resmgr/v1/vl/%s" % vl_inst_id, "DELETE") + ret = req_by_msb("/api/resmgr/v1/vl/%s" % vl_inst_id, "DELETE") if ret[0] != 0: logger.error("Failed to delete vl(%s) to resmgr. detail is %s.", vl_inst_id, ret[1]) #raise NSLCMException("Failed to delete vl(%s) to resmgr." % vl_inst_id) def delete_sfc(sfc_inst_id): - ret = req_by_msb("/openoapi/resmgr/v1/sfc/%s" % sfc_inst_id, "DELETE") + ret = req_by_msb("/api/resmgr/v1/sfc/%s" % sfc_inst_id, "DELETE") if ret[0] != 0: logger.error("Failed to delete sfc(%s) to resmgr. detail is %s.", sfc_inst_id, ret[1]) #raise NSLCMException("Failed to delete sfc(%s) to resmgr." % sfc_inst_id) @@ -45,7 +45,7 @@ def delete_sfc(sfc_inst_id): def grant_vnf(req_param): grant_data = json.JSONEncoder().encode(req_param) - ret = req_by_msb("/openoapi/resmgr/v1/resource/grant", "PUT", grant_data) + ret = req_by_msb("/api/resmgr/v1/resource/grant", "PUT", grant_data) if ret[0] != 0: logger.error("Failed to grant vnf to resmgr. detail is %s.", ret[1]) #raise NSLCMException('Failed to grant vnf to resmgr.') @@ -76,7 +76,7 @@ def grant_vnf(req_param): def create_vnf(data): - uri = '/openoapi/resmgr/v1/vnf' + uri = '/api/resmgr/v1/vnf' req_param = json.JSONEncoder().encode({ 'orchVnfInstanceId': data['nf_inst_id'], 'vnfInstanceId': data['vnfm_nf_inst_id'], @@ -100,7 +100,7 @@ def create_vnf(data): def create_vnf_creation_info(data): - uri = '/openoapi/resmgr/v1/vnfinfo' + uri = '/api/resmgr/v1/vnfinfo' req_param = json.JSONEncoder().encode({ 'vnfInstanceId': data['nf_inst_id'], 'nsId': data['ns_inst_id'], @@ -114,7 +114,7 @@ def create_vnf_creation_info(data): def terminate_vnf(vnf_inst_id): - uri = '/openoapi/resmgr/v1/vnf/%s' % vnf_inst_id + uri = '/api/resmgr/v1/vnf/%s' % vnf_inst_id req_param = {} ret = req_by_msb(uri, "DELETE", json.dumps(req_param)) if ret[0] > 0: diff --git a/lcm/pub/msapi/sdncdriver.py b/lcm/pub/msapi/sdncdriver.py index f2331ce3..8d2c7583 100644 --- a/lcm/pub/msapi/sdncdriver.py +++ b/lcm/pub/msapi/sdncdriver.py @@ -22,25 +22,25 @@ logger = logging.getLogger(__name__) def delete_port_chain(req_param): - url = "/openoapi/sdncdriver/v1/delchain" + url = "/api/sdncdriver/v1/delchain" str = "delete port chain" delete_func(req_param, url, str) def delete_flow_classifier(req_param): - url = "/openoapi/sdncdriver/v1/delclassifier" + url = "/api/sdncdriver/v1/delclassifier" str = "delete flow classifier" delete_func(req_param, url, str) def delete_port_pair_group(req_param): - url = "/openoapi/sdncdriver/v1/delportpairgroup" + url = "/api/sdncdriver/v1/delportpairgroup" str = "delete port pair" delete_func(req_param, url, str) def delete_port_pair(req_param): - url = "/openoapi/sdncdriver/v1/delportpair" + url = "/api/sdncdriver/v1/delportpair" str = "delete port pair" delete_func(req_param, url, str) @@ -53,25 +53,25 @@ def delete_func(req_param, url, str): def create_flow_classfier(data): - url = "/openoapi/ztesdncdriver/v1/createflowclassfier" + url = "/api/ztesdncdriver/v1/createflowclassfier" str = "create flow classfier" return create(data, url, str) def create_port_pair(data): - url = "/openoapi/ztesdncdriver/v1/createportpair" + url = "/api/ztesdncdriver/v1/createportpair" str = "create port pair" return create(data, url, str) def create_port_pair_group(data): - url = "/openoapi/ztesdncdriver/v1/createportpairgroup" + url = "/api/ztesdncdriver/v1/createportpairgroup" str = "create port pair group" return create(data, url, str) def create_port_chain(data): - url = "/openoapi/ztesdncdriver/v1/createportchain" + url = "/api/ztesdncdriver/v1/createportchain" str = "create port chain" return create(data, url, str) diff --git a/lcm/pub/msapi/tosca.py b/lcm/pub/msapi/tosca.py index 5db971dd..dc2f57c4 100644 --- a/lcm/pub/msapi/tosca.py +++ b/lcm/pub/msapi/tosca.py @@ -23,7 +23,7 @@ def tosca_plan(uri, inputs): """ content = {"uri": uri, "inputs": inputs} content_str = json.JSONEncoder().encode(content) - ret = req_by_msb("/openoapi/tosca/v1/indirect/instance", "POST", content_str) + ret = req_by_msb("/api/tosca/v1/indirect/instance", "POST", content_str) if ret[0] != 0: raise NSLCMException("status code is %s, detail is %s.", ret[2], ret[1]) if ret[2] != '200': diff --git a/lcm/pub/msapi/vnfmdriver.py b/lcm/pub/msapi/vnfmdriver.py index 5da08d27..2f450ff2 100644 --- a/lcm/pub/msapi/vnfmdriver.py +++ b/lcm/pub/msapi/vnfmdriver.py @@ -24,7 +24,7 @@ logger = logging.getLogger(__name__) def send_nf_init_request(vnfm_inst_id, req_param): vnfm = get_vnfm_by_id(vnfm_inst_id) - uri = '/openoapi/%s/v1/%s/vnfs' % (vnfm["type"], vnfm_inst_id) + uri = '/api/%s/v1/%s/vnfs' % (vnfm["type"], vnfm_inst_id) ret = req_by_msb(uri, "POST", req_param) if ret[0] != 0: logger.error("Failed to send nf init req:%s,%s", ret[2], ret[1]) @@ -33,7 +33,7 @@ def send_nf_init_request(vnfm_inst_id, req_param): def send_nf_terminate_request(vnfm_inst_id, vnf_inst_id, req_param): vnfm = get_vnfm_by_id(vnfm_inst_id) - uri = '/openoapi/%s/v1/%s/vnfs/%s/terminate' % (vnfm["type"], vnfm_inst_id, vnf_inst_id) + uri = '/api/%s/v1/%s/vnfs/%s/terminate' % (vnfm["type"], vnfm_inst_id, vnf_inst_id) ret = req_by_msb(uri, "POST", req_param) if ret[0] > 0: logger.error("Failed to send nf terminate req:%s,%s", ret[2], ret[1]) @@ -43,7 +43,7 @@ def send_nf_terminate_request(vnfm_inst_id, vnf_inst_id, req_param): def query_vnfm_job(vnfm_inst_id, job_id, response_id=0): vnfm = get_vnfm_by_id(vnfm_inst_id) retry_time = 3 - uri = '/openoapi/%s/v1/%s/jobs/%s?responseId=%s' % (vnfm["type"], + uri = '/api/%s/v1/%s/jobs/%s?responseId=%s' % (vnfm["type"], vnfm_inst_id, job_id, response_id) while retry_time > 0: rsp = req_by_msb(uri, "GET") @@ -61,7 +61,7 @@ def query_vnfm_job(vnfm_inst_id, job_id, response_id=0): def send_nf_scaling_request(vnfm_inst_id, vnf_inst_id, req_param): vnfm = get_vnfm_by_id(vnfm_inst_id) - uri = '/openoapi/%s/v1/%s/vnfs/%s/scale' % (vnfm["type"], vnfm_inst_id, vnf_inst_id) + uri = '/api/%s/v1/%s/vnfs/%s/scale' % (vnfm["type"], vnfm_inst_id, vnf_inst_id) ret = req_by_msb(uri, "POST", req_param) if ret[0] > 0: logger.error("Failed to send nf scale req:%s,%s", ret[2], ret[1]) diff --git a/lcm/pub/msapi/wso2bpel.py b/lcm/pub/msapi/wso2bpel.py index afc1c407..eccd29ba 100644 --- a/lcm/pub/msapi/wso2bpel.py +++ b/lcm/pub/msapi/wso2bpel.py @@ -19,7 +19,7 @@ from lcm.pub.utils.restcall import req_by_msb def workflow_run(content): content_str = json.JSONEncoder().encode(content) - ret = req_by_msb("/openoapi/wso2bpel/v1/process/instance", "POST", content_str) + ret = req_by_msb("/api/wso2bpel/v1/process/instance", "POST", content_str) if ret[0] != 0: raise NSLCMException("Status code is %s, detail is %s.", ret[2], ret[1]) return json.JSONDecoder().decode(ret[1]) diff --git a/lcm/samples/urls.py b/lcm/samples/urls.py index 41f7f380..a1563213 100644 --- a/lcm/samples/urls.py +++ b/lcm/samples/urls.py @@ -16,5 +16,5 @@ from django.conf.urls import url from lcm.samples import views urlpatterns = [ - url(r'^openoapi/nslcm/v1/mandb/(?P<modelName>[a-zA-Z\-]+)$', views.TablesList.as_view()), + url(r'^api/nslcm/v1/mandb/(?P<modelName>[a-zA-Z\-]+)$', views.TablesList.as_view()), url(r'^samples/$', views.SampleList.as_view()), ] |