modify the url

Issue-ID: USECASEUI-730

Signed-off-by: zoulingli128 <zll_1208@126.com>
Change-Id: I2db44cba690202bfbcf63f8eee707c39838d6b94

diff --git a/usecaseui-portal/proxy.conf.json b/usecaseui-portal/proxy.conf.json
index 78ebbfc..1ca1ad8 100644 (file)
--- a/usecaseui-portal/proxy.conf.json
+++ b/usecaseui-portal/proxy.conf.json
@@ -4,5 +4,11 @@
         "secure": false,
         "logLevel": "debug",
         "changeOrigin": true
+    },
+    "/api/usecaseui-intent-analysis/v1": {
+        "target": "https://192.168.235.25:30283",
+        "secure": false,
+        "logLevel": "debug",
+        "changeOrigin": true
     }
 }
\ No newline at end of file

diff --git a/usecaseui-portal/src/app/core/services/intentManagement.service.ts b/usecaseui-portal/src/app/core/services/intentManagement.service.ts
index 12fce9d..21b6f37 100644 (file)
--- a/usecaseui-portal/src/app/core/services/intentManagement.service.ts
+++ b/usecaseui-portal/src/app/core/services/intentManagement.service.ts
@@ -16,18 +16,16 @@
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams, HttpResponse } from '@angular/common/http';
 import { Observable } from 'rxjs/Observable';
-import { baseUrl } from '../models/dataInterface';
 
 @Injectable()
 export class IntentManagementService {
 
   constructor(private http: HttpClient) { }
-  baseUrl = baseUrl.baseUrl;
   url = {
-    createIntentManagement: this.baseUrl + "/api/usecaseui-intent-analysis/v1/intents",
-    getIntentManagement: this.baseUrl + "/api/usecaseui-intent-analysis/v1/intents",
-    deleteIntentManagement: this.baseUrl + "/api/usecaseui-intent-analysis/v1/intents/",
-    updateIntentManagementData: this.baseUrl + "/api/usecaseui-intent-analysis/v1/intents/"
+    createIntentManagement:  "/api/usecaseui-intent-analysis/v1/intents",
+    getIntentManagement:  "/api/usecaseui-intent-analysis/v1/intents",
+    deleteIntentManagement: "/api/usecaseui-intent-analysis/v1/intents/",
+    updateIntentManagementData: "/api/usecaseui-intent-analysis/v1/intents/"
   };
 
   // intentManagement

diff --git a/usecaseui-portal/src/app/views/intent-management/input-intent-expectation/input-intent-expectation.component.ts b/usecaseui-portal/src/app/views/intent-management/input-intent-expectation/input-intent-expectation.component.ts
index 3848ffb..a76c73b 100644 (file)
--- a/usecaseui-portal/src/app/views/intent-management/input-intent-expectation/input-intent-expectation.component.ts
+++ b/usecaseui-portal/src/app/views/intent-management/input-intent-expectation/input-intent-expectation.component.ts
@@ -21,7 +21,7 @@ export class InputIntentExpectationComponent implements OnInit {
     expectationName:'',
     expectationType:'DELIVERY',
     expectationObject:{
-      objectType:'CLL_VPN',
+      objectType:'CCVPN',
       objectInstance:'',
     },
     expectationTargets:[]
@@ -42,7 +42,8 @@ export class InputIntentExpectationComponent implements OnInit {
       { label:'ASSURANCE', value:'ASSURANCE' }
     ]
     this.expectationObjectTypeList = [
-      { label:'CLL_VPN', value:'CLL_VPN' }
+      { label:'CCVPN', value:'CCVPN' },
+      { label:'SLICING', value:'SLICING' }
     ]
   }
 
@@ -81,7 +82,7 @@ export class InputIntentExpectationComponent implements OnInit {
       expectationName:'',
       expectationType:'DELIVERY',
       expectationObject:{
-        objectType:'CLL_VPN',
+        objectType:'CCVPN',
         objectInstance:'',
       },
       expectationTargets:[]