summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwangyuerg <wangyuerg@chinamobile.com>2021-03-11 09:40:01 +0800
committerwangyuerg <wangyuerg@chinamobile.com>2021-03-11 09:40:28 +0800
commit2ddfe6c8f2c8f2d472a1e1756bd3491cb6550149 (patch)
tree68de7f68b1a0a4f47530a4421bf712011308296f
parent55802952c883c2eddd78c6e2566eda992c0d9937 (diff)
feat:Logic plus protection
Signed-off-by: wangyuerg <wangyuerg@chinamobile.com> Change-Id: Ifdeb26671445944bbf7a4fc6c5e551636bb13dd2 Issue-ID: USECASEUI-527
-rw-r--r--usecaseui-portal/src/app/core/services/slicingTaskServices.ts2
-rw-r--r--usecaseui-portal/src/app/mock/json/getSlicingBusinessDetail.json2
-rw-r--r--usecaseui-portal/src/app/mock/routes.js2
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.less4
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.html17
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.less52
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts39
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-task-management/slicing-task-model/subnet-params-model/subnet-params-model.component.ts34
8 files changed, 123 insertions, 29 deletions
diff --git a/usecaseui-portal/src/app/core/services/slicingTaskServices.ts b/usecaseui-portal/src/app/core/services/slicingTaskServices.ts
index 77b02ba9..362e9f6a 100644
--- a/usecaseui-portal/src/app/core/services/slicingTaskServices.ts
+++ b/usecaseui-portal/src/app/core/services/slicingTaskServices.ts
@@ -96,7 +96,7 @@ export class SlicingTaskServices {
this.baseUrl +
"/monitoring/queryTimestamp/{queryTimestamp}/bandwidth",
getConnectionLinkTable:
- "/api/usecaseui-server/v1/uui-slicing/csmf/5gSlicing/connectionLinks/pageNo/{pageNo}/pageSize/{pageSize}", // :todo
+ "/api/usecaseui-server/v1/uui-slicing/nsmf/task/connectionLinks/pageNo/{pageNo}/pageSize/{pageSize}", // :todo
};
// Get slicing order task list
diff --git a/usecaseui-portal/src/app/mock/json/getSlicingBusinessDetail.json b/usecaseui-portal/src/app/mock/json/getSlicingBusinessDetail.json
index 32167b65..2ff453f0 100644
--- a/usecaseui-portal/src/app/mock/json/getSlicingBusinessDetail.json
+++ b/usecaseui-portal/src/app/mock/json/getSlicingBusinessDetail.json
@@ -45,7 +45,7 @@
"nsi_type": "eMBB",
"nsi_orchestration-status": "activated"
},
- "business_detail_info":{
+ "tn_bh_slice_task_info":{
"anVersion":"10.2.3.4.5",
"vLanText":"11111",
"tnVersion":"10.0.1.1.1",
diff --git a/usecaseui-portal/src/app/mock/routes.js b/usecaseui-portal/src/app/mock/routes.js
index 64aa5ab6..30c96b9d 100644
--- a/usecaseui-portal/src/app/mock/routes.js
+++ b/usecaseui-portal/src/app/mock/routes.js
@@ -152,7 +152,7 @@ module.exports = {
"/uui-slicing/nsmf/resource/nssi/instanceStatus/:instanceStatus/instances/pageNo/:pageNo/pageSize/:pageSize":
"/slicing_nssi_list_activated",
"/uui-slicing/nsmf/resource/nssi/:nssiId/details": "/getSlicingNssiDetail",
- "/uui-slicing/csmf/5gSlicing/connectionLinks/pageNo/:pageNo/pageSize/:pageSize":
+ "/uui-slicing/nsmf/task/connectionLinks/pageNo/:pageNo/pageSize/:pageSize":
"/tn_connectionLinkTable", // :todo
///////<-------------CSMF slicing_business--------->/////
"/uui-slicing/csmf/5gSlicing/orders/status/:status/pageNo/:pageNo/pageSize/:pageSize":
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.less b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.less
index 66eb3cc4..c0dc618e 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.less
+++ b/usecaseui-portal/src/app/views/services/slicing-management/csmf-slicing-business-management/business-order/business-order.component.less
@@ -52,10 +52,8 @@
bottom:-2px;
width:20px;
height:20px;
-cursor: pointer;
-
+ cursor: pointer;
}
-
.detail-wrap::before{
content: '';
display: block;
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.html b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.html
index ab30564a..d90709f2 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.html
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.html
@@ -43,11 +43,15 @@
<p>
<img src="../../../../../../../assets/images/an-img.png" class="anImg"/>
</p>
- <p>{{businessDetailInfo.anVersion}}</p>
+ <!-- <p *ngIf="isshowran" class="ran_text">{{rantext}}</p> -->
+ <p>{{businessDetailInfo.anVersion}}
+ <!-- <img src="../../../../../../../assets/images/ask-img.png" alt=""
+ class="detail-icon"
+ (mouseover)="detailFn(false,'ran')" (mouseleave)="detailFn(false,'ran')" /></p> -->
</li>
<li class="vLan-line">
<p >
- vLan:{{businessDetailInfo.vLanText}}
+ Vlan ID:{{businessDetailInfo.vLanText}}
</p>
<p [ngClass]="{'online-type':status=='activated','offline-type':status!=='activated'}"></p>
</li>
@@ -75,7 +79,7 @@
</li>
<li class="vLan-line">
<p >
- vLan:{{businessDetailInfo.cnVlan}}
+ Vlan ID:{{businessDetailInfo.cnVlan}}
</p>
<p [ngClass]="{'online-type':status=='activated','offline-type':status!=='activated'}"></p>
</li>
@@ -83,7 +87,12 @@
<p>
<img src="../../../../../../../assets/images/cn-cloud-img.jpg" class="cnCloud"/>
</p>
- <p>{{businessDetailInfo.cnVersion}}</p>
+ <!-- <p *ngIf="isshowran" class="cor_text">{{rantext}}</p> -->
+ <p>{{businessDetailInfo.cnVersion}}
+ <!-- <img src="../../../../../../../assets/images/ask-img.png" alt=""
+ class="core_icon"
+ (mouseover)="detailFn(true,'core')" (mouseleave)="detailFn(false,'core')" /> -->
+ </p>
</li>
</ul>
</div>
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.less b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.less
index ead96487..f3ecbe43 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.less
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.less
@@ -68,4 +68,54 @@ a{
width: 88px;
height: auto;
margin-top: 20px;
-} \ No newline at end of file
+}
+// .ran_text{
+// width: 200px;
+// height:auto;
+// background: rgba(0, 0, 0, .8);
+// line-height: 40px;
+// border-radius: 4px;
+// position: absolute;
+// right: -118px;
+// top: 34px;
+// color:#ffffff;
+// z-index:99;
+// }
+// .detail-icon{
+// position: absolute;
+// right: -26px;
+// bottom:-2px;
+// width:20px;
+// height:20px;
+// cursor: pointer;
+// }
+// .ran_text::before{
+// content: '';
+// display: block;
+// position: absolute;
+// right: 94px;
+// bottom: -16px;
+// border: 20px solid transparent;
+// border: 8px solid transparent;
+// border-top: 8px solid rgba(0, 0, 0, .8);
+// }
+// .cor_text{
+// width: 200px;
+// height:auto;
+// background: rgba(0, 0, 0, .8);
+// line-height: 40px;
+// border-radius: 4px;
+// text-indent: 2em;
+// position: absolute;
+// right: -300px;
+// top: -60px;
+// color:#ffffff;
+// }
+// .core_icon{
+// position: absolute;
+// right: 22px;
+// bottom:-10px;
+// width:20px;
+// height:20px;
+// cursor: pointer;
+// } \ No newline at end of file
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts
index 2d97dc3f..f48deea6 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts
@@ -26,17 +26,50 @@ export class SlicingBusinessModelComponent implements OnInit {
isSpinning: boolean = true;
status: string = "";
businessDetailInfo : any = {}
+ rantext: string = "RAN Network Edge IP address";
+
+ isshowran: boolean = false;
ngOnInit() {
this.status = this.outerData.orchestration_status
console.log('status',this.status)
this.getDetail()
}
-
+ detailFn(flag,form){
+ this.rantext = form =='ran'? "RAN Network Edge IP address" : "Core Network Edge IP address";
+ this.isshowran = !this.isshowran
+ }
getDetail() {
this.myhttp.getSlicingBusinessDetail(this.businessId).then(res => {
this.isSpinning = false;
- const { business_demand_info, business_demand_info: { coverage_area_ta_list }, nst_info, nsi_info ,business_detail_info} = res.result_body;
- this.businessDetailInfo = business_detail_info
+ const { business_demand_info, business_demand_info: { coverage_area_ta_list }, nst_info, nsi_info ,connection_link: { tn_bh_slice_task_info }} = res.result_body;
+ console.log(JSON.stringify(tn_bh_slice_task_info),11111)
+ // tn_bh_slice_task_info = {"suggestNssiId":null,"suggestNSSIName":null,"progress":null,"status":null,"statusDescription":null,"scriptName":null,"enableNSSISelection":null,"sliceProfile":null,"lantency":null,"max_bandWidth":null,"link_type":null}
+
+ this.businessDetailInfo = {
+ "suggestNssiId": '',
+ "suggestNSSIName": '11111',
+ "progress": 'active',
+ "status": 'active',
+ "statusDescription": 'p2p/mp2p',
+ "scriptName": '10.1.1.1',
+ "enableNSSISelection": '11',
+ "sliceProfile": '10.1.1.1',
+ "lantency": '10.2.3.4.5',
+ "max_bandWidth": '1111',
+ "link_type": '333'
+ }
+ // this.businessDetailInfo = {
+ // "anVersion":"10.2.3.4.5",
+ // "vLanText":"11111",
+ // "tnVersion":"10.0.1.1.1",
+ // "mbps":"11111",
+ // "msText":"11111",
+ // "linkType":"p2p/mp2p",
+ // "tnEndVersion":"10.1.1.1",
+ // "cnVlan":"11",
+ // "cnVersion":"1.1.2.3",
+ // "orchestration_status":"active"
+ // }
business_demand_info.area = coverage_area_ta_list.map(item => {
item = item.split(';').join('-');
return item
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 83d16a62..310a1cb9 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
@@ -128,21 +128,23 @@ export class SubnetParamsModelComponent implements OnInit {
}
addCheckStatus() {
- 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"] !== null &&
- item["linkId"] ===
- this.formData["sliceProfile_TN_connection_links"]
- ) {
- item.checked = true;
- } else {
- item.checked = false;
- }
- });
+ if(this.connectionLinkTable && this.connectionLinkTable.length>0){
+ 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"] !== null &&
+ item["linkId"] ===
+ this.formData["sliceProfile_TN_connection_links"]
+ ) {
+ item.checked = true;
+ } else {
+ item.checked = false;
+ }
+ });
+ }
}
// changeResourceShare() {
@@ -218,6 +220,7 @@ export class SubnetParamsModelComponent implements OnInit {
getTableHeader(): void {
// Find the common key of all data
+ if(this.connectionLinkTable && this.connectionLinkTable.length>0){
let keyList: any[] = this.connectionLinkTable.map((item) => {
return Object.keys(item);
});
@@ -250,6 +253,7 @@ export class SubnetParamsModelComponent implements OnInit {
}
}
});
+ }
}
pageIndexChange(e) {