summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Shen <shentao@chinamobile.com>2018-11-21 13:57:02 +0000
committerGerrit Code Review <gerrit@onap.org>2018-11-21 13:57:02 +0000
commitcd057f849837d6d2c627b5710ac42cc7ff97a8de (patch)
treea96d99f2a9c8ef428335cb253a578f708a088e2e
parent777c1809eb3d15e7218aaf650a7faa8a620a8f8f (diff)
parent891d2aafd80ff6214cb75c0873f19dd71aae9f84 (diff)
Merge "Support NS Instance Restart for VF-C"
-rw-r--r--usecaseui-portal/src/app/myhttp.service.ts2
-rw-r--r--usecaseui-portal/src/app/services/services-list/services-list.component.html4
-rw-r--r--usecaseui-portal/src/app/services/services-list/services-list.component.ts138
3 files changed, 86 insertions, 58 deletions
diff --git a/usecaseui-portal/src/app/myhttp.service.ts b/usecaseui-portal/src/app/myhttp.service.ts
index c2359f57..4d28d220 100644
--- a/usecaseui-portal/src/app/myhttp.service.ts
+++ b/usecaseui-portal/src/app/myhttp.service.ts
@@ -216,7 +216,7 @@ export class MyhttpService {
}
getVnfInfo(id) {
- return this.http.get<any>(this.url.vnfInfo + id)
+ return this.http.get<any>(this.url.vnfInfo + id);
}
healNsService(id, requestBody) {
// return this.http.get<any>(this.url.ns_healService); //Local simulation
diff --git a/usecaseui-portal/src/app/services/services-list/services-list.component.html b/usecaseui-portal/src/app/services/services-list/services-list.component.html
index e2dbb1bc..22ab2c76 100644
--- a/usecaseui-portal/src/app/services/services-list/services-list.component.html
+++ b/usecaseui-portal/src/app/services/services-list/services-list.component.html
@@ -122,8 +122,8 @@
<i [ngClass]="{'cannotclick':data.status == 'processing'||data.status=='Deleting'||data.status=='Creating'||data.status=='Scaling'}"
*ngIf="data.serviceDomain=='E2E Service' " class="anticon anticon-setting" (click)="scaleService(data)"></i>
<!-- <i *ngIf="data.serviceDomain=='E2E Service'||data.serviceDomain=='Network Service' " class="anticon anticon-cloud-upload-o" (click)="updataService(data)"></i> -->
- <i [ngClass]="{'cannotclick':data.status == 'processing'||data.status=='Deleting'||data.status=='Creating'||data.status=='Healing'}"
- *ngIf="data.serviceDomain=='Network Service' " class="anticon anticon-reload" (click)="healService(data)"></i>
+ <!-- <i [ngClass]="{'cannotclick':data.status == 'processing'||data.status=='Deleting'||data.status=='Creating'||data.status=='Healing'}"
+ *ngIf="data.serviceDomain=='Network Service' " class="anticon anticon-reload" (click)="healService(data)"></i> -->
<i [ngClass]="{'cannotclick':data.status == 'processing'||data.status=='Deleting'||data.status=='Creating'||data.status=='Scaling'}"
*ngIf="data.serviceDomain=='SOTN'||data.serviceDomain=='CCVPN' " class="anticon anticon-ellipsis" (click)="serviceDetail(data)"></i>
<i [ngClass]="{'cannotclick':data.status == 'processing'||data.status=='Deleting'||data.status=='Creating'||data.status=='Healing'||data.status=='Scaling'}" class="anticon anticon-delete" (click)="deleteModel(data)"></i>
diff --git a/usecaseui-portal/src/app/services/services-list/services-list.component.ts b/usecaseui-portal/src/app/services/services-list/services-list.component.ts
index b52fd0ec..6c05c879 100644
--- a/usecaseui-portal/src/app/services/services-list/services-list.component.ts
+++ b/usecaseui-portal/src/app/services/services-list/services-list.component.ts
@@ -168,6 +168,7 @@ export class ServicesListComponent implements OnInit {
if(typeof item["childServiceInstances"] == "string"){
item["childServiceInstances"] = JSON.parse(item["childServiceInstances"]);
}
+
item["childServiceInstances"] = item["childServiceInstances"].map((child)=>{
if(typeof child == "string"){
return JSON.parse(child);
@@ -175,13 +176,26 @@ export class ServicesListComponent implements OnInit {
return child;
}
})
- if(item["serviceDomain"]=="Network Service" && item["vnfInfo"]){
- item["childServiceInstances"] = item["vnfInfo"].map((vnf)=>{
- vnf["serviceDomain"] = "vnf";
- return vnf;
- });
+
+ if(item["serviceDomain"]=="Network Service"){
+ if(item["vnfInfo"]){
+ item["childServiceInstances"] = item["vnfInfo"].map((vnf)=>{
+ vnf["serviceDomain"] = "vnf";
+ return vnf;
+ });
+ }else if(item["relationship-list"] && item["relationship-list"]["relationship"]){
+ item["childServiceInstances"] = item["relationship-list"]["relationship"].filter((relate)=>{
+ return relate["related-to"]=="generic-vnf";
+ }).map((vnf)=>{
+ let vnfInfo = {vnfNsInstanceId:"",vnfInstanceId:"",vnfInstanceName:"",serviceDomain:"vnf"};
+ vnfInfo.vnfNsInstanceId = item["nsInstanceId"] || item["service-instance-id"];
+ vnfInfo.vnfInstanceId = vnf["relationship-data"].find((vnfid)=>{ return vnfid["relationship-key"]=="generic-vnf.vnf-id"})["relationship-value"];
+ vnfInfo.vnfInstanceName = vnf["related-to-property"].find((vnfname)=>{ return vnfname["property-key"]=="generic-vnf.vnf-name"})["property-value"];
+ return vnfInfo;
+ })
+ }
}
- //when processing,continue
+
if(item["serviceStatus"]=="finished"){
item["status"] = "Active";
}else if(item["serviceStatus"]=="processing"){
@@ -195,7 +209,8 @@ export class ServicesListComponent implements OnInit {
}
}
let id = item["nsInstanceId"] || item["service-instance-id"];
- this.queryNsProgress(item["jobId"],id,updata).then(()=>{
+ let jobid = item["jobId"] || item["operationId"];
+ this.queryNsProgress(jobid,id,updata).then(()=>{
item["rate"] = 100;
item["status"] = "completed";
})
@@ -493,14 +508,14 @@ export class ServicesListComponent implements OnInit {
console.log(data);
newData.rate = 100;
newData.status = "completed";
- // let hasUndone = this.tableData.some((item)=>{
- // return item.rate < 100;
- // })
- // if(!hasUndone){
- // setTimeout(()=>{
- // this.getTableData();
- // },1000)
- // }
+ let hasUndone = this.tableData.some((item)=>{
+ return item.rate < 100;
+ })
+ if(!hasUndone){
+ setTimeout(()=>{
+ this.getTableData();
+ },1000)
+ }
})
})
})
@@ -543,14 +558,14 @@ export class ServicesListComponent implements OnInit {
console.log(data);
newData.rate = 100;
newData.status = "completed";
- // let hasUndone = this.tableData.some((item)=>{
- // return item.rate < 100;
- // })
- // if(!hasUndone){
- // setTimeout(()=>{
- // this.getTableData();
- // },1000)
- // }
+ let hasUndone = this.tableData.some((item)=>{
+ return item.rate < 100;
+ })
+ if(!hasUndone){
+ setTimeout(()=>{
+ this.getTableData();
+ },1000)
+ }
})
}
@@ -567,10 +582,6 @@ export class ServicesListComponent implements OnInit {
this.myhttp.nsCreateInstance(obj.step1)
.subscribe((data)=>{
// console.log(data);
- if(data.status == "FAILED"){
- console.log("create ns service failed :" + JSON.stringify(data));
- return false;
- }
newData = { //
'service-instance-id':data.nsInstanceId,
'service-instance-name':obj.step1.nsName,
@@ -580,6 +591,11 @@ export class ServicesListComponent implements OnInit {
rate:0,
}
this.tableData = [newData,...this.tableData];
+ if(data.status == "FAILED"){
+ console.log("create ns service failed :" + JSON.stringify(data));
+ newData.status = "failed";
+ return false;
+ }
let createParams = "?ns_instance_id=" + data.nsInstanceId +
"&customerId="+this.customerSelected.id +
"&serviceType="+this.serviceTypeSelected.name +
@@ -587,7 +603,10 @@ export class ServicesListComponent implements OnInit {
"&parentServiceInstanceId=";
// step2
this.createNsService(createParams,obj.step2).then((jobid)=>{
-
+ if(jobid == "failed"){
+ newData.status = "failed";
+ return false;
+ }
let updata = (prodata)=>{
newData.rate = prodata.progress;
if(newData["rate"] > 100){
@@ -600,14 +619,14 @@ export class ServicesListComponent implements OnInit {
console.log(data);
newData.rate = 100;
newData.status = "completed";
- // let hasUndone = this.tableData.some((item)=>{
- // return item.rate < 100;
- // })
- // if(!hasUndone){
- // setTimeout(()=>{
- // this.getTableData();
- // },1000)
- // }
+ let hasUndone = this.tableData.some((item)=>{
+ return item.rate < 100;
+ })
+ if(!hasUndone){
+ setTimeout(()=>{
+ this.getTableData();
+ },1000)
+ }
})
})
}
@@ -631,6 +650,7 @@ export class ServicesListComponent implements OnInit {
.subscribe((data)=>{
if(data.status == "FAILED"){
console.log("instantiate ns service failed :" + JSON.stringify(data));
+ res("failed");
return false;
}
res(data.jobId);
@@ -647,6 +667,7 @@ export class ServicesListComponent implements OnInit {
.subscribe((data)=>{
if(data.status == "FAILED"){
console.log("scale E2e service failed :" + JSON.stringify(data));
+ service.status = "failed";
return false;
}
let obj = {
@@ -670,11 +691,12 @@ export class ServicesListComponent implements OnInit {
console.log(service);
service.rate = 0;
service.status = "Healing";
- let id = service.nsInstanceId || service["service-instance-id"];
+ let id = service.nsInstanceId || service["service-instance-id"] || service["vnfNsInstanceId"];
this.myhttp.healNsService(id,requestBody)
.subscribe((data)=>{
if(data.status == "FAILED"){
console.log("heal nsvnf service failed :" + JSON.stringify(data));
+ service.status = "failed";
return false;
}
let jobid = data.jobId;
@@ -684,7 +706,7 @@ export class ServicesListComponent implements OnInit {
service["status"]=prodata.status;
}
}
- this.queryNsProgress(jobid,id,updata).then((data1)=>{
+ this.queryNsProgress(jobid,null,updata).then((data1)=>{
console.log(data1);
service.rate = 100;
service.status = "completed";
@@ -710,6 +732,7 @@ export class ServicesListComponent implements OnInit {
.subscribe((data)=>{
if(data.status == "FAILED"){
console.log("delete service failed :" + JSON.stringify(data));
+ service.status = "failed";
return false;
}
let obj = {serviceId:params.serviceInstanceId,operationId:data.operationId}
@@ -732,14 +755,14 @@ export class ServicesListComponent implements OnInit {
console.log(data);
service.rate = 100;
service.status = "completed";
- // let hasUndone = this.tableData.some((item)=>{
- // return item.rate < 100;
- // })
- // if(!hasUndone){
- // setTimeout(()=>{
- // this.getTableData();
- // },1000)
- // }
+ let hasUndone = this.tableData.some((item)=>{
+ return item.rate < 100;
+ })
+ if(!hasUndone){
+ setTimeout(()=>{
+ this.getTableData();
+ },1000)
+ }
})
})
}
@@ -752,13 +775,17 @@ export class ServicesListComponent implements OnInit {
gracefulTerminationTimeout : this.gracefulTerminationTimeout
}
this.stopNsService(id,requestBody).then((jobid)=>{
+ if(jobid == "failed"){
+ service.status = "failed";
+ return false;
+ }
let updata = (prodata)=>{
service.rate = prodata.progress;
if(service["rate"] > 100){
service["status"]=prodata.status;
}
}
- return this.queryNsProgress(jobid,id,updata);
+ return this.queryNsProgress(jobid,null,updata);
}).then(()=>{
this.myhttp.nsDeleteInstance(id)
.subscribe((data)=>{
@@ -770,14 +797,14 @@ export class ServicesListComponent implements OnInit {
service.status = "failed";
return false;
}
- // let hasUndone = this.tableData.some((item)=>{
- // return item.rate < 100;
- // })
- // if(!hasUndone){
- // setTimeout(()=>{
- // this.getTableData();
- // },1000)
- // }
+ let hasUndone = this.tableData.some((item)=>{
+ return item.rate < 100;
+ })
+ if(!hasUndone){
+ setTimeout(()=>{
+ this.getTableData();
+ },1000)
+ }
})
})
}
@@ -788,6 +815,7 @@ export class ServicesListComponent implements OnInit {
.subscribe((data)=>{
if(data.status == "FAILED"){
console.log("stop ns service failed :" + JSON.stringify(data));
+ res("failed");
return false;
}
res(data.jobId);