X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fservices%2Fapp-mgr%2Fapp-mgr.service.ts;h=afe7a657179fa210103f4fd2291dc5474e24f215;hb=67bad64d2c84ff56f020b17e97daf2d35278289a;hp=10683aefa8260b59de9ada7939387ad8b038bd1f;hpb=1be4d77f0cd2d00da3ed33e21805f3c1abcac272;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 10683aef..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.
@@ -18,7 +18,7 @@
  * ========================LICENSE_END===================================
  */
 import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
+import { HttpClient, HttpResponse } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { XMXappInfo, XMDeployableApp, XMDeployedApp } from '../../interfaces/app-mgr.types';
 
@@ -29,23 +29,33 @@ 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) {
+  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) {
-    return this.httpClient.delete((this.basePath + '/' + name), { observe: 'response' });
+  undeployXapp(name: string): Observable<HttpResponse<Object>> {
+    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'));
+  }
+
+  putConfig(config: any): Observable<HttpResponse<Object>> {
+    return this.httpClient.put((this.basePath + '/config' ), config, { observe: 'response' });
+  }
+
+
 }