Merge "feat: intent instance management"

2 files changed, 24 insertions, 7 deletions

diff --git a/usecaseui-portal/src/app/core/services/intentBase.service.ts b/usecaseui-portal/src/app/core/services/intentBase.service.ts
index 7fb8104f..5ee8424a 100644
--- a/usecaseui-portal/src/app/core/services/intentBase.service.ts
+++ b/usecaseui-portal/src/app/core/services/intentBase.service.ts
@@ -34,7 +34,10 @@ export class intentBaseService {
       invalidIntentInstance: this.baseUrl + "/intent/invalidIntentInstance",
       queryAccessNodeInfo: this.baseUrl + "/intent/queryAccessNodeInfo",
       intentInstancePredict: this.baseUrl + "/intent/predict",
-      intentBasedUnifyPredict: this.baseUrl + "/intent/unifyPredict"
+      intentBasedUnifyPredict: this.baseUrl + "/intent/unifyPredict",
+      getIntentInstanceList: this.baseUrl + "/intent/getIntentList",
+      delIntentInstance: this.baseUrl + "/intent/deleteIntent",
+      verifyIntentInstance: this.baseUrl + "/intent/verifyIntentInstance"
     };
 
     //The following APIs function are optimizable------------------------
@@ -88,4 +91,17 @@ export class intentBaseService {
     intentBasedUnifyPredict(requestBody) {
       return this.http.post<any>(this.url["intentBasedUnifyPredict"], requestBody);
     }
+
+    getIntentInstanceList(paramsObj) {
+      return this.http.post<any>(this.url["getIntentInstanceList"], paramsObj);
+    }
+
+    delIntentInstance(id) {
+      let params = new HttpParams({ fromObject: { "id": id } });
+      return this.http.delete<any>(this.url['delIntentInstance'], { params });
+    }
+
+    verifyIntentInstance(paramsObj) {
+      return this.http.post<any>(this.url['verifyIntentInstance'], paramsObj);
+    }
 }
diff --git a/usecaseui-portal/src/app/core/services/slicingTaskServices.ts b/usecaseui-portal/src/app/core/services/slicingTaskServices.ts
index 362e9f6a..292d9bdd 100644
--- a/usecaseui-portal/src/app/core/services/slicingTaskServices.ts
+++ b/usecaseui-portal/src/app/core/services/slicingTaskServices.ts
@@ -13,13 +13,10 @@
     See the License for the specific language governing permissions and

     limitations under the License.

 */

-import { Injectable } from "@angular/core";

 import {

-	HttpClient,

-	HttpHeaders,

-	HttpParams,

-	HttpResponse,

+  HttpClient

 } from "@angular/common/http";

+import { Injectable } from "@angular/core";

 import { Http } from "../../shared/utils/http";

 @Injectable()

 export class SlicingTaskServices {

@@ -85,6 +82,7 @@ export class SlicingTaskServices {
 		csmfGetProgress:

 			"/api/usecaseui/csmf/5gSlicing/service/{serviceId}/progress",

 		csmfPurchase: "/api/usecaseui-server/v1/uui-slicing/csmf/5gSlicing",

+    csmfPurchaseWithContent: '/api/usecaseui-server/v1/intent/csmf/5gSlicing',

 		//monitor 5G

 		fetchTraffic:

 			this.baseUrl +

@@ -294,7 +292,10 @@ export class SlicingTaskServices {
 		let url = this.url.csmfPurchase;

 		return this.Http.httpAxios("post", url, paramsObj, failedCallback);

 	}

-

+  csmfSlicingPurchaseWithContent(paramsObj: any, failedCallback?: any) {

+		let url = this.url.csmfPurchaseWithContent;

+		return this.Http.httpAxios("post", url, paramsObj, failedCallback);

+	}

 	//monitor 5G

 	getFetchTraffic(service_list, time, failedCallback?: any) {

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