summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwangyuerg <wangyuerg@chinamobile.com>2021-02-25 11:13:32 +0800
committerwangyuerg <wangyuerg@chinamobile.com>2021-02-25 11:13:46 +0800
commit8d6734e110808243f8f5ffd3b1e18336df4bd9aa (patch)
treefd55df174e2f6c3dd49b8c04e3be775c8fab09ff
parent89ba33ee3891f7ebe40b529c5ecf39d263440390 (diff)
style: update the name of the filed
Signed-off-by: wangyuerg <wangyuerg@chinamobile.com> Change-Id: I904c96593712fd3aa3d8429186ce9ee0bc5121a9 Issue-ID: USECASEUI-527
-rw-r--r--usecaseui-portal/src/app/mock/json/slicing_task_auditInfo.json2
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/slicing-task-model.component.ts2
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/constants.ts2
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.ts30
4 files changed, 20 insertions, 16 deletions
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 03f3aed5..f0c07c34 100644
--- a/usecaseui-portal/src/app/mock/json/slicing_task_auditInfo.json
+++ b/usecaseui-portal/src/app/mock/json/slicing_task_auditInfo.json
@@ -70,7 +70,7 @@
"sliceProfile_TN_BH_sST": "test_sliceProfile_TN_BH _sST",
"sliceProfile_TN_BH_sNSSAI": "test_tn_service_snssai_01",
"sliceProfile_TN_resourceSharingLevel": "shared",
- "tn_connection_links": "233errt4545",
+ "sliceProfile_TN_connection_links": "233errt4545",
"tn_bh_enableNSSISelection": false,
"cn_suggest_nssi_id": "46da8cf8-0878-48ac-bea3-f2200959411c",
"cn_suggest_nssi_name": "eMBB CNinstance3",
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 e735e0dc..c6d75a30 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
@@ -234,7 +234,7 @@ export class SlicingTaskModelComponent implements OnInit {
"sliceProfile_AN_ipAddress",
"sliceProfile_AN_logicInterfaceId",
"sliceProfile_AN_nextHopInfo",
- "tn_connection_links",
+ "sliceProfile_TN_connection_links",
]);
this.slicingSubnet[2].params = {
...this.pick(nsi_nssi_info, [
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/constants.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/constants.ts
index 0e0e5503..5667144a 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/constants.ts
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/constants.ts
@@ -57,7 +57,7 @@ export const TRANSFRER_FORM_ITEMS = [
},
{
title: "Connection Links", // table
- key: "tn_connection_links", // :new
+ key: "sliceProfile_TN_connection_links", // :new
required: false, // combined
type: "table-radio",
disable: false,
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 6354f91e..83d16a62 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
@@ -44,7 +44,7 @@ export class SubnetParamsModelComponent implements OnInit {
"CN Endpoint",
];
// Parameters not passed to the back end
- notPassPara: string[] = ["tn_connection_links"];
+ notPassPara: string[] = ["sliceProfile_TN_connection_links"];
connectionLinkTable: any[] = [];
connectionTableHeader: string[] = [];
pageSize: number = 2;
@@ -131,10 +131,12 @@ export class SubnetParamsModelComponent implements OnInit {
this.connectionLinkTable.forEach((item) => {
if (
item.hasOwnProperty("linkId") &&
- typeof this.formData["tn_connection_links"] !== "undefined" &&
- this.formData["tn_connection_links"] !== "" &&
- this.formData["tn_connection_links"] !== null &&
- item["linkId"] === this.formData["tn_connection_links"]
+ typeof this.formData["sliceProfile_TN_connection_links"] !==
+ "undefined" &&
+ this.formData["sliceProfile_TN_connection_links"] !== "" &&
+ this.formData["sliceProfile_TN_connection_links"] !== null &&
+ item["linkId"] ===
+ this.formData["sliceProfile_TN_connection_links"]
) {
item.checked = true;
} else {
@@ -269,8 +271,8 @@ export class SubnetParamsModelComponent implements OnInit {
// this.connectionLinkTable.forEach((item) => {
// item.checked = false;
// });
- // this.formData["tn_connection_links"] = null;
- this.notPassPara = ["tn_connection_links"];
+ // this.formData["sliceProfile_TN_connection_links"] = null;
+ this.notPassPara = ["sliceProfile_TN_connection_links"];
this.transferFormItems.forEach((item) => {
if (item.title === "Connection Links") {
item.disable = true;
@@ -293,10 +295,12 @@ export class SubnetParamsModelComponent implements OnInit {
item.title === "CN Endpoint"
) {
if (
- typeof this.formData["tn_connection_links"] !==
- "undefined" &&
- this.formData["tn_connection_links"] !== null &&
- this.formData["tn_connection_links"] !== ""
+ typeof this.formData[
+ "sliceProfile_TN_connection_links"
+ ] !== "undefined" &&
+ this.formData["sliceProfile_TN_connection_links"] !==
+ null &&
+ this.formData["sliceProfile_TN_connection_links"] !== ""
) {
item.disable = true;
item.required = false;
@@ -307,7 +311,7 @@ export class SubnetParamsModelComponent implements OnInit {
);
} else {
//:todo
- this.formData["tn_connection_links"] = "";
+ this.formData["sliceProfile_TN_connection_links"] = "";
item.disable = false;
item.required = true;
this.notPassPara = [];
@@ -357,7 +361,7 @@ export class SubnetParamsModelComponent implements OnInit {
item.checked = false;
}
});
- this.formData["tn_connection_links"] = id; // get the selected id
+ this.formData["sliceProfile_TN_connection_links"] = id; // get the selected id
this.judgeTn();
}