feat: support jonit test

Change-Id: Id337965c68f9636cab8dc14b9ba91773bdefebe3
Issue-ID: USECASEUI-352
Signed-off-by: cyuamber <xuranyjy@chinamobile.com>

1 files changed, 66 insertions, 66 deletions

diff --git a/usecaseui-portal/src/app/core/services/slicingTaskServices.ts b/usecaseui-portal/src/app/core/services/slicingTaskServices.ts
index bf74fea7..69916c66 100644
--- a/usecaseui-portal/src/app/core/services/slicingTaskServices.ts
+++ b/usecaseui-portal/src/app/core/services/slicingTaskServices.ts
@@ -20,7 +20,7 @@ import { Observable } from 'rxjs/Observable';
 @Injectable()

 export class SlicingTaskServices {

     constructor(private http: HttpClient) { }

-    baseUrl: string = '/api/uui-slicing/nsmf';

+    baseUrl: string = '/api/usecaseui-server/v1/uui-slicing/nsmf';

     url = {

         slicingTaskList: this.baseUrl + "/task/business/pageNo/{pageNo}/pageSize/{pageSize}",

         taskProcessingStatus: this.baseUrl + '/task/{processingStatus}/business/pageNo/{pageNo}/pageSize/{pageSize}',

@@ -28,102 +28,102 @@ export class SlicingTaskServices {
         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}',

-        submitSlicing: this.baseUrl + '/task/auditInfo',  

+        submitSlicing: this.baseUrl + '/task/auditInfo',

         slicingBasicInfo: this.baseUrl + '/task/{taskId}/taskCreationInfo',

         slicingCreateProgress: this.baseUrl + '/task/{taskId}/taskCreationProgress',

         //slicing-business-management

-        slicingBusinessList:this.baseUrl+"/resource/business/pageNo/{pageNo}/pageSize/{pageSize}",

-        slicingBusinesQueryOfStatus:this.baseUrl+"/resource/{businessStatus}/business/pageNo/{pageNo}/pageSize/{pageSize}",

-        activateSlicingService:this.baseUrl+"/resource/{serviceId}/activate",

-        deactivateSlicingService:this.baseUrl+"/resource/{serviceId}/deactivate",

-        terminateSlicingService:this.baseUrl+"/resource/{serviceId}",

-        queryOperationProgress:this.baseUrl+"/resource/{serviceId}/progress",

-        slicingBusinessDetail:this.baseUrl+"/resource/business/{businessId}/details",

+        slicingBusinessList: this.baseUrl + "/resource/business/pageNo/{pageNo}/pageSize/{pageSize}",

+        slicingBusinesQueryOfStatus: this.baseUrl + "/resource/{businessStatus}/business/pageNo/{pageNo}/pageSize/{pageSize}",

+        activateSlicingService: this.baseUrl + "/resource/{serviceId}/activate",

+        deactivateSlicingService: this.baseUrl + "/resource/{serviceId}/deactivate",

+        terminateSlicingService: this.baseUrl + "/resource/{serviceId}",

+        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",

+        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",

         //slicing-nssi-management

-        slicingNssiList:this.baseUrl+"/resource/nssi/instances/pageNo/{pageNo}/pageSize/{pageSize}",

-        slicingNssiQueryOfStatus:this.baseUrl+"/resource/nssi/{instanceStatus}/instances/pageNo/{pageNo}/pageSize/{pageSize}",

-        slicingNssiDetail:this.baseUrl+"/resource/nssi/{nssiId}/details",

+        slicingNssiList: this.baseUrl + "/resource/nssi/instances/pageNo/{pageNo}/pageSize/{pageSize}",

+        slicingNssiQueryOfStatus: this.baseUrl + "/resource/nssi/{instanceStatus}/instances/pageNo/{pageNo}/pageSize/{pageSize}",

+        slicingNssiDetail: this.baseUrl + "/resource/nssi/{nssiId}/details",

         //monitor 5G

-        fetchTraffic:this.baseUrl+"/monitoring/queryTimestamp/{queryTimestamp}/trafficData",

-        fetchOnlineusers:this.baseUrl+"/monitoring/queryTimestamp/{queryTimestamp}/onlineUsers",

-        fetchBandwidth:this.baseUrl+"/monitoring/queryTimestamp/{queryTimestamp}/bandwidth"

+        fetchTraffic: this.baseUrl + "/monitoring/queryTimestamp/{queryTimestamp}/trafficData",

+        fetchOnlineusers: this.baseUrl + "/monitoring/queryTimestamp/{queryTimestamp}/onlineUsers",

+        fetchBandwidth: this.baseUrl + "/monitoring/queryTimestamp/{queryTimestamp}/bandwidth"

     }

 

 

-    

+

     // Get slicing order task list

-    getSlicingTaskList (pageNo: string, pageSize: string) {

+    getSlicingTaskList(pageNo: string, pageSize: string) {

         const url = this.url.slicingTaskList

-                        .replace("{pageNo}", pageNo)

-                        .replace("{pageSize}", pageSize);

+            .replace("{pageNo}", pageNo)

+            .replace("{pageSize}", pageSize);

         return this.http.get<any>(url);

     }

     // Get list based on task processing status

-    getTaskProcessingStatus (processingStatus: string, pageNo: string, pageSize: string) {

+    getTaskProcessingStatus(processingStatus: string, pageNo: string, pageSize: string) {

         const url = this.url.taskProcessingStatus

-                        .replace('{processingStatus}', processingStatus)

-                        .replace("{pageNo}", pageNo)

-                        .replace("{pageSize}", pageSize);

+            .replace('{processingStatus}', processingStatus)

+            .replace("{pageNo}", pageNo)

+            .replace("{pageSize}", pageSize);

         return this.http.get<any>(url);

     }

     // Get 

-    getAuditInfo (taskId: string){

+    getAuditInfo(taskId: string) {

         const url = this.url.auditInfo.replace('{taskId}', taskId);

         return this.http.get<any>(url);

     }

-    getSlicingInstance (pageNo: string, pageSize: string){

+    getSlicingInstance(pageNo: string, pageSize: string) {

         const url = this.url.slicingInstance

-                        .replace("{pageNo}", pageNo)

-                        .replace("{pageSize}", pageSize);

+            .replace("{pageNo}", pageNo)

+            .replace("{pageSize}", pageSize);

         return this.http.get<any>(url);

     }

-    getSlicingSubnetInstance(nsiId: string){

+    getSlicingSubnetInstance(nsiId: string) {

         const url = this.url.slicingSubnetInstance.replace('{nsiId}', nsiId);

         return this.http.get<any>(url);

     }

-    getSubnetInContext (context: string, pageNo: string, pageSize: string) {

+    getSubnetInContext(context: string, pageNo: string, pageSize: string) {

         const url = this.url.subnetInContext

-                        .replace('{environmentContext}', context)

-                        .replace('{pageNo}', pageNo)

-                        .replace('{pageSize}', pageSize);

+            .replace('{environmentContext}', context)

+            .replace('{pageNo}', pageNo)

+            .replace('{pageSize}', pageSize);

         return this.http.get<any>(url);

     }

-    submitSlicing (reqbody) {

+    submitSlicing(reqbody) {

         return this.http.put<any>(this.url.submitSlicing, reqbody)

     }

-    getSlicingBasicInfo (taskId: string) {

+    getSlicingBasicInfo(taskId: string) {

         const url = this.url.slicingBasicInfo.replace('{taskId}', taskId);

         return this.http.get<any>(url);

     }

-    getSlicingCreateProgress (taskId: string) {

+    getSlicingCreateProgress(taskId: string) {

         const url = this.url.slicingCreateProgress.replace('{taskId', taskId);

         return this.http.get<any>(url);

     }

 

     // Get slicing business list

-    getSlicingBusinessList (paramsObj,isSelect: boolean) {

-        let url = this.url.slicingBusinessList .replace("{pageNo}", paramsObj.pageNo)

+    getSlicingBusinessList(paramsObj, isSelect: boolean) {

+        let url = this.url.slicingBusinessList.replace("{pageNo}", paramsObj.pageNo)

             .replace("{pageSize}", paramsObj.pageSize);

-        if(isSelect){

+        if (isSelect) {

             url = this.url.slicingBusinesQueryOfStatus.replace("{businessStatus}", paramsObj.businessStatus).replace("{pageNo}", paramsObj.pageNo)

                 .replace("{pageSize}", paramsObj.pageSize);

         }

         return this.http.get<any>(url);

     }

     // change slicing business activate status

-    changeActivateSlicingService(paramsObj, activate: boolean){

+    changeActivateSlicingService(paramsObj, activate: boolean) {

         let url = this.url.activateSlicingService.replace("{serviceId}", paramsObj.serviceId);

-        if(activate){

+        if (activate) {

             url = this.url.deactivateSlicingService.replace("{serviceId}", paramsObj.serviceId)

         }

-        return this.http.put<any>(url,paramsObj);

+        return this.http.put<any>(url, paramsObj);

     }

     // terminate slicing business

-    terminateSlicingService(paramsObj){

+    terminateSlicingService(paramsObj) {

         const url = this.url.terminateSlicingService.replace('{serviceId}', paramsObj.serviceId);

         return this.http.delete<any>(url);

     }

@@ -133,52 +133,52 @@ export class SlicingTaskServices {
         return this.http.get<any>(url);

     }

     //get slicingBusinessDetail

-    getSlicingBusinessDetail(businessId: string){

-        let url = this.url.slicingBusinessDetail.replace("{businessId}",businessId);

+    getSlicingBusinessDetail(businessId: string) {

+        let url = this.url.slicingBusinessDetail.replace("{businessId}", businessId);

         return this.http.get<any>(url);

     }

     // Get slicing nsi list

-    getSlicingNsiList (paramsObj,isSelect: boolean) {

-        let url = this.url.slicingNsiList .replace("{pageNo}", paramsObj.pageNo)

+    getSlicingNsiList(paramsObj, isSelect: boolean) {

+        let url = this.url.slicingNsiList.replace("{pageNo}", paramsObj.pageNo)

             .replace("{pageSize}", paramsObj.pageSize);

-        if(isSelect){

+        if (isSelect) {

             url = this.url.slicingNsiQueryOfStatus.replace("{instanceStatus}", paramsObj.instanceStatus).replace("{pageNo}", paramsObj.pageNo)

                 .replace("{pageSize}", paramsObj.pageSize);

         }

         return this.http.get<any>(url);

     }

     //get slicingNsiDetail

-    getSlicingNsiDetail(nsiId: string){

-        let url = this.url.slicingNsiDetail.replace("{nsiId}",nsiId);

+    getSlicingNsiDetail(nsiId: string) {

+        let url = this.url.slicingNsiDetail.replace("{nsiId}", nsiId);

         return this.http.get<any>(url);

     }

     // Get slicing nssi list

-    getSlicingNssiList (paramsObj,isSelect: boolean) {

-        let url = this.url.slicingNssiList .replace("{pageNo}", paramsObj.pageNo)

+    getSlicingNssiList(paramsObj, isSelect: boolean) {

+        let url = this.url.slicingNssiList.replace("{pageNo}", paramsObj.pageNo)

             .replace("{pageSize}", paramsObj.pageSize);

-        if(isSelect){

+        if (isSelect) {

             url = this.url.slicingNssiQueryOfStatus.replace("{instanceStatus}", paramsObj.instanceStatus).replace("{pageNo}", paramsObj.pageNo)

                 .replace("{pageSize}", paramsObj.pageSize);

         }

         return this.http.get<any>(url);

     }

     //get slicingNssiDetail

-    getSlicingNssiDetail(nssiId: string){

-        let url = this.url.slicingNssiDetail.replace("{nssiId}",nssiId);

+    getSlicingNssiDetail(nssiId: string) {

+        let url = this.url.slicingNssiDetail.replace("{nssiId}", nssiId);

         return this.http.get<any>(url);

     }

     //monitor 5G

-    getFetchTraffic(service_list,time){

-        let url = this.url.fetchTraffic.replace("{queryTimestamp}",time);

-        return this.http.post<any>(url,service_list);

+    getFetchTraffic(service_list, time) {

+        let url = this.url.fetchTraffic.replace("{queryTimestamp}", time);

+        return this.http.post<any>(url, service_list);

     }

-    getFetchOnlineusers(service_list,time){

-        let url = this.url.fetchOnlineusers.replace("{queryTimestamp}",time);

-        return this.http.post<any>(url,service_list);

+    getFetchOnlineusers(service_list, time) {

+        let url = this.url.fetchOnlineusers.replace("{queryTimestamp}", time);

+        return this.http.post<any>(url, service_list);

     }

-    getFetchBandwidth(service_list,time){

-        let url = this.url.fetchBandwidth.replace("{queryTimestamp}",time);

-        return this.http.post<any>(url,service_list);

+    getFetchBandwidth(service_list, time) {

+        let url = this.url.fetchBandwidth.replace("{queryTimestamp}", time);

+        return this.http.post<any>(url, service_list);

     }

 

 }