From 00ff3eb8ebd4ea4311832dbad9748f4ae2bd02b2 Mon Sep 17 00:00:00 2001 From: cyuamber Date: Tue, 11 Feb 2020 11:21:41 +0800 Subject: feat: Optimize slice business management Change-Id: I95a55038c22cb3d54d3217fb3b0031adafc3a56a Issue-ID: USECASEUI-369 Signed-off-by: cyuamber --- .../app/mock/json/csmf_slicing_businessData.json | 66 +++++++++++----------- .../src/app/mock/json/csmf_slicing_purchase.json | 10 ++++ usecaseui-portal/src/app/mock/routes.js | 7 ++- usecaseui-portal/src/app/mock/server.js | 2 +- 4 files changed, 48 insertions(+), 37 deletions(-) create mode 100644 usecaseui-portal/src/app/mock/json/csmf_slicing_purchase.json (limited to 'usecaseui-portal/src/app/mock') diff --git a/usecaseui-portal/src/app/mock/json/csmf_slicing_businessData.json b/usecaseui-portal/src/app/mock/json/csmf_slicing_businessData.json index 4ec93450..15a0ee8a 100644 --- a/usecaseui-portal/src/app/mock/json/csmf_slicing_businessData.json +++ b/usecaseui-portal/src/app/mock/json/csmf_slicing_businessData.json @@ -5,84 +5,84 @@ }, "result_body": { "record_number": 8, - "slicing_service_list": [ + "slicing_order_list": [ { - "service_id": "5G-777", - "service_name": "eMBB_e2e_Slice_Service_5GCustomer", + "order_id": "5G-777", + "order_name": "eMBB_e2e_Slice_Service_5GCustomer", + "order_creation_time":"1454171445000", "service_type": "embb", "service_snssai": "01-010101", - "service_status": "activated", - "last_operation_id": "8401c767-4fe9-43c3-82b5-707c1aaf5caf", + "order_status": "activated", "last_operation_type": "activation", "last_operation_process": 100 }, { - "service_id": "8c681037-75c9-444c-a665-34a66372e13e", - "service_name": "test_0203", + "order_id": "8c681037-75c9-444c-a665-34a66372e13e", + "order_name": "test_0203", + "order_creation_time":"1454171445000", "service_type": "embb", "service_snssai": "01-1370889D", - "service_status": "deactivated", - "last_operation_id": null, + "order_status": "deactivated", "last_operation_type": null, "last_operation_process": null }, { - "service_id": "dfa76a2f-6416-4070-9024-355d0d210234", - "service_name": "CSMFService", + "order_id": "dfa76a2f-6416-4070-9024-355d0d210234", + "order_name": "CSMFService", + "order_creation_time":"1454171445000", "service_type": "embb", "service_snssai": "01-485C16B6", - "service_status": "deactivated", - "last_operation_id": "06258836-8152-43ad-9c8e-e2a1783b1996", + "order_status": "deactivated", "last_operation_type": "activation", "last_operation_process": 0 }, { - "service_id": "1e6a6a4b-8efb-4211-b583-b2e8567c5950", - "service_name": "CSMFService", + "order_id": "1e6a6a4b-8efb-4211-b583-b2e8567c5950", + "order_name": "CSMFService", + "order_creation_time":"1454171445000", "service_type": "embb", "service_snssai": "01-6C572676", - "service_status": "deactivated", - "last_operation_id": null, + "order_status": "deactivated", "last_operation_type": null, "last_operation_process": null }, { - "service_id": "9941305e-311f-4a88-bd9e-431252a46337", - "service_name": "CSMFService", + "order_id": "9941305e-311f-4a88-bd9e-431252a46337", + "order_name": "CSMFService", + "order_creation_time":"1454171445000", "service_type": "embb", "service_snssai": "01-D38E2F0", - "service_status": "deactivated", - "last_operation_id": null, + "order_status": "deactivated", "last_operation_type": null, "last_operation_process": null }, { - "service_id": "4876265d-e4bb-4240-bcda-7b4b00481e4a", - "service_name": "test_0205", + "order_id": "4876265d-e4bb-4240-bcda-7b4b00481e4a", + "order_name": "test_0205", + "order_creation_time":"1454171445000", "service_type": "embb", "service_snssai": "01-6A345C48", - "service_status": "deactivated", - "last_operation_id": null, + "order_status": "deactivated", "last_operation_type": null, "last_operation_process": null }, { - "service_id": "6c52086a-e9b6-4f31-bc7a-7b34d66c69c0", - "service_name": "test_0204", + "order_id": "6c52086a-e9b6-4f31-bc7a-7b34d66c69c0", + "order_name": "test_0204", + "order_creation_time":"1454171445000", "service_type": "embb", "service_snssai": "01-774F54FC", - "service_status": "deactivated", - "last_operation_id": null, + "order_status": "deactivated", "last_operation_type": null, "last_operation_process": null }, { - "service_id": "1cab507a-3422-46f8-8520-9b46c95b7f9d", - "service_name": "aaa", + "order_id": "1cab507a-3422-46f8-8520-9b46c95b7f9d", + "order_name": "aaa", + "order_creation_time":"1454171445000", "service_type": "embb", "service_snssai": "01-44AA4085", - "service_status": "deactivated", - "last_operation_id": "012c888a-a46f-4ebc-bcde-7f7c769769b7", + "order_status": "deactivated", "last_operation_type": "DELETE", "last_operation_process": 100 } diff --git a/usecaseui-portal/src/app/mock/json/csmf_slicing_purchase.json b/usecaseui-portal/src/app/mock/json/csmf_slicing_purchase.json new file mode 100644 index 00000000..1893f80d --- /dev/null +++ b/usecaseui-portal/src/app/mock/json/csmf_slicing_purchase.json @@ -0,0 +1,10 @@ +{ + "result_header": { + "result_code": "200", + "result_message": "5G slicing order created normally." + }, + "result_body": { + "service_id": "service123456", + "operation_id": "operation123456" + } +} \ No newline at end of file diff --git a/usecaseui-portal/src/app/mock/routes.js b/usecaseui-portal/src/app/mock/routes.js index c454d5ba..85cb6fdd 100644 --- a/usecaseui-portal/src/app/mock/routes.js +++ b/usecaseui-portal/src/app/mock/routes.js @@ -20,8 +20,8 @@ module.exports = ///////<-------------api proxy--------->///// "/usecaseui-server/v1/*": "/$1", "/usecaseui-server/v1/*?:param": "/$1", - "/usecaseui/csmf/*": "/$1", - "/usecaseui/csmf/*?:param": "/$1", + "/uui-slicing/csmf/*": "/$1", + "/uui-slicing/csmf/*?:param": "/$1", /////////////// //text interface @@ -120,7 +120,8 @@ module.exports = "/uui-slicing/nsmf/resource/nssi/instanceStatus/:instanceStatus/instances/pageNo/:pageNo/pageSize/:pageSize": "/slicing_nssi_list_activated", "/uui-slicing/nsmf/resource/nssi/:nssiId/details":"/getSlicingNssiDetail", ///////<-------------CSMF slicing_business--------->///// - "/5gSlicing/services/status/:status/pageNo/:pageNo/pageSize/:pageSize": "/csmf_slicing_businessData", + "/5gSlicing/orders/status/:status/pageNo/:pageNo/pageSize/:pageSize": "/csmf_slicing_businessData", + "/POST/uui-slicing/csmf/5gSlicing": "/csmf_slicing_purchase", "/PUT/usecaseui/csmf/5gSlicing/service/:serviceId/activate": "/csmfActivate", "/DELETE/usecaseui/csmf/5gSlicing/service/:serviceId": "/csmfTerminate", "/5gSlicing/service/:serviceId/progress": "/csmfSlicingProgress", diff --git a/usecaseui-portal/src/app/mock/server.js b/usecaseui-portal/src/app/mock/server.js index 6dc00815..63e6167c 100644 --- a/usecaseui-portal/src/app/mock/server.js +++ b/usecaseui-portal/src/app/mock/server.js @@ -20,7 +20,7 @@ const middlewares = jsonServer.defaults(); const customersRouters = require('./routes'); const baseUrl = "/usecaseui-server/v1"; const nsmfBaseUrl = "/uui-slicing/nsmf"; -const csmfBaseUrl = "/usecaseui/csmf"; +const csmfBaseUrl = "/uui-slicing/csmf"; // Set default middlewares (logger, static, cors and no-cache) server.use(middlewares); -- cgit 1.2.3-korg