From 39aa34b0431e6dc2946b95ae40df5466a3c19d72 Mon Sep 17 00:00:00 2001 From: cyuamber Date: Fri, 6 Dec 2019 09:36:55 +0800 Subject: feat: add slicing nsi basic business code of nsi page Change-Id: I85ceaad153cf4dd9b9c3d4e6db9d9ce4cf6af4bf Issue-ID: USECASEUI-369 Signed-off-by: cyuamber --- .../src/app/mock/json/slicing_business_list.json | 22 ++--- .../src/app/mock/json/slicing_instance.json | 22 ----- .../src/app/mock/json/slicing_nsi_list.json | 95 ++++++++++++++++++++++ .../app/mock/json/slicing_nsi_list_activated.json | 67 +++++++++++++++ usecaseui-portal/src/app/mock/routes.js | 11 ++- 5 files changed, 180 insertions(+), 37 deletions(-) delete mode 100644 usecaseui-portal/src/app/mock/json/slicing_instance.json create mode 100644 usecaseui-portal/src/app/mock/json/slicing_nsi_list.json create mode 100644 usecaseui-portal/src/app/mock/json/slicing_nsi_list_activated.json (limited to 'usecaseui-portal/src/app/mock') 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 8291efbf..46201850 100644 --- a/usecaseui-portal/src/app/mock/json/slicing_business_list.json +++ b/usecaseui-portal/src/app/mock/json/slicing_business_list.json @@ -4,7 +4,7 @@ "result_message": "5G slicing service instances query result." }, "result_body": { - "record_number": 2, + "record_number": 14, "slicing_business_list": [ { "service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9265", @@ -31,7 +31,7 @@ "service_snssai": "1-010101", "orchestration_status": "activated", "last_operation_type": "activate", - "last_operation_progress": 100 + "last_operation_progress": 10 }, { "service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9270", @@ -58,7 +58,7 @@ "service_snssai": "1-010101", "orchestration_status": "deactivated", "last_operation_type": "deactivate", - "last_operation_progress": 70 + "last_operation_progress": 100 }, { "service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9273", @@ -67,7 +67,7 @@ "service_snssai": "1-010101", "orchestration_status": "deactivated", "last_operation_type": "deactivate", - "last_operation_progress": 50 + "last_operation_progress": 100 }, { "service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9274", @@ -76,7 +76,7 @@ "service_snssai": "1-010101", "orchestration_status": "activated", "last_operation_type": "activate", - "last_operation_progress": 70 + "last_operation_progress": 100 }, { "service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9275", @@ -94,7 +94,7 @@ "service_snssai": "1-010101", "orchestration_status": "activated", "last_operation_type": "activate", - "last_operation_progress": 70 + "last_operation_progress": 100 }, { "service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9277", @@ -103,7 +103,7 @@ "service_snssai": "1-010101", "orchestration_status": "activated", "last_operation_type": "activate", - "last_operation_progress": 70 + "last_operation_progress": 100 }, { "service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9278", @@ -112,7 +112,7 @@ "service_snssai": "1-010101", "orchestration_status": "activated", "last_operation_type": "activate", - "last_operation_progress": 70 + "last_operation_progress": 100 }, { "service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9279", @@ -121,7 +121,7 @@ "service_snssai": "1-010101", "orchestration_status": "activated", "last_operation_type": "activate", - "last_operation_progress": 70 + "last_operation_progress": 100 }, { "service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9280", @@ -130,7 +130,7 @@ "service_snssai": "1-010101", "orchestration_status": "activated", "last_operation_type": "activate", - "last_operation_progress": 70 + "last_operation_progress": 100 }, { "service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9281", @@ -139,7 +139,7 @@ "service_snssai": "1-010101", "orchestration_status": "activated", "last_operation_type": "activate", - "last_operation_progress": 70 + "last_operation_progress": 100 } ] } diff --git a/usecaseui-portal/src/app/mock/json/slicing_instance.json b/usecaseui-portal/src/app/mock/json/slicing_instance.json deleted file mode 100644 index 11c7f7bf..00000000 --- a/usecaseui-portal/src/app/mock/json/slicing_instance.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "result_header": { - "result_code": "200", - "result_message": "5G slicing NSI service instances result." - }, - "result_body": { - "record_number": 2, - "nsi_service_instances": [ - { - "service_instance_order": "1", - "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959411a", - "service_instance_name": "eMBB instancel" - }, - { - "service_instance_order": "2", - "service_instance_id": "46da8cf8-0878-48bc-bea3-f2200959411a", - "service_instance_name": "eMBB instance2" - } - ] - } -} - diff --git a/usecaseui-portal/src/app/mock/json/slicing_nsi_list.json b/usecaseui-portal/src/app/mock/json/slicing_nsi_list.json new file mode 100644 index 00000000..63a26f5c --- /dev/null +++ b/usecaseui-portal/src/app/mock/json/slicing_nsi_list.json @@ -0,0 +1,95 @@ +{ + "result_header": { + "result_code": "200", + "result_message": "5G slicing NSI service instances result." + }, + "result_body": { + "record_number": 12, + "nsi_service_instances": [ + { + "service_instance_order": "1", + "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959411a", + "service_instance_name": "eMBB instancel", + "service_type":"eMBB", + "orchestration_status": "activated" + }, + { + "service_instance_order": "2", + "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959412a", + "service_instance_name": "eMBB instancel", + "service_type":"eMBB", + "orchestration_status": "deactivated" + }, + { + "service_instance_order": "3", + "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959413a", + "service_instance_name": "eMBB instancel", + "service_type":"eMBB", + "orchestration_status": "activated" + }, + { + "service_instance_order": "4", + "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959414a", + "service_instance_name": "eMBB instancel", + "service_type":"eMBB", + "orchestration_status": "deactivated" + }, + { + "service_instance_order": "5", + "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959415a", + "service_instance_name": "eMBB instancel", + "service_type":"eMBB", + "orchestration_status": "activated" + }, + { + "service_instance_order": "6", + "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959416a", + "service_instance_name": "eMBB instancel", + "service_type":"eMBB", + "orchestration_status": "deactivated" + }, + { + "service_instance_order": "7", + "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959417a", + "service_instance_name": "eMBB instancel", + "service_type":"eMBB", + "orchestration_status": "activated" + }, + { + "service_instance_order": "8", + "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959418a", + "service_instance_name": "eMBB instancel", + "service_type":"eMBB", + "orchestration_status": "deactivated" + }, + { + "service_instance_order": "9", + "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959419a", + "service_instance_name": "eMBB instancel", + "service_type":"eMBB", + "orchestration_status": "activated" + }, + { + "service_instance_order": "10", + "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959420a", + "service_instance_name": "eMBB instancel", + "service_type":"eMBB", + "orchestration_status": "deactivated" + }, + { + "service_instance_order": "11", + "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959421a", + "service_instance_name": "eMBB instancel", + "service_type":"eMBB", + "orchestration_status": "activated" + }, + { + "service_instance_order": "12", + "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959422a", + "service_instance_name": "eMBB instancel", + "service_type":"eMBB", + "orchestration_status": "deactivated" + } + ] + } +} \ No newline at end of file diff --git a/usecaseui-portal/src/app/mock/json/slicing_nsi_list_activated.json b/usecaseui-portal/src/app/mock/json/slicing_nsi_list_activated.json new file mode 100644 index 00000000..327352c8 --- /dev/null +++ b/usecaseui-portal/src/app/mock/json/slicing_nsi_list_activated.json @@ -0,0 +1,67 @@ +{ + "result_header": { + "result_code": "200", + "result_message": "5G slicing NSI service instances result." + }, + "result_body": { + "record_number":8, + "nsi_service_instances": [ + { + "service_instance_order": "1", + "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959411a", + "service_instance_name": "eMBB instancel", + "nsi_type":"eMBB", + "nsi_orchestration-status": "activated" + }, + { + "service_instance_order": "2", + "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959413a", + "service_instance_name": "eMBB instancel", + "nsi_type":"eMBB", + "nsi_orchestration-status": "activated" + }, + { + "service_instance_order": "3", + "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959415a", + "service_instance_name": "eMBB instancel", + "nsi_type":"eMBB", + "nsi_orchestration-status": "activated" + }, + { + "service_instance_order": "4", + "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959415a", + "service_instance_name": "eMBB instancel", + "nsi_type":"eMBB", + "nsi_orchestration-status": "activated" + }, + { + "service_instance_order": "5", + "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959415a", + "service_instance_name": "eMBB instancel", + "nsi_type":"eMBB", + "nsi_orchestration-status": "activated" + }, + { + "service_instance_order": "6", + "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959417a", + "service_instance_name": "eMBB instancel", + "nsi_type":"eMBB", + "nsi_orchestration-status": "activated" + }, + { + "service_instance_order": "7", + "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959419a", + "service_instance_name": "eMBB instancel", + "nsi_type":"eMBB", + "nsi_orchestration-status": "activated" + }, + { + "service_instance_order": "8", + "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959421a", + "service_instance_name": "eMBB instancel", + "nsi_type":"eMBB", + "nsi_orchestration-status": "activated" + } + ] + } +} \ 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 9e7f2aeb..d57d9982 100644 --- a/usecaseui-portal/src/app/mock/routes.js +++ b/usecaseui-portal/src/app/mock/routes.js @@ -95,7 +95,7 @@ module.exports = "/uui-slicing/nsmf/task/business/pageNo/:pageNo/pageSize/:pageSize": "/slicing_task_list", "/uui-slicing/nsmf/task/:processingStatus/business/pageNo/:pageNo/pageSize/:pageSize": "/slicing_task_processing_status", "/uui-slicing/nsmf/task/:taskId/auditInfo": "/slicing_task_auditInfo", - "/uui-slicing/nsmf/resource/nsi/instances/pageNo/:pageNo/pageSize/:pageSize": "/slicing_instance", + "/uui-slicing/nsmf/resource/nsi/instances/pageNo/:pageNo/pageSize/:pageSize": "/slicing_nsi_list", "/uui-slicing/nsmf/resource/nsi/:nsiId/nssiInstances": "/slicing_subnet_instance", "/uui-slicing/nsmf/resource/nssi/:environmentContext/instances/pageNo/:pageNo/pageSize/:pageSize": "/slicing_subnet_context", "/uui-slicing/nsmf/task/:taskId/taskCreationInfo": "/slicing_taskCreationInfo", @@ -104,10 +104,13 @@ module.exports = ///////<-------------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/activate": "/slicing_business_activate", + "/uui-slicing/nsmf/resource/:serviceId/deactivate": "/slicing_business_activate", + "/uui-slicing/nsmf/resource/:serviceId": "/slicing_business_activate", "/uui-slicing/nsmf/resource/:serviceId/progress":"/getSlicingBusinessProgress", + ///////<-------------slicing_nsi--------->///// + // "/uui-slicing/nsmf/resource/nsi/instances/pageNo/:pageNo/pageSize/:pageSize": "/slicing_nsi_list", + "/uui-slicing/nsmf/resource/nsi/:instanceStatus/instances/pageNo/:pageNo/pageSize/:pageSize": "/slicing_nsi_list_activated", ///////<-------------general interface--------->///// "/api/*": "/$1", "/*/*": "/$1_$2", -- cgit 1.2.3-korg