feat: Modify the parameters of an/cn 5Gslicing tast

Change-Id: I42b8457276e2f22269a8d044d63e6d3cd42619ba
Issue-ID: USECASEUI-442
Signed-off-by: cyuamber <xuranyjy@chinamobile.com>

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 d931854..b975672 100644 (file)
--- a/usecaseui-portal/src/app/mock/json/slicing_task_auditInfo.json
+++ b/usecaseui-portal/src/app/mock/json/slicing_task_auditInfo.json
@@ -32,8 +32,20 @@
             "suggest_nsi_name": "eMBB instance1",\r
             "an_suggest_nssi_id": "46da8cf8-0878-48ac-bea3-f2200959411a",\r
             "an_suggest_nssi_name": "eMBB ANinstance1",\r
+            "an_service_snssai": "an_1-010101",\r
+            "an_resource_sharing_level": "shared",\r
+            "an_ue_mobility_level": "stationary",\r
             "an_latency": "10",\r
-            "an_5qi": "8",\r
+            "an_max_number_of_ues": "10000",\r
+            "an_activity_factor": "60",\r
+            "an_exp_data_rate_dl": "300",\r
+            "an_exp_data_rate_ul": "300",\r
+            "an_area_traffic_cap_dl": "300",\r
+            "an_area_traffic_cap_ul": "300",\r
+            "an_overalluser_density":"test_an_overalluser_density_01",\r
+            "an_ip_address":"test_cn_ip_address_01",\r
+            "an_logical_link":"test_cn_logical_link_01",\r
+            "an_nexthop_info":"test_cn_nexthop_info_01",\r
             "an_script_name":"test_an_01",\r
             "an_coverage_area_ta_list": ["北京;北京市;海淀区", "北京;北京市;西城区", "北京;北京市;昌平区"],\r
             "tn_suggest_nssi_id": "46da8cf8-0878-48ac-bea3-f2200959411b",\r
@@ -45,7 +57,7 @@
             "tn_service_snssai":"test_tn_service_snssai_01",\r
             "cn_suggest_nssi_id": "46da8cf8-0878-48ac-bea3-f2200959411c",\r
             "cn_suggest_nssi_name": "eMBB CNinstance3",\r
-            "cn_service_snssai": "1-010101",\r
+            "cn_service_snssai": "cn_1-010101",\r
             "cn_resource_sharing_level": "shared",\r
             "cn_ue_mobility_level": "stationary",\r
             "cn_latency": "10",\r

diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-management.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-management.component.ts
index 3ad730f..0f530d7 100644 (file)
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-management.component.ts
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-management.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit, HostBinding } from '@angular/core';
-import { slideToRight } from '../../../shared/utils/animates';
+import { slideToRight } from '@src/app/shared/utils/animates';
 
 @Component({
   selector: 'app-slicing-management',

diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.ts
index d5cda96..34cd445 100644 (file)
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.ts
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-management.component.ts
@@ -1,7 +1,7 @@
 import {Component, OnInit, Input, SimpleChanges} from '@angular/core';
 import { NzMessageService } from 'ng-zorro-antd';
-import { SlicingTaskServices } from '.././../../../core/services/slicingTaskServices';
-import { TASK_PROCESSING_STATUS } from '../../../../../constants/constants';
+import { SlicingTaskServices } from '@src/app/core/services/slicingTaskServices';
+import { TASK_PROCESSING_STATUS } from '@src/constants/constants';
 
 @Component({
   selector: 'app-slicing-task-management',

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 4c60cd9..7868114 100644 (file)
--- 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
@@ -1,6 +1,6 @@
 import { Component, OnInit, Input, Output, EventEmitter, ViewChild } from '@angular/core';
 import { NzMessageService } from 'ng-zorro-antd';
-import { SlicingTaskServices } from '../../../../../core/services/slicingTaskServices';
+import { SlicingTaskServices } from '@src/app/core/services/slicingTaskServices';
 
 @Component({
   selector: 'app-slicing-task-model',
@@ -143,11 +143,26 @@ export class SlicingTaskModelComponent implements OnInit {
         let subnetData = this.pick(nsi_nssi_info, ['an_suggest_nssi_id', 'an_suggest_nssi_name', 'tn_suggest_nssi_id', 'tn_suggest_nssi_name', 'cn_suggest_nssi_id', 'cn_suggest_nssi_name']);
         this.subnetDataFormatting(subnetData, 0);
         // 前端模拟数据
-        let area = ["Beijing;Beijing;Haidian District", "Beijing;Beijing;Xicheng District", "Beijing;Beijing;Changping District"]
-        // this.slicingSubnet[0].params = { an_latency, an_5qi, an_coverage_area_ta_list } 
-        // this.slicingSubnet[0].params = { an_latency, an_5qi, an_script_name, an_coverage_area_ta_list: area }
+        let area = ["Beijing;Beijing;Haidian District", "Beijing;Beijing;Xicheng District", "Beijing;Beijing;Changping District"];
+        this.slicingSubnet[0].params = {...this.pick(nsi_nssi_info, [
+                'an_service_snssai',
+                'an_resource_sharing_level',
+                'an_ue_mobility_level',
+                'an_latency',
+                'an_max_number_of_ues',
+                'an_activity_factor',
+                'an_exp_data_rate_dl',
+                'an_exp_data_rate_ul',
+                'an_area_traffic_cap_dl',
+                'an_area_traffic_cap_ul',
+                'an_script_name',
+                'an_overalluser_density',
+                // an_ip_address,
+                // an_logical_link,
+                // an_nexthop_info,
+            ]), 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[0].params = this.slicingSubnet[2].params = {...this.pick(nsi_nssi_info, [
+        this.slicingSubnet[2].params = {...this.pick(nsi_nssi_info, [
           'cn_service_snssai',
           'cn_resource_sharing_level',
           'cn_ue_mobility_level',

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 990e563..552523c 100644 (file)
--- 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
@@ -1,39 +1,6 @@
 <nz-modal [(nzVisible)]="showModel" [nzTitle]="title + 'Parameter'" (nzOnCancel)="handleCancel()" (nzOnOk)="handleOk()"
        nzWidth="700px">
        <div class="subnet_params_container">
-               <!--<form nz-form *ngIf="title === 'An'">-->
-                       <!--<nz-form-item *ngFor="let item of wirelessFormItems">-->
-                               <!--<nz-form-label [nzSpan]="6" nzRequired [nzFor]="item.key">-->
-                                       <!--{{ item.title }}-->
-                               <!--</nz-form-label>-->
-                               <!--<nz-form-control [nzSpan]="10" *ngIf="item.key !== 'an_coverage_area_ta_list'">-->
-                                       <!--<input nz-input [(ngModel)]="detailData[item.key]" [name]="item.key" [id]="item.key" />-->
-                               <!--</nz-form-control>-->
-                               <!--<div *ngIf="item.key === 'an_coverage_area_ta_list'">-->
-                                       <!--<div *ngFor="let area of areaList; let i = index">-->
-                                               <!--<nz-form-control [nzSpan]="!ind ? 4 : 5" [nzOffset]="i && !ind ? 6 : 0" class="subnet_params_area"-->
-                                                       <!--*ngFor="let item of area; let ind = index">-->
-                                                       <!--<nz-select [(ngModel)]="item.selected" [name]="'area' + i + ind"-->
-                                                               <!--(nzOpenChange)="handleChange(area, item)"-->
-                                                               <!--(ngModelChange)=" handleChangeSelected(area, item) ">-->
-                                                               <!--<nz-option [nzValue]="op.name" [nzLabel]="op.name" *ngFor="let op of item.options">-->
-                                                               <!--</nz-option>-->
-                                                       <!--</nz-select>-->
-                                               <!--</nz-form-control>-->
-                                               <!--<nz-form-control [nzSpan]="1" [nzOffset]="1">-->
-                                                       <!--<button nz-button nzType="primary" nzSize="small" class="subnet_params_button" *ngIf="!i"-->
-                                                               <!--(click)="creatAreaList()">-->
-                                                               <!--<i nz-icon class="anticon anticon-plus subnet_params_icon"></i>-->
-                                                       <!--</button>-->
-                                                       <!--<button nz-button nzType="primary" nzSize="small" class="subnet_params_button" *ngIf="i"-->
-                                                               <!--(click)="deleteAreaList(i)">-->
-                                                               <!--<i nz-icon class="anticon anticon-minus subnet_params_icon"></i>-->
-                                                       <!--</button>-->
-                                               <!--</nz-form-control>-->
-                                       <!--</div>-->
-                               <!--</div>-->
-                       <!--</nz-form-item>-->
-               <!--</form>-->
                <form nz-form *ngIf="title === 'Tn'">
                        <nz-form-item *ngFor="let item of transferFormItems">
                                <nz-form-label [nzSpan]="7" nzRequired [nzFor]="item.key">
@@ -52,7 +19,7 @@
                </form>
                <form nz-form *ngIf="title === 'An' || title === 'Cn'">
                        <nz-form-item *ngFor="let item of coreFormItems">
-                               <nz-form-label [nzSpan]="(item.key === 'an_coverage_area_ta_list' && title === 'An')?7:13" nzRequired *ngIf="!(item.key === 'an_coverage_area_ta_list' && title === 'Cn')">
+                               <nz-form-label [nzSpan]="(item.key === 'an_coverage_area_ta_list' && title === 'An')?7:13" nzRequired>
                                        {{ item.title }}
                                </nz-form-label>
                                <nz-form-control [nzSpan]="8" *ngIf="item.key !== 'an_coverage_area_ta_list'">

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 a0b5df2..d279d03 100644 (file)
--- 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 { WIRELESS_FORM_ITEMS, TRANSFRER_FORM_ITEMS, CORE_FORM_ITEMS, ADDRESS } from '@src/constants/constants'
+import { TRANSFRER_FORM_ITEMS, CORE_FORM_ITEMS, ADDRESS } from '@src/constants/constants'
 
 @Component({
        selector: 'app-subnet-params-model',
@@ -15,8 +15,7 @@ export class SubnetParamsModelComponent implements OnInit {
        @Output() paramsDataChange = new EventEmitter<any>();
 
        transferFormItems = TRANSFRER_FORM_ITEMS;
-       coreFormItems = CORE_FORM_ITEMS;
-       wirelessFormItems = WIRELESS_FORM_ITEMS;
+       coreFormItems :object ={};
        areaList: any[] = [];
 
        constructor() { }
@@ -24,6 +23,7 @@ export class SubnetParamsModelComponent implements OnInit {
        ngOnInit() { }
 
        ngOnChanges() {
+        this.coreFormItems = this.title === 'An'?CORE_FORM_ITEMS.An:CORE_FORM_ITEMS.Cn;
                if (this.title === 'An') {
                        this.AreaFormatting();
                }

diff --git a/usecaseui-portal/src/constants/constants.ts b/usecaseui-portal/src/constants/constants.ts
index dea02d3..8d8af35 100644 (file)
--- a/usecaseui-portal/src/constants/constants.ts
+++ b/usecaseui-portal/src/constants/constants.ts
@@ -89,24 +89,6 @@ export const BUSINESS_REQUIREMENT = [
 \r
 ]\r
 \r
-export const WIRELESS_FORM_ITEMS = [\r
-       {\r
-               title: 'Latency (ms)',\r
-               key: 'an_latency'\r
-       },\r
-       {\r
-               title: '5QI',\r
-               key: 'an_5qi'\r
-       },\r
-    {\r
-        title: 'Script Name',\r
-        key: 'an_script_name'\r
-    },\r
-       {\r
-               title: 'Coverage Area Ta List',\r
-               key: 'an_coverage_area_ta_list'\r
-       }\r
-]\r
 \r
 export const TRANSFRER_FORM_ITEMS = [\r
     {\r
@@ -131,100 +113,192 @@ export const TRANSFRER_FORM_ITEMS = [
     },\r
 ]\r
 \r
-export const CORE_FORM_ITEMS = [\r
-       {\r
-               title: 'S-NSSAI',\r
-               key: 'cn_service_snssai'\r
-       },\r
-       {\r
-               title: 'Resource Sharing Level',\r
-               key: 'cn_resource_sharing_level',\r
-               options: [\r
-                       {\r
-                               title: 'Shared',\r
-                               key: 'shared'\r
-                       },\r
-                       {\r
-                               title: 'Non-shared',\r
-                               key: 'non-shared'\r
-                       }\r
-               ]\r
-       },\r
-       {\r
-               title: 'Mobility',\r
-               key: 'cn_ue_mobility_level',\r
-               options: [\r
-                       {\r
-                               title: 'Stationary',\r
-                               key: 'stationary'\r
-                       },\r
-                       {\r
-                               title: 'Nomadic',\r
-                               key: 'nomadic'\r
-                       },\r
-                       {\r
-                               title: 'Spatially Restricted Mobility',\r
-                               key: 'spatially restricted mobility'\r
-                       },\r
-                       {\r
-                               title: 'Fully Mobility',\r
-                               key: 'fully mobility'\r
-                       }\r
-               ]\r
-       },\r
-       {\r
-               title: 'Latency (ms)',\r
-               key: 'cn_latency'\r
-       },\r
-       {\r
-               title: 'Max Number of UEs',\r
-               key: 'cn_max_number_of_ues'\r
-       },\r
-       {\r
-               title: 'Activity Factor (%)',\r
-               key: 'cn_activity_factor'\r
-       },\r
-       {\r
-               title: 'User Downlink Experience Rate（Mbps）',\r
-               key: 'cn_exp_data_rate_dl'\r
-       },\r
-       {\r
-               title: 'User Uplink Experience Rate（Mbps）',\r
-               key: 'cn_exp_data_rate_ul'\r
-       },\r
-       {\r
-               title: 'Downlink Regional Traffic Density（Mbps/km ）',\r
-               key: 'cn_area_traffic_cap_dl'\r
-       },\r
-       {\r
-               title: 'Uplink Regional Traffic Density（Mbps/km ）',\r
-               key: 'cn_area_traffic_cap_ul'\r
-       },\r
-    {\r
-        title: 'Script Name',\r
-        key: 'cn_script_name'\r
-    },\r
-    {\r
-        title: 'overallUserDensity',\r
-        key: 'cn_overalluser_density'\r
-    },\r
-    // {\r
-    //     title: 'IP Address',\r
-    //     key: 'cn_ip_address'\r
-    // },\r
-    // {\r
-    //     title: 'Logical Link',\r
-    //     key: 'cn_logical_link'\r
-    // },\r
-    // {\r
-    //     title: 'Nexthop Info',\r
-    //     key: 'cn_nexthop_info'\r
-    // },\r
-    {\r
-        title: 'Coverage Area Ta List',\r
-        key: 'an_coverage_area_ta_list'\r
-    }\r
-]\r
+export const CORE_FORM_ITEMS = {\r
+    "An": [\r
+        {\r
+            title: 'S-NSSAI',\r
+            key: 'an_service_snssai'\r
+        },\r
+        {\r
+            title: 'Resource Sharing Level',\r
+            key: 'an_resource_sharing_level',\r
+            options: [\r
+                {\r
+                    title: 'Shared',\r
+                    key: 'shared'\r
+                },\r
+                {\r
+                    title: 'Non-shared',\r
+                    key: 'non-shared'\r
+                }\r
+            ]\r
+        },\r
+        {\r
+            title: 'Mobility',\r
+            key: 'an_ue_mobility_level',\r
+            options: [\r
+                {\r
+                    title: 'Stationary',\r
+                    key: 'stationary'\r
+                },\r
+                {\r
+                    title: 'Nomadic',\r
+                    key: 'nomadic'\r
+                },\r
+                {\r
+                    title: 'Spatially Restricted Mobility',\r
+                    key: 'spatially restricted mobility'\r
+                },\r
+                {\r
+                    title: 'Fully Mobility',\r
+                    key: 'fully mobility'\r
+                }\r
+            ]\r
+        },\r
+        {\r
+            title: 'Latency (ms)',\r
+            key: 'an_latency'\r
+        },\r
+        {\r
+            title: 'Max Number of UEs',\r
+            key: 'an_max_number_of_ues'\r
+        },\r
+        {\r
+            title: 'Activity Factor (%)',\r
+            key: 'an_activity_factor'\r
+        },\r
+        {\r
+            title: 'User Downlink Experience Rate（Mbps）',\r
+            key: 'an_exp_data_rate_dl'\r
+        },\r
+        {\r
+            title: 'User Uplink Experience Rate（Mbps）',\r
+            key: 'an_exp_data_rate_ul'\r
+        },\r
+        {\r
+            title: 'Downlink Regional Traffic Density（Mbps/km ）',\r
+            key: 'an_area_traffic_cap_dl'\r
+        },\r
+        {\r
+            title: 'Uplink Regional Traffic Density（Mbps/km ）',\r
+            key: 'an_area_traffic_cap_ul'\r
+        },\r
+        {\r
+            title: 'Script Name',\r
+            key: 'an_script_name'\r
+        },\r
+        {\r
+            title: 'overallUserDensity',\r
+            key: 'an_overalluser_density'\r
+        },\r
+        // {\r
+        //     title: 'IP Address',\r
+        //     key: 'an_ip_address'\r
+        // },\r
+        // {\r
+        //     title: 'Logical Link',\r
+        //     key: 'an_logical_link'\r
+        // },\r
+        // {\r
+        //     title: 'Nexthop Info',\r
+        //     key: 'an_nexthop_info'\r
+        // },\r
+        {\r
+            title: 'Coverage Area Ta List',\r
+            key: 'an_coverage_area_ta_list'\r
+        }\r
+    ],\r
+    "Cn": [\r
+        {\r
+            title: 'S-NSSAI',\r
+            key: 'cn_service_snssai'\r
+        },\r
+        {\r
+            title: 'Resource Sharing Level',\r
+            key: 'cn_resource_sharing_level',\r
+            options: [\r
+                {\r
+                    title: 'Shared',\r
+                    key: 'shared'\r
+                },\r
+                {\r
+                    title: 'Non-shared',\r
+                    key: 'non-shared'\r
+                }\r
+            ]\r
+        },\r
+        {\r
+            title: 'Mobility',\r
+            key: 'cn_ue_mobility_level',\r
+            options: [\r
+                {\r
+                    title: 'Stationary',\r
+                    key: 'stationary'\r
+                },\r
+                {\r
+                    title: 'Nomadic',\r
+                    key: 'nomadic'\r
+                },\r
+                {\r
+                    title: 'Spatially Restricted Mobility',\r
+                    key: 'spatially restricted mobility'\r
+                },\r
+                {\r
+                    title: 'Fully Mobility',\r
+                    key: 'fully mobility'\r
+                }\r
+            ]\r
+        },\r
+        {\r
+            title: 'Latency (ms)',\r
+            key: 'cn_latency'\r
+        },\r
+        {\r
+            title: 'Max Number of UEs',\r
+            key: 'cn_max_number_of_ues'\r
+        },\r
+        {\r
+            title: 'Activity Factor (%)',\r
+            key: 'cn_activity_factor'\r
+        },\r
+        {\r
+            title: 'User Downlink Experience Rate（Mbps）',\r
+            key: 'cn_exp_data_rate_dl'\r
+        },\r
+        {\r
+            title: 'User Uplink Experience Rate（Mbps）',\r
+            key: 'cn_exp_data_rate_ul'\r
+        },\r
+        {\r
+            title: 'Downlink Regional Traffic Density（Mbps/km ）',\r
+            key: 'cn_area_traffic_cap_dl'\r
+        },\r
+        {\r
+            title: 'Uplink Regional Traffic Density（Mbps/km ）',\r
+            key: 'cn_area_traffic_cap_ul'\r
+        },\r
+        {\r
+            title: 'Script Name',\r
+            key: 'cn_script_name'\r
+        },\r
+        {\r
+            title: 'overallUserDensity',\r
+            key: 'cn_overalluser_density'\r
+        },\r
+        // {\r
+        //     title: 'IP Address',\r
+        //     key: 'an_ip_address'\r
+        // },\r
+        // {\r
+        //     title: 'Logical Link',\r
+        //     key: 'an_logical_link'\r
+        // },\r
+        // {\r
+        //     title: 'Nexthop Info',\r
+        //     key: 'an_nexthop_info'\r
+        // }\r
+        ]\r
+}\r
 \r
 export const ADDRESS = [\r
        {\r