summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--usecaseui-portal/proxy.conf.json2
-rw-r--r--usecaseui-portal/src/app/core/services/slicingTaskServices.ts4
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.ts32
3 files changed, 20 insertions, 18 deletions
diff --git a/usecaseui-portal/proxy.conf.json b/usecaseui-portal/proxy.conf.json
index abb25e72..8074f68d 100644
--- a/usecaseui-portal/proxy.conf.json
+++ b/usecaseui-portal/proxy.conf.json
@@ -1,6 +1,6 @@
{
"/api/usecaseui-server/v1": {
- "target": "http://159.138.57.166:30399",
+ "target": "http://10.15.0.11:8082",
"secure": false,
"logLevel": "debug",
"changeOrigin": true
diff --git a/usecaseui-portal/src/app/core/services/slicingTaskServices.ts b/usecaseui-portal/src/app/core/services/slicingTaskServices.ts
index 69916c66..a8873d99 100644
--- a/usecaseui-portal/src/app/core/services/slicingTaskServices.ts
+++ b/usecaseui-portal/src/app/core/services/slicingTaskServices.ts
@@ -27,7 +27,7 @@ export class SlicingTaskServices {
auditInfo: this.baseUrl + '/task/{taskId}/auditInfo',
slicingInstance: this.baseUrl + '/resource/nsi/instances/pageNo/{pageNo}/pageSize/{pageSize}',
slicingSubnetInstance: this.baseUrl + '/resource/nsi/{nsiId}/nssiInstances',
- subnetInContext: this.baseUrl + '/resource/nssi/{environmentContext}/instances/pageNo/{pageNo}/pageSize/{pageSize}',
+ subnetInContext: this.baseUrl + '/resource/nssi/environmentContext/{environmentContext}/instances/pageNo/{pageNo}/pageSize/{pageSize}',
submitSlicing: this.baseUrl + '/task/auditInfo',
slicingBasicInfo: this.baseUrl + '/task/{taskId}/taskCreationInfo',
slicingCreateProgress: this.baseUrl + '/task/{taskId}/taskCreationProgress',
@@ -45,7 +45,7 @@ export class SlicingTaskServices {
slicingNsiDetail: this.baseUrl + "/resource/nsi/{nsiId}/details",
//slicing-nssi-management
slicingNssiList: this.baseUrl + "/resource/nssi/instances/pageNo/{pageNo}/pageSize/{pageSize}",
- slicingNssiQueryOfStatus: this.baseUrl + "/resource/nssi/{instanceStatus}/instances/pageNo/{pageNo}/pageSize/{pageSize}",
+ slicingNssiQueryOfStatus: this.baseUrl + "/resource/nssi/instanceStatus/{instanceStatus}/instances/pageNo/{pageNo}/pageSize/{pageSize}",
slicingNssiDetail: this.baseUrl + "/resource/nssi/{nssiId}/details",
//monitor 5G
fetchTraffic: this.baseUrl + "/monitoring/queryTimestamp/{queryTimestamp}/trafficData",
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 bb04c8f5..8054b613 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
@@ -111,14 +111,15 @@ export class SlicingBusinessTableComponent implements OnInit {
serviceId: slicing.service_instance_id
};
let updata = (prodata) => {
- slicing.last_operation_progress = prodata.progress;
- slicing.orchestration_status = prodata.operation_type;
- this.queryProgress(obj, updata).then(() => {
- slicing.last_operation_progress = 100;
- slicing.orchestration_status = finished;
- this.notification1.notificationSuccess('slicing business', finished, slicing.service_instance_id);
- })
+ slicing.last_operation_progress = prodata.progress || 0;
+ slicing.orchestration_status = prodata.operation_type || activateValue;
};
+ this.queryProgress(obj, updata).then(() => {
+ slicing.last_operation_progress = 100;
+ slicing.orchestration_status = finished;
+ this.notification1.notificationSuccess('slicing business', finished, slicing.service_instance_id);
+ this.getBusinessList();
+ })
}else {
this.notification1.notificationFailed('slicing business', finished, slicing.service_instance_id);
console.error(result_message);
@@ -138,20 +139,21 @@ export class SlicingBusinessTableComponent implements OnInit {
const { result_header: { result_code, result_message }, result_body: { operation_id } } = res;
if (+result_code === 200) {
slicing.last_operation_progress = 0;
- slicing.orchestration_status = 'deactivate';
+ slicing.orchestration_status = 'delete';
console.log(operation_id,"operation_id");
let obj = {
serviceId: slicing.service_instance_id
};
let updata = (prodata) => {
- slicing.last_operation_progress = prodata.progress;
- slicing.orchestration_status = prodata.operation_type;
- this.queryProgress(obj, updata).then(() => {
- slicing.last_operation_progress = 100;
- slicing.orchestration_status = "terminated";
- this.notification1.notificationSuccess('slicing business', 'terminate', slicing.service_instance_id);
- })
+ slicing.last_operation_progress = prodata.progress || 0;
+ slicing.orchestration_status = prodata.operation_type || "delete";
};
+ this.queryProgress(obj, updata).then(() => {
+ slicing.last_operation_progress = 100;
+ slicing.orchestration_status = "terminated";
+ this.notification1.notificationSuccess('slicing business', 'terminate', slicing.service_instance_id);
+ this.getBusinessList();
+ })
}else {
this.notification1.notificationFailed('slicing business', 'terminate', slicing.service_instance_id);
console.error(result_message)