fix: modify the name of parameters

Signed-off-by: wangyuerg <wangyuerg@chinamobile.com>
Change-Id: I0bfa7deb2cd134b25aabd3ea6379c9d188748859
Issue-ID: USECASEUI-527

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 f0c07c3..1c7a740 100644 (file)
--- a/usecaseui-portal/src/app/mock/json/slicing_task_auditInfo.json
+++ b/usecaseui-portal/src/app/mock/json/slicing_task_auditInfo.json
@@ -69,7 +69,7 @@
             "sliceProfile_TN_BH_pLMNIdList": "test_sliceProfile_TN_BH_pLMNIdList",\r
             "sliceProfile_TN_BH_sST": "test_sliceProfile_TN_BH _sST",\r
             "sliceProfile_TN_BH_sNSSAI": "test_tn_service_snssai_01",\r
-            "sliceProfile_TN_resourceSharingLevel": "shared",\r
+            "sliceProfile_TN_BH_resourceSharingLevel": "shared",\r
             "sliceProfile_TN_connection_links": "233errt4545",\r
             "tn_bh_enableNSSISelection": false,\r
             "cn_suggest_nssi_id": "46da8cf8-0878-48ac-bea3-f2200959411c",\r

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 c6d75a3..93180f4 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
@@ -227,7 +227,7 @@ export class SlicingTaskModelComponent implements OnInit {
                                        "sliceProfile_TN_BH_jitte",
                                        "sliceProfile_TN_BH_sNSSAI",
                                        "tn_bh_enableNSSISelection",
-                                       "sliceProfile_TN_resourceSharingLevel",
+                                       "sliceProfile_TN_BH_resourceSharingLevel",
                                        "sliceProfile_CN_logicInterfaceId",
                                        "sliceProfile_CN_ipAddress",
                                        "sliceProfile_CN_nextHopInfo",

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 5667144..40d4083 100644 (file)
--- 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
@@ -40,7 +40,7 @@ export const TRANSFRER_FORM_ITEMS = [
        },
        {
                title: "Resource Sharing Level", // select
-               key: "sliceProfile_TN_resourceSharingLevel", // :new
+               key: "sliceProfile_TN_BH_resourceSharingLevel", // :new
                required: true,
                disable: true,
                type: "radio",
@@ -57,7 +57,7 @@ export const TRANSFRER_FORM_ITEMS = [
        },
        {
                title: "Connection Links", // table
-               key: "sliceProfile_TN_connection_links", // :new
+               key: "sliceProfile_TN_BH_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 2d2dd7f..0fb831c 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
@@ -44,7 +44,7 @@ export class SubnetParamsModelComponent implements OnInit {
                "CN Endpoint",
        ];
        // Parameters not passed to the back end
-       notPassPara: string[] = ["sliceProfile_TN_connection_links"];
+       notPassPara: string[] = ["sliceProfile_TN_BH_connection_links"];
        connectionLinkTable: any[] = [];
        connectionTableHeader: string[] = [];
        pageSize: number = 2;
@@ -134,13 +134,15 @@ export class SubnetParamsModelComponent implements OnInit {
                        this.connectionLinkTable.forEach((item) => {
                                if (
                                        item.hasOwnProperty("linkId") &&
-                                       typeof this.formData["sliceProfile_TN_connection_links"] !==
-                                               "undefined" &&
-                                       this.formData["sliceProfile_TN_connection_links"] !== "" &&
-                                       this.formData["sliceProfile_TN_connection_links"] !==
+                                       typeof this.formData[
+                                               "sliceProfile_TN_BH_connection_links"
+                                       ] !== "undefined" &&
+                                       this.formData["sliceProfile_TN_BH_connection_links"] !==
+                                               "" &&
+                                       this.formData["sliceProfile_TN_BH_connection_links"] !==
                                                null &&
                                        item["linkId"] ===
-                                               this.formData["sliceProfile_TN_connection_links"]
+                                               this.formData["sliceProfile_TN_BH_connection_links"]
                                ) {
                                        item.checked = true;
                                } else {
@@ -275,16 +277,16 @@ export class SubnetParamsModelComponent implements OnInit {
        judgeTn(): void {
                console.log("fprm", this.formData);
                if (
-                       this.formData["sliceProfile_TN_resourceSharingLevel"] ===
+                       this.formData["sliceProfile_TN_BH_resourceSharingLevel"] ===
                                "non-shared" ||
-                       this.formData["sliceProfile_TN_resourceSharingLevel"] == null
+                       this.formData["sliceProfile_TN_BH_resourceSharingLevel"] == null
                ) {
                        //:todo clear??
                        // this.connectionLinkTable.forEach((item) => {
                        //      item.checked = false;
                        // });
-                       // this.formData["sliceProfile_TN_connection_links"] = null;
-                       this.notPassPara = ["sliceProfile_TN_connection_links"];
+                       // this.formData["sliceProfile_TN_BH_connection_links"] = null;
+                       this.notPassPara = ["sliceProfile_TN_BH_connection_links"];
                        this.transferFormItems.forEach((item) => {
                                if (item.title === "Connection Links") {
                                        item.disable = true;
@@ -297,7 +299,8 @@ export class SubnetParamsModelComponent implements OnInit {
                                }
                        });
                } else if (
-                       this.formData["sliceProfile_TN_resourceSharingLevel"] === "shared"
+                       this.formData["sliceProfile_TN_BH_resourceSharingLevel"] ===
+                       "shared"
                ) {
                        this.transferFormItems.forEach((item) => {
                                if (item.title === "Connection Links") {
@@ -308,11 +311,12 @@ export class SubnetParamsModelComponent implements OnInit {
                                ) {
                                        if (
                                                typeof this.formData[
-                                                       "sliceProfile_TN_connection_links"
+                                                       "sliceProfile_TN_BH_connection_links"
                                                ] !== "undefined" &&
-                                               this.formData["sliceProfile_TN_connection_links"] !==
+                                               this.formData["sliceProfile_TN_BH_connection_links"] !==
                                                        null &&
-                                               this.formData["sliceProfile_TN_connection_links"] !== ""
+                                               this.formData["sliceProfile_TN_BH_connection_links"] !==
+                                                       ""
                                        ) {
                                                item.disable = true;
                                                item.required = false;
@@ -323,7 +327,8 @@ export class SubnetParamsModelComponent implements OnInit {
                                                );
                                        } else {
                                                //:todo
-                                               this.formData["sliceProfile_TN_connection_links"] = "";
+                                               this.formData["sliceProfile_TN_BH_connection_links"] =
+                                                       "";
                                                item.disable = false;
                                                item.required = true;
                                                this.notPassPara = [];
@@ -373,7 +378,7 @@ export class SubnetParamsModelComponent implements OnInit {
                                item.checked = false;
                        }
                });
-               this.formData["sliceProfile_TN_connection_links"] = id; //  get the selected id
+               this.formData["sliceProfile_TN_BH_connection_links"] = id; //  get the selected id
                this.judgeTn();
        }