From 107f0ae0a4963682bfe8ce10ef9ba2b0f87ec8b7 Mon Sep 17 00:00:00 2001 From: cyuamber Date: Fri, 28 Aug 2020 09:06:45 +0800 Subject: feat: Three new parameters for Endpoint of An/Cn 5G slicingTast Change-Id: If29e1b67c9fcdec31950cd38d0cadba4eb55010c Issue-ID: USECASEUI-444 Signed-off-by: cyuamber --- .../slicing-task-model.component.ts | 10 +-- .../subnet-params-model.component.html | 31 ++++++++- .../subnet-params-model.component.ts | 17 ++++- usecaseui-portal/src/constants/constants.ts | 78 +++++++++++++++------- 4 files changed, 100 insertions(+), 36 deletions(-) diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/slicing-task-model.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/slicing-task-model.component.ts index 7868114d..d11f1930 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/slicing-task-model.component.ts +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/slicing-task-model.component.ts @@ -157,9 +157,7 @@ export class SlicingTaskModelComponent implements OnInit { 'an_area_traffic_cap_ul', 'an_script_name', 'an_overalluser_density', - // an_ip_address, - // an_logical_link, - // an_nexthop_info, + // 'an_Endpoint' ]), an_coverage_area_ta_list: area}; this.slicingSubnet[1].params = this.pick(nsi_nssi_info, ['tn_latency', 'tn_bandwidth', 'tn_script_name', 'tn_jitter', 'tn_service_snssai']); this.slicingSubnet[2].params = {...this.pick(nsi_nssi_info, [ @@ -175,10 +173,8 @@ export class SlicingTaskModelComponent implements OnInit { 'cn_area_traffic_cap_ul', 'cn_script_name', 'cn_overalluser_density', - // cn_ip_address, - // cn_logical_link, - // cn_nexthop_info, - ]), an_coverage_area_ta_list: area}; + // 'cn_Endpoint' + ])}; } else { this.message.error(result_message || 'Failed to get data') } diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.html b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.html index 552523c0..50b6e5ad 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.html +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.html @@ -19,13 +19,13 @@
- + {{ item.title }} - + + *ngIf=" item.title !== 'Resource Sharing Level' && item.title !== 'Mobility' && item.title !== 'Endpoint' " />
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.ts index d279d037..280d2193 100644 --- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.ts +++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; -import { TRANSFRER_FORM_ITEMS, CORE_FORM_ITEMS, ADDRESS } from '@src/constants/constants' +import { TRANSFRER_FORM_ITEMS, CORE_FORM_ITEMS, ADDRESS , NexthopInfo_Options } from '@src/constants/constants' @Component({ selector: 'app-subnet-params-model', @@ -17,6 +17,11 @@ export class SubnetParamsModelComponent implements OnInit { transferFormItems = TRANSFRER_FORM_ITEMS; coreFormItems :object ={}; areaList: any[] = []; + // 2020.08.17 Add 3 parameters for Endpoint, Comment: The following code + NexthopInfoOptions = NexthopInfo_Options; + EndpointInputs: any[] = []; + EndpointEnable: boolean = false; // Whether to enable the three parameters of Endpoint + // Comment: Above code constructor() { } @@ -24,6 +29,16 @@ export class SubnetParamsModelComponent implements OnInit { ngOnChanges() { this.coreFormItems = this.title === 'An'?CORE_FORM_ITEMS.An:CORE_FORM_ITEMS.Cn; + + // -------> 2020.08.17 Add 3 parameters for Endpoint, Comment: The following code + if(this.EndpointEnable){ + this.EndpointInputs = this.title === 'An' + ?this.detailData["an_Endpoint"] + :this.title === 'Cn' + ?this.detailData["cn_Endpoint"] + :[]; + } + //-------> Comment: Above code if (this.title === 'An') { this.AreaFormatting(); } diff --git a/usecaseui-portal/src/constants/constants.ts b/usecaseui-portal/src/constants/constants.ts index 8d8af354..3469dd93 100644 --- a/usecaseui-portal/src/constants/constants.ts +++ b/usecaseui-portal/src/constants/constants.ts @@ -191,18 +191,24 @@ export const CORE_FORM_ITEMS = { title: 'overallUserDensity', key: 'an_overalluser_density' }, - // { - // title: 'IP Address', - // key: 'an_ip_address' - // }, - // { - // title: 'Logical Link', - // key: 'an_logical_link' - // }, - // { - // title: 'Nexthop Info', - // key: 'an_nexthop_info' - // }, + { + title:'Endpoint', + key:"an_Endpoint", + options: [ + { + title: 'ip_address', + key: 'an_ip_address' + }, + { + title: 'logical_link', + key: 'an_logical_link' + }, + { + title: 'nexthop_info', + key: 'an_nexthop_info' + } + ] + }, { title: 'Coverage Area Ta List', key: 'an_coverage_area_ta_list' @@ -285,19 +291,25 @@ export const CORE_FORM_ITEMS = { title: 'overallUserDensity', key: 'cn_overalluser_density' }, - // { - // title: 'IP Address', - // key: 'an_ip_address' - // }, - // { - // title: 'Logical Link', - // key: 'an_logical_link' - // }, - // { - // title: 'Nexthop Info', - // key: 'an_nexthop_info' - // } - ] + { + title:'Endpoint', + key:"cn_Endpoint", + options: [ + { + title: 'ip_address', + key: 'cn_ip_address' + }, + { + title: 'logical_link', + key: 'cn_logical_link' + }, + { + title: 'nexthop_info', + key: 'cn_nexthop_info' + } + ] + }, + ] } export const ADDRESS = [ @@ -344,6 +356,22 @@ export const ADDRESS = [ }] } ] + +export const NexthopInfo_Options = [ + { + title:"test_info_01", + key:"test_info_01" + }, + { + title:"test_info_02", + key:"test_info_02" + }, + { + title:"test_info_03", + key:"test_info_03" + } +] + export const BUSINESS_STATUS = [ "All", "Activated", "Deactivated" ] -- cgit 1.2.3-korg