X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=webapp-frontend%2Fsrc%2Fapp%2Fservices%2Fapp-mgr%2Fapp-mgr.service.ts;h=afe7a657179fa210103f4fd2291dc5474e24f215;hb=refs%2Fchanges%2F97%2F1197%2F3;hp=33dd1cb6829a6f7da5e01e1f18262e89a3635c32;hpb=52b5162f9ca85034e0def247f4a4e5c1bda85191;p=portal%2Fric-dashboard.git

diff --git a/webapp-frontend/src/app/services/app-mgr/app-mgr.service.ts b/webapp-frontend/src/app/services/app-mgr/app-mgr.service.ts
index 33dd1cb6..afe7a657 100644
--- a/webapp-frontend/src/app/services/app-mgr/app-mgr.service.ts
+++ b/webapp-frontend/src/app/services/app-mgr/app-mgr.service.ts
@@ -2,14 +2,14 @@
  * ========================LICENSE_START=================================
  * O-RAN-SC
  * %%
- * Copyright (C) 2019 AT&T Intellectual Property and Nokia
+ * Copyright (C) 2019 AT&T Intellectual Property
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,32 +29,32 @@ export class AppMgrService {
     // injects to variable httpClient
   }
 
-  private basePath = 'api/appmgr/xapps';
+  private basePath = 'api/appmgr';
 
   getDeployable(): Observable<XMDeployableApp[]> {
-    return this.httpClient.get<XMDeployableApp[]>(this.basePath + '/list');
+    return this.httpClient.get<XMDeployableApp[]>(this.basePath + '/xapps/list');
   }
 
   getDeployed(): Observable<XMDeployedApp[]> {
-    return this.httpClient.get<XMDeployedApp[]>(this.basePath);
+    return this.httpClient.get<XMDeployedApp[]>(this.basePath + '/xapps');
   }
 
   deployXapp(name: string): Observable<HttpResponse<Object>> {
     const xappInfo: XMXappInfo = { name: name };
-    return this.httpClient.post(this.basePath, xappInfo, { observe: 'response' });
+    return this.httpClient.post((this.basePath + '/xapps'), xappInfo, { observe: 'response' });
   }
 
   undeployXapp(name: string): Observable<HttpResponse<Object>> {
-    return this.httpClient.delete((this.basePath + '/' + name), { observe: 'response' });
+    return this.httpClient.delete((this.basePath + '/xapps'+ '/' + name), { observe: 'response' });
   }
 
   getConfig(): Observable<any[]>{
     return this.httpClient.get<any[]>("/assets/mockdata/config.json");
-    //return this.httpClient.get<any[]>((this.basePath + '/config'));
+    //return this.httpClient.get<any[]>((this.basePath  + '/config'));
   }
 
   putConfig(config: any): Observable<HttpResponse<Object>> {
-    return this.httpClient.post((this.basePath + '/config' ), config, { observe: 'response' });
+    return this.httpClient.put((this.basePath + '/config' ), config, { observe: 'response' });
   }