From e53295bc15043f9d343897f3c8a4b6848cdf0c44 Mon Sep 17 00:00:00 2001 From: cyuamber Date: Thu, 5 Dec 2019 00:29:23 +0800 Subject: feat:Add progress interface query of slicing business page Change-Id: I8a974d5fa75546a937ad9755a33dee75374fb59d Issue-ID: USECASEUI-352 Signed-off-by: cyuamber --- .../app/mock/json/getSlicingBusinessProgress.json | 10 ++++ .../app/mock/json/slicing_business_activate.json | 9 ++++ .../src/app/mock/json/slicing_business_list.json | 54 ---------------------- .../mock/json/slicing_business_list_activated.json | 38 +++++++++++++++ usecaseui-portal/src/app/mock/routes.js | 5 ++ 5 files changed, 62 insertions(+), 54 deletions(-) create mode 100644 usecaseui-portal/src/app/mock/json/getSlicingBusinessProgress.json create mode 100644 usecaseui-portal/src/app/mock/json/slicing_business_activate.json create mode 100644 usecaseui-portal/src/app/mock/json/slicing_business_list_activated.json (limited to 'usecaseui-portal/src/app/mock') diff --git a/usecaseui-portal/src/app/mock/json/getSlicingBusinessProgress.json b/usecaseui-portal/src/app/mock/json/getSlicingBusinessProgress.json new file mode 100644 index 00000000..b14111fe --- /dev/null +++ b/usecaseui-portal/src/app/mock/json/getSlicingBusinessProgress.json @@ -0,0 +1,10 @@ +{ + "result_header": { + "result_code": "200", + "result_message": "5G slicing service operation progress." + }, + "result_body": { + "operation_type": "activate", + "operation_progress": 99 + } +} \ No newline at end of file diff --git a/usecaseui-portal/src/app/mock/json/slicing_business_activate.json b/usecaseui-portal/src/app/mock/json/slicing_business_activate.json new file mode 100644 index 00000000..988577bf --- /dev/null +++ b/usecaseui-portal/src/app/mock/json/slicing_business_activate.json @@ -0,0 +1,9 @@ +{ + "result_header": { + "result_code": "200", + "result_message": "5G slicing service has been activated." + }, + "result_body": { + "operation_id": "123456" + } +} \ No newline at end of file diff --git a/usecaseui-portal/src/app/mock/json/slicing_business_list.json b/usecaseui-portal/src/app/mock/json/slicing_business_list.json index 45fa0260..8291efbf 100644 --- a/usecaseui-portal/src/app/mock/json/slicing_business_list.json +++ b/usecaseui-portal/src/app/mock/json/slicing_business_list.json @@ -6,51 +6,6 @@ "result_body": { "record_number": 2, "slicing_business_list": [ - { - "service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9269", - "service_instance_name": "slicing-01-eMBB", - "service_type": "eMMB", - "service_snssai": "1-010101", - "orchestration_status": "activated", - "last_operation_type": "activate", - "last_operation_progress": 10 - }, - { - "service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9261", - "service_instance_name": "slicing-01-eMBB", - "service_type": "eMMB", - "service_snssai": "1-010101", - "orchestration_status": "activated", - "last_operation_type": "activate", - "last_operation_progress": 20 - }, - { - "service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9262", - "service_instance_name": "slicing-01-eMBB", - "service_type": "eMMB", - "service_snssai": "1-010101", - "orchestration_status": "activated", - "last_operation_type": "activate", - "last_operation_progress": 30 - }, - { - "service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9263", - "service_instance_name": "slicing-01-eMBB", - "service_type": "eMMB", - "service_snssai": "1-010101", - "orchestration_status": "activated", - "last_operation_type": "activate", - "last_operation_progress": 50 - }, - { - "service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9264", - "service_instance_name": "slicing-01-eMBB", - "service_type": "eMMB", - "service_snssai": "1-010101", - "orchestration_status": "activated", - "last_operation_type": "activate", - "last_operation_progress": 70 - }, { "service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9265", "service_instance_name": "slicing-01-eMBB", @@ -78,15 +33,6 @@ "last_operation_type": "activate", "last_operation_progress": 100 }, - { - "service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9268", - "service_instance_name": "slicing-01-eMBB", - "service_type": "eMMB", - "service_snssai": "1-010101", - "orchestration_status": "activated", - "last_operation_type": "activate", - "last_operation_progress": 100 - }, { "service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9270", "service_instance_name": "slicing-01-eMBB", diff --git a/usecaseui-portal/src/app/mock/json/slicing_business_list_activated.json b/usecaseui-portal/src/app/mock/json/slicing_business_list_activated.json new file mode 100644 index 00000000..bc3172af --- /dev/null +++ b/usecaseui-portal/src/app/mock/json/slicing_business_list_activated.json @@ -0,0 +1,38 @@ +{ + "result_header": { + "result_code": "200", + "result_message": "5G slicing service instances query based on status result ." + }, + "result_body": { + "record_number": 2, + "slicing_business_list": [ + { + "service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9260", + "service_instance_name": "slicing-01-eMBB", + "service_type": "eMMB", + "service_snssai": "1-010101", + "orchestration_status": "activated", + "last_operation_type": "activate", + "last_operation_progress": 10 + }, + { + "service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9272", + "service_instance_name": "slicing-01-eMBB", + "service_type": "eMMB", + "service_snssai": "1-010101", + "orchestration_status": "activated", + "last_operation_type": "activate", + "last_operation_progress": 70 + }, + { + "service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9273", + "service_instance_name": "slicing-01-eMBB", + "service_type": "eMMB", + "service_snssai": "1-010101", + "orchestration_status": "activated", + "last_operation_type": "activate", + "last_operation_progress": 100 + } + ] + } +} \ 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 dbc9fec3..5bc81fbd 100644 --- a/usecaseui-portal/src/app/mock/routes.js +++ b/usecaseui-portal/src/app/mock/routes.js @@ -100,6 +100,11 @@ module.exports = "/uui-slicing/nsmf/resource/nssi/:environmentContext/instances/pageNo/:pageNo/pageSize/:pageSize": "/slicing_subnet_context", ///////<-------------slicing_business--------->///// "/uui-slicing/nsmf/resource/business/pageNo/:pageNo/pageSize/:pageSize": "/slicing_business_list", + "/uui-slicing/nsmf/resource/:businessStatus/business/pageNo/:pageNo/pageSize/:pageSize": "/slicing_business_list_activated", + "/PUT/uui-slicing/nsmf/resource/:serviceId/activate": "/slicing_business_activate", + "/PUT/uui-slicing/nsmf/resource/:serviceId/deactivate": "/slicing_business_activate", + "/DELETE/uui-slicing/nsmf/resource/:serviceId": "/slicing_business_activate", + "/uui-slicing/nsmf/resource/:serviceId/progress":"/getSlicingBusinessProgress", ///////<-------------general interface--------->///// "/api/*": "/$1", "/*/*": "/$1_$2", -- cgit 1.2.3-korg