From 0b5db174d96c70baa84d19b1dab579f7cdccc69d Mon Sep 17 00:00:00 2001 From: cyuamber Date: Thu, 3 Sep 2020 11:58:00 +0800 Subject: feat: Business Requirement Info Add some parameters of 5g task Change-Id: I430bf23a65ccb149e890d539badc8316793f7929 Issue-ID: USECASEUI-444 Signed-off-by: cyuamber --- .../app/mock/json/getSlicingBusinessDetail.json | 2 +- .../src/app/mock/json/slicing_task_auditInfo.json | 14 +++-- .../components/basic-info/basic-info.component.ts | 14 +++++ usecaseui-portal/src/constants/constants.ts | 64 ++++++++++++++++------ 4 files changed, 72 insertions(+), 22 deletions(-) (limited to 'usecaseui-portal/src') diff --git a/usecaseui-portal/src/app/mock/json/getSlicingBusinessDetail.json b/usecaseui-portal/src/app/mock/json/getSlicingBusinessDetail.json index 018799cd..cafeeebe 100644 --- a/usecaseui-portal/src/app/mock/json/getSlicingBusinessDetail.json +++ b/usecaseui-portal/src/app/mock/json/getSlicingBusinessDetail.json @@ -6,7 +6,7 @@ "result_body": { "business_demand_info": { "service_name": "5GSliceeMMB", - "service_snssai": "1-010101", + "service_snssai": "", "exp_data_rate_dl": "300", "exp_data_rate_ul": "300", "ue_mobility_level": "stageary", diff --git a/usecaseui-portal/src/app/mock/json/slicing_task_auditInfo.json b/usecaseui-portal/src/app/mock/json/slicing_task_auditInfo.json index 687ec521..6065be0f 100644 --- a/usecaseui-portal/src/app/mock/json/slicing_task_auditInfo.json +++ b/usecaseui-portal/src/app/mock/json/slicing_task_auditInfo.json @@ -11,17 +11,21 @@ "business_demand_info": { "service_name": "5G Slice eMMB", "service_snssai": "", - "exp_data_rate_dl": "300", - "exp_data_rate_ul": "300", "ue_mobility_level": "stationary", "latency": "20", "use_interval": "12", "coverage_area_ta_list": ["北京;北京市;海淀区", "北京;北京市;西城区", "北京;北京市;昌平区"], "activity_factor": "60", "resource_sharing_level": "shared", - "area_traffic_cap_ul": "300", - "area_traffic_cap_dl": "300", - "max_number_of_ues": "10000" + "max_number_of_ues": "10000", + "uLThptPerUE":"1000", + "dLThptPerUE":"2000", + "uLThptPerSlice":"3000", + "dLThptPerSlice":"4000", + "maxPktSize":"10000", + "termDensity":"500", + "jitter":"10", + "survivalTime":"10" }, "nst_info": { "nst_id": "46da8cf8-0878-48ac-bea3-f2200959411a", diff --git a/usecaseui-portal/src/app/shared/components/basic-info/basic-info.component.ts b/usecaseui-portal/src/app/shared/components/basic-info/basic-info.component.ts index 538b08c5..6539bbd3 100644 --- a/usecaseui-portal/src/app/shared/components/basic-info/basic-info.component.ts +++ b/usecaseui-portal/src/app/shared/components/basic-info/basic-info.component.ts @@ -27,6 +27,20 @@ export class BasicInfoComponent implements OnInit { this.businessListAfterSorting = []; this.businessList = BUSINESS_REQUIREMENT.concat([]); if(this.businessRequirement && this.businessRequirement.length !== 0){ + let businessListkeysList = []; + this.businessList.map(ite=>{ + if(!Array.isArray(ite)){businessListkeysList.push(ite["key"])} + }) + // Filter the difference between the local businessList and the requirement data returned by the backend. + // When the key is missing in the data returned by the backend, the local businessList data is deleted and filtered + let filterSubtractionKeysList = businessListkeysList.filter(item=>Object.keys(this.businessRequirement[0]).indexOf(item)==-1); + filterSubtractionKeysList.map(key=>{ + this.businessList.map((item,k)=>{ + if(Array.isArray(item) === false && item["key"] === key){ + this.businessList.splice(k,1) + } + }) + }); Object.keys(this.businessRequirement[0]).map((item,index)=>{ if(this.businessRequirement[0][item] !== '' && this.businessRequirement[0][item] !== null){ this.requirement[0][item] = this.businessRequirement[0][item]; diff --git a/usecaseui-portal/src/constants/constants.ts b/usecaseui-portal/src/constants/constants.ts index 9d5554d8..2d8abd9f 100644 --- a/usecaseui-portal/src/constants/constants.ts +++ b/usecaseui-portal/src/constants/constants.ts @@ -31,14 +31,14 @@ export const BUSINESS_REQUIREMENT = [ title: 'S-NSSAI', key: 'service_snssai' }, - { - title: 'Data Rate Downlink (Mbps) ', - key: 'exp_data_rate_dl' - }, - { - title: 'Data Rate Uplink (Mbps) ', - key: 'exp_data_rate_ul' - }, + // { + // title: 'Data Rate Downlink (Mbps) ', + // key: 'exp_data_rate_dl' + // }, + // { + // title: 'Data Rate Uplink (Mbps) ', + // key: 'exp_data_rate_ul' + // }, { title: 'Mobility', key: 'ue_mobility_level' @@ -64,14 +64,46 @@ export const BUSINESS_REQUIREMENT = [ title: 'Max Number of UEs', key: 'max_number_of_ues' }, - { - title: 'Uplink Regional Traffic Density（Mbps/km ）', - key: 'area_traffic_cap_ul' - }, - { - title: 'Downlink Regional Traffic Density（Mbps/km ）', - key: 'area_traffic_cap_dl' - }, + // { + // title: 'Uplink Regional Traffic Density（Mbps/km ）', + // key: 'area_traffic_cap_ul' + // }, + // { + // title: 'Downlink Regional Traffic Density（Mbps/km ）', + // key: 'area_traffic_cap_dl' + // }, + { + title: 'Uplink throughput per UE', + key: 'uLThptPerUE' + }, + { + title: 'Downlink throughput per UE', + key: 'dLThptPerUE' + }, + { + title: 'Uplink throughput per network slice', + key: 'uLThptPerSlice' + }, + { + title: 'Downlink throughput per network slice', + key: 'dLThptPerSlice' + }, + { + title: 'Maximum Number of Connections', + key: 'maxPktSize' + }, + { + title: 'Terminal density', + key: 'termDensity' + }, + { + title: 'Jitter', + key: 'jitter' + }, + { + title: 'SurvivalTime', + key: 'survivalTime' + }, [ { title: 'Area', -- cgit