summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcyuamber <xuranyjy@chinamobile.com>2019-12-06 09:36:55 +0800
committercyuamber <xuranyjy@chinamobile.com>2019-12-06 09:57:57 +0800
commit39aa34b0431e6dc2946b95ae40df5466a3c19d72 (patch)
treeab840886657601bc201323f280d2daaa37847296
parente2e2bcf625b3fa8edffa3e7ed81452448f3912d8 (diff)
feat: add slicing nsi basic business code of nsi page
Change-Id: I85ceaad153cf4dd9b9c3d4e6db9d9ce4cf6af4bf Issue-ID: USECASEUI-369 Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
-rw-r--r--usecaseui-portal/src/app/app.module.ts5
-rw-r--r--usecaseui-portal/src/app/core/services/slicingTaskServices.ts29
-rw-r--r--usecaseui-portal/src/app/mock/json/slicing_business_list.json22
-rw-r--r--usecaseui-portal/src/app/mock/json/slicing_instance.json22
-rw-r--r--usecaseui-portal/src/app/mock/json/slicing_nsi_list.json95
-rw-r--r--usecaseui-portal/src/app/mock/json/slicing_nsi_list_activated.json67
-rw-r--r--usecaseui-portal/src/app/mock/routes.js11
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-management.component.html2
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.html45
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.less9
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.spec.ts25
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.ts53
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-management.component.html4
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.html8
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.ts4
15 files changed, 347 insertions, 54 deletions
diff --git a/usecaseui-portal/src/app/app.module.ts b/usecaseui-portal/src/app/app.module.ts
index c2abac6d..5b2fae93 100644
--- a/usecaseui-portal/src/app/app.module.ts
+++ b/usecaseui-portal/src/app/app.module.ts
@@ -94,7 +94,7 @@ import { SubnetParamsModelComponent } from './views/services/slicing-management/
import { SlicingBusinessTableComponent } from './views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component'
import { BasicInfoComponent } from './shared/components/basic-info/basic-info.component';
import { CheckProcessModelComponent } from './views/services/slicing-management/slicing-task-management/check-process-model/check-process-model.component'
-
+import { NsiTableComponent } from './views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component'
@NgModule({
providers: [
{ provide: LocationStrategy, useClass: HashLocationStrategy },
@@ -152,7 +152,8 @@ import { CheckProcessModelComponent } from './views/services/slicing-management/
SubnetParamsModelComponent,
SlicingBusinessTableComponent,
BasicInfoComponent,
- CheckProcessModelComponent
+ CheckProcessModelComponent,
+ NsiTableComponent
],
imports: [
BrowserModule,
diff --git a/usecaseui-portal/src/app/core/services/slicingTaskServices.ts b/usecaseui-portal/src/app/core/services/slicingTaskServices.ts
index badbaa0d..19006acd 100644
--- a/usecaseui-portal/src/app/core/services/slicingTaskServices.ts
+++ b/usecaseui-portal/src/app/core/services/slicingTaskServices.ts
@@ -37,9 +37,12 @@ export class SlicingTaskServices {
activateSlicingService:this.baseUrl+"/resource/{serviceId}/activate",
deactivateSlicingService:this.baseUrl+"/resource/{serviceId}/deactivate",
terminateSlicingService:this.baseUrl+"/resource/{serviceId}",
- queryOperationProgress:this.baseUrl+"resource/{serviceId}/progress",
-
-
+ queryOperationProgress:this.baseUrl+"/resource/{serviceId}/progress",
+ slicingBusinessDetail:this.baseUrl+"/resource/business/{businessId}/details",
+ //slicing-nsi-management
+ slicingNsiList:this.baseUrl+"/resource/nsi/instances/pageNo/{pageNo}/pageSize/{pageSize}",
+ slicingNsiQueryOfStatus:this.baseUrl+"/resource/nsi/{instanceStatus}/instances/pageNo/{pageNo}/pageSize/{pageSize}",
+ slicingNsiDetail:this.baseUrl+"/resource/nsi/{nsiId}/details",
}
@@ -101,9 +104,9 @@ export class SlicingTaskServices {
url = this.url.slicingBusinesQueryOfStatus.replace("{businessStatus}", paramsObj.businessStatus).replace("{pageNo}", paramsObj.pageNo)
.replace("{pageSize}", paramsObj.pageSize);
}
- let params = new HttpParams({ fromObject: paramsObj });
- return this.http.get<any>(url,{params});
+ return this.http.get<any>(url);
}
+ // change slicing business activate status
changeActivateSlicingService(paramsObj, activate: boolean){
let url = this.url.activateSlicingService.replace("{serviceId}", paramsObj.serviceId);
if(activate){
@@ -111,14 +114,26 @@ export class SlicingTaskServices {
}
return this.http.put<any>(url,paramsObj);
}
+ // terminate slicing business
terminateSlicingService(paramsObj){
const url = this.url.terminateSlicingService.replace('{serviceId}', paramsObj.serviceId);
return this.http.delete<any>(url);
}
+ // query slicing business progress
getSlicingBusinessProgress(paramsObj) {
- let params = new HttpParams({ fromObject: paramsObj });
let url = this.url.queryOperationProgress.replace("{serviceId}", paramsObj.serviceId);
- return this.http.get<any>(url,{params});
+ return this.http.get<any>(url);
+ }
+ // Get slicing nsi list
+ // Get slicing business list
+ getSlicingNsiList (paramsObj,isSelect: boolean) {
+ let url = this.url.slicingNsiList .replace("{pageNo}", paramsObj.pageNo)
+ .replace("{pageSize}", paramsObj.pageSize);
+ if(isSelect){
+ url = this.url.slicingNsiQueryOfStatus.replace("{instanceStatus}", paramsObj.businessStatus).replace("{pageNo}", paramsObj.pageNo)
+ .replace("{pageSize}", paramsObj.pageSize);
+ }
+ return this.http.get<any>(url);
}
}
diff --git a/usecaseui-portal/src/app/mock/json/slicing_business_list.json b/usecaseui-portal/src/app/mock/json/slicing_business_list.json
index 8291efbf..46201850 100644
--- a/usecaseui-portal/src/app/mock/json/slicing_business_list.json
+++ b/usecaseui-portal/src/app/mock/json/slicing_business_list.json
@@ -4,7 +4,7 @@
"result_message": "5G slicing service instances query result."
},
"result_body": {
- "record_number": 2,
+ "record_number": 14,
"slicing_business_list": [
{
"service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9265",
@@ -31,7 +31,7 @@
"service_snssai": "1-010101",
"orchestration_status": "activated",
"last_operation_type": "activate",
- "last_operation_progress": 100
+ "last_operation_progress": 10
},
{
"service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9270",
@@ -58,7 +58,7 @@
"service_snssai": "1-010101",
"orchestration_status": "deactivated",
"last_operation_type": "deactivate",
- "last_operation_progress": 70
+ "last_operation_progress": 100
},
{
"service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9273",
@@ -67,7 +67,7 @@
"service_snssai": "1-010101",
"orchestration_status": "deactivated",
"last_operation_type": "deactivate",
- "last_operation_progress": 50
+ "last_operation_progress": 100
},
{
"service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9274",
@@ -76,7 +76,7 @@
"service_snssai": "1-010101",
"orchestration_status": "activated",
"last_operation_type": "activate",
- "last_operation_progress": 70
+ "last_operation_progress": 100
},
{
"service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9275",
@@ -94,7 +94,7 @@
"service_snssai": "1-010101",
"orchestration_status": "activated",
"last_operation_type": "activate",
- "last_operation_progress": 70
+ "last_operation_progress": 100
},
{
"service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9277",
@@ -103,7 +103,7 @@
"service_snssai": "1-010101",
"orchestration_status": "activated",
"last_operation_type": "activate",
- "last_operation_progress": 70
+ "last_operation_progress": 100
},
{
"service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9278",
@@ -112,7 +112,7 @@
"service_snssai": "1-010101",
"orchestration_status": "activated",
"last_operation_type": "activate",
- "last_operation_progress": 70
+ "last_operation_progress": 100
},
{
"service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9279",
@@ -121,7 +121,7 @@
"service_snssai": "1-010101",
"orchestration_status": "activated",
"last_operation_type": "activate",
- "last_operation_progress": 70
+ "last_operation_progress": 100
},
{
"service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9280",
@@ -130,7 +130,7 @@
"service_snssai": "1-010101",
"orchestration_status": "activated",
"last_operation_type": "activate",
- "last_operation_progress": 70
+ "last_operation_progress": 100
},
{
"service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9281",
@@ -139,7 +139,7 @@
"service_snssai": "1-010101",
"orchestration_status": "activated",
"last_operation_type": "activate",
- "last_operation_progress": 70
+ "last_operation_progress": 100
}
]
}
diff --git a/usecaseui-portal/src/app/mock/json/slicing_instance.json b/usecaseui-portal/src/app/mock/json/slicing_instance.json
deleted file mode 100644
index 11c7f7bf..00000000
--- a/usecaseui-portal/src/app/mock/json/slicing_instance.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "result_header": {
- "result_code": "200",
- "result_message": "5G slicing NSI service instances result."
- },
- "result_body": {
- "record_number": 2,
- "nsi_service_instances": [
- {
- "service_instance_order": "1",
- "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959411a",
- "service_instance_name": "eMBB instancel"
- },
- {
- "service_instance_order": "2",
- "service_instance_id": "46da8cf8-0878-48bc-bea3-f2200959411a",
- "service_instance_name": "eMBB instance2"
- }
- ]
- }
-}
-
diff --git a/usecaseui-portal/src/app/mock/json/slicing_nsi_list.json b/usecaseui-portal/src/app/mock/json/slicing_nsi_list.json
new file mode 100644
index 00000000..63a26f5c
--- /dev/null
+++ b/usecaseui-portal/src/app/mock/json/slicing_nsi_list.json
@@ -0,0 +1,95 @@
+{
+ "result_header": {
+ "result_code": "200",
+ "result_message": "5G slicing NSI service instances result."
+ },
+ "result_body": {
+ "record_number": 12,
+ "nsi_service_instances": [
+ {
+ "service_instance_order": "1",
+ "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959411a",
+ "service_instance_name": "eMBB instancel",
+ "service_type":"eMBB",
+ "orchestration_status": "activated"
+ },
+ {
+ "service_instance_order": "2",
+ "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959412a",
+ "service_instance_name": "eMBB instancel",
+ "service_type":"eMBB",
+ "orchestration_status": "deactivated"
+ },
+ {
+ "service_instance_order": "3",
+ "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959413a",
+ "service_instance_name": "eMBB instancel",
+ "service_type":"eMBB",
+ "orchestration_status": "activated"
+ },
+ {
+ "service_instance_order": "4",
+ "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959414a",
+ "service_instance_name": "eMBB instancel",
+ "service_type":"eMBB",
+ "orchestration_status": "deactivated"
+ },
+ {
+ "service_instance_order": "5",
+ "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959415a",
+ "service_instance_name": "eMBB instancel",
+ "service_type":"eMBB",
+ "orchestration_status": "activated"
+ },
+ {
+ "service_instance_order": "6",
+ "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959416a",
+ "service_instance_name": "eMBB instancel",
+ "service_type":"eMBB",
+ "orchestration_status": "deactivated"
+ },
+ {
+ "service_instance_order": "7",
+ "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959417a",
+ "service_instance_name": "eMBB instancel",
+ "service_type":"eMBB",
+ "orchestration_status": "activated"
+ },
+ {
+ "service_instance_order": "8",
+ "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959418a",
+ "service_instance_name": "eMBB instancel",
+ "service_type":"eMBB",
+ "orchestration_status": "deactivated"
+ },
+ {
+ "service_instance_order": "9",
+ "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959419a",
+ "service_instance_name": "eMBB instancel",
+ "service_type":"eMBB",
+ "orchestration_status": "activated"
+ },
+ {
+ "service_instance_order": "10",
+ "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959420a",
+ "service_instance_name": "eMBB instancel",
+ "service_type":"eMBB",
+ "orchestration_status": "deactivated"
+ },
+ {
+ "service_instance_order": "11",
+ "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959421a",
+ "service_instance_name": "eMBB instancel",
+ "service_type":"eMBB",
+ "orchestration_status": "activated"
+ },
+ {
+ "service_instance_order": "12",
+ "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959422a",
+ "service_instance_name": "eMBB instancel",
+ "service_type":"eMBB",
+ "orchestration_status": "deactivated"
+ }
+ ]
+ }
+} \ No newline at end of file
diff --git a/usecaseui-portal/src/app/mock/json/slicing_nsi_list_activated.json b/usecaseui-portal/src/app/mock/json/slicing_nsi_list_activated.json
new file mode 100644
index 00000000..327352c8
--- /dev/null
+++ b/usecaseui-portal/src/app/mock/json/slicing_nsi_list_activated.json
@@ -0,0 +1,67 @@
+{
+ "result_header": {
+ "result_code": "200",
+ "result_message": "5G slicing NSI service instances result."
+ },
+ "result_body": {
+ "record_number":8,
+ "nsi_service_instances": [
+ {
+ "service_instance_order": "1",
+ "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959411a",
+ "service_instance_name": "eMBB instancel",
+ "nsi_type":"eMBB",
+ "nsi_orchestration-status": "activated"
+ },
+ {
+ "service_instance_order": "2",
+ "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959413a",
+ "service_instance_name": "eMBB instancel",
+ "nsi_type":"eMBB",
+ "nsi_orchestration-status": "activated"
+ },
+ {
+ "service_instance_order": "3",
+ "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959415a",
+ "service_instance_name": "eMBB instancel",
+ "nsi_type":"eMBB",
+ "nsi_orchestration-status": "activated"
+ },
+ {
+ "service_instance_order": "4",
+ "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959415a",
+ "service_instance_name": "eMBB instancel",
+ "nsi_type":"eMBB",
+ "nsi_orchestration-status": "activated"
+ },
+ {
+ "service_instance_order": "5",
+ "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959415a",
+ "service_instance_name": "eMBB instancel",
+ "nsi_type":"eMBB",
+ "nsi_orchestration-status": "activated"
+ },
+ {
+ "service_instance_order": "6",
+ "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959417a",
+ "service_instance_name": "eMBB instancel",
+ "nsi_type":"eMBB",
+ "nsi_orchestration-status": "activated"
+ },
+ {
+ "service_instance_order": "7",
+ "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959419a",
+ "service_instance_name": "eMBB instancel",
+ "nsi_type":"eMBB",
+ "nsi_orchestration-status": "activated"
+ },
+ {
+ "service_instance_order": "8",
+ "service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959421a",
+ "service_instance_name": "eMBB instancel",
+ "nsi_type":"eMBB",
+ "nsi_orchestration-status": "activated"
+ }
+ ]
+ }
+} \ No newline at end of file
diff --git a/usecaseui-portal/src/app/mock/routes.js b/usecaseui-portal/src/app/mock/routes.js
index 9e7f2aeb..d57d9982 100644
--- a/usecaseui-portal/src/app/mock/routes.js
+++ b/usecaseui-portal/src/app/mock/routes.js
@@ -95,7 +95,7 @@ module.exports =
"/uui-slicing/nsmf/task/business/pageNo/:pageNo/pageSize/:pageSize": "/slicing_task_list",
"/uui-slicing/nsmf/task/:processingStatus/business/pageNo/:pageNo/pageSize/:pageSize": "/slicing_task_processing_status",
"/uui-slicing/nsmf/task/:taskId/auditInfo": "/slicing_task_auditInfo",
- "/uui-slicing/nsmf/resource/nsi/instances/pageNo/:pageNo/pageSize/:pageSize": "/slicing_instance",
+ "/uui-slicing/nsmf/resource/nsi/instances/pageNo/:pageNo/pageSize/:pageSize": "/slicing_nsi_list",
"/uui-slicing/nsmf/resource/nsi/:nsiId/nssiInstances": "/slicing_subnet_instance",
"/uui-slicing/nsmf/resource/nssi/:environmentContext/instances/pageNo/:pageNo/pageSize/:pageSize": "/slicing_subnet_context",
"/uui-slicing/nsmf/task/:taskId/taskCreationInfo": "/slicing_taskCreationInfo",
@@ -104,10 +104,13 @@ module.exports =
///////<-------------slicing_business--------->/////
"/uui-slicing/nsmf/resource/business/pageNo/:pageNo/pageSize/:pageSize": "/slicing_business_list",
"/uui-slicing/nsmf/resource/:businessStatus/business/pageNo/:pageNo/pageSize/:pageSize": "/slicing_business_list_activated",
- "/PUT/uui-slicing/nsmf/resource/:serviceId/activate": "/slicing_business_activate",
- "/PUT/uui-slicing/nsmf/resource/:serviceId/deactivate": "/slicing_business_activate",
- "/DELETE/uui-slicing/nsmf/resource/:serviceId": "/slicing_business_activate",
+ "/uui-slicing/nsmf/resource/:serviceId/activate": "/slicing_business_activate",
+ "/uui-slicing/nsmf/resource/:serviceId/deactivate": "/slicing_business_activate",
+ "/uui-slicing/nsmf/resource/:serviceId": "/slicing_business_activate",
"/uui-slicing/nsmf/resource/:serviceId/progress":"/getSlicingBusinessProgress",
+ ///////<-------------slicing_nsi--------->/////
+ // "/uui-slicing/nsmf/resource/nsi/instances/pageNo/:pageNo/pageSize/:pageSize": "/slicing_nsi_list",
+ "/uui-slicing/nsmf/resource/nsi/:instanceStatus/instances/pageNo/:pageNo/pageSize/:pageSize": "/slicing_nsi_list_activated",
///////<-------------general interface--------->/////
"/api/*": "/$1",
"/*/*": "/$1_$2",
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-management.component.html b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-management.component.html
index f4a3f37e..f9baae7a 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-management.component.html
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-management.component.html
@@ -1,3 +1,3 @@
<p>
- nsi-management works!
+ <app-nsi-table></app-nsi-table>
</p>
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.html b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.html
new file mode 100644
index 00000000..5bcdbb6a
--- /dev/null
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.html
@@ -0,0 +1,45 @@
+<div class="slicing-resource-table">
+ <div nz-row>
+ <div nz-col nzSpan="12" class="task_status">
+ <span>Status : </span>
+ <nz-select nzShowSearch nzPlaceHolder="Select a processing status" [(ngModel)]="selectedValue">
+ <nz-option *ngFor="let item of statusOptions" [nzLabel]="item" [nzValue]="item"></nz-option>
+ </nz-select>
+ </div>
+ </div>
+ <div>
+ <nz-table
+ #nsiTable
+ [nzData]="listOfData"
+ [nzFrontPagination]="false"
+ [nzPageSizeOptions]="[5,10,15,20]"
+ [nzTotal]='total'
+ [(nzPageSize)]="pageSize"
+ [(nzPageIndex)]='pageIndex'
+ [nzLoading]="loading"
+ >
+ <thead>
+ <tr>
+ <th>Service Instance Id</th>
+ <th>Service Instance Name</th>
+ <th>Service Type</th>
+ <th>Status</th>
+ <th width="140px">Detail</th>
+ </tr>
+ </thead>
+ <tbody>
+ <ng-template ngFor let-data [ngForOf]="nsiTable.data" let-i="index">
+ <tr>
+ <td>{{ data.service_instance_id }}</td>
+ <td>{{ data.service_instance_name }}</td>
+ <td>{{ data.service_type }}</td>
+ <td>{{data.orchestration_status}}</td>
+ <td>
+ <a (click)="showdetail(data)">detail</a>
+ </td>
+ </tr>
+ </ng-template>
+ </tbody>
+ </nz-table>
+ </div>
+</div> \ No newline at end of file
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.less b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.less
new file mode 100644
index 00000000..66da35df
--- /dev/null
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.less
@@ -0,0 +1,9 @@
+nz-select {
+ width: 200px;
+}
+.task_status{
+ margin-bottom: 20px;
+ span{
+ margin-right: 5%;
+ }
+} \ No newline at end of file
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.spec.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.spec.ts
new file mode 100644
index 00000000..a6fc9167
--- /dev/null
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NsiTableComponent } from './nsi-table.component';
+
+describe('NsiTableComponent', () => {
+ let component: NsiTableComponent;
+ let fixture: ComponentFixture<NsiTableComponent>;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ NsiTableComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(NsiTableComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.ts
new file mode 100644
index 00000000..372504e8
--- /dev/null
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component.ts
@@ -0,0 +1,53 @@
+import { Component, OnInit } from '@angular/core';
+import {BUSINESS_STATUS} from '../../../../../../../constants/constants';
+import { NzModalService } from 'ng-zorro-antd';
+import {SlicingTaskServices} from "../../../../../../core/services/slicingTaskServices";
+@Component({
+ selector: 'app-nsi-table',
+ templateUrl: './nsi-table.component.html',
+ styleUrls: ['./nsi-table.component.less']
+})
+export class NsiTableComponent implements OnInit {
+
+ constructor(
+ private myhttp: SlicingTaskServices,
+ private modalService: NzModalService
+ ) {
+ }
+
+ ngOnInit() {
+ this.getNsiList()
+ }
+ selectedValue:string = BUSINESS_STATUS[0];
+ listOfData: any[] = [];
+ pageIndex: number = 1;
+ pageSize: number = 10;
+ total: number = 100;
+ loading = false;
+ isSelect: boolean = false;
+ statusOptions: any[] = BUSINESS_STATUS;
+
+ getNsiList (): void{
+ this.loading = true;
+ this.isSelect = false;
+ let paramsObj = {
+ pageNo: this.pageIndex,
+ pageSize: this.pageSize
+ };
+ if(this.selectedValue !== BUSINESS_STATUS[0]){
+ paramsObj["instanceStatus"] = this.selectedValue;
+ this.isSelect = true;
+ }
+ this.myhttp.getSlicingNsiList(paramsObj,this.isSelect).subscribe (res => {
+ const { result_header: { result_code }, result_body: { nsi_service_instances } } = res;
+ if (+result_code === 200) {
+ this.total = nsi_service_instances.length;
+ this.loading = false;
+ this.listOfData = nsi_service_instances;
+ }
+ })
+ }
+ showdetail(data){
+
+ }
+}
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-management.component.html b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-management.component.html
index 7626b040..eaf98ab0 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-management.component.html
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-management.component.html
@@ -1,3 +1,3 @@
-<h3>
+<p>
<app-slicing-business-table></app-slicing-business-table>
-</h3> \ No newline at end of file
+</p> \ 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-table/slicing-business-table.component.html b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.html
index 07bdc07e..2eaf881e 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.html
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.html
@@ -23,11 +23,11 @@
>
<thead>
<tr>
- <th>Service_instance_id</th>
- <th>Service_instance_name</th>
- <th>Service_type</th>
+ <th>Service Instance Id</th>
+ <th>Service Instance Name</th>
+ <th>Service Type</th>
<th>S-NSSAI</th>
- <th>Orchestration_status</th>
+ <th>Status</th>
<th width="130px">Aciton</th>
<th width="100px">Detail</th>
</tr>
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.ts
index 884a3be4..05592569 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.ts
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.ts
@@ -19,7 +19,9 @@ export class SlicingBusinessTableComponent implements OnInit {
ngOnInit() {
this.getBusinessList()
}
-
+ ngOnDestroy() {
+ clearInterval(this.progressingTimer);
+ }
selectedValue:string = BUSINESS_STATUS[0];
listOfData: any[] = [];
pageIndex: number = 1;