* ========================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.
* ========================LICENSE_END===================================
*/
import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-import { E2SetupRequest } from '../../interfaces/e2-mgr.types';
+import { HttpClient, HttpResponse } from '@angular/common/http';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { E2RanDetails, E2SetupRequest } from '../../interfaces/e2-mgr.types';
+import { DashboardSuccessTransport } from '../../interfaces/dashboard.types';
@Injectable({
providedIn: 'root'
export class E2ManagerService {
- private basePath = 'api/e2mgr/';
+ private basePath = 'api/e2mgr/nodeb/';
constructor(private httpClient: HttpClient) {
// injects to variable httpClient
}
/**
- * Gets E2 manager client version details
- * @returns Observable that should yield a DashboardSuccessTransport object
+ * Gets E2 client version details
+ * @returns Observable that should yield a String
*/
- getE2ManagerVersion() {
- return this.httpClient.get(this.basePath + 'version');
+ getVersion(): Observable<string> {
+ const url = this.basePath + 'version';
+ return this.httpClient.get<DashboardSuccessTransport>(url).pipe(
+ // Extract the string here
+ map(res => res['data'])
+ );
}
/**
- * Gets setup request history
+ * Gets RAN details
* @returns Observable that should yield an array of objects
*/
- getAll() {
- return this.httpClient.get(this.basePath + 'setup');
+ getRan(): Observable<Array<E2RanDetails>> {
+ return this.httpClient.get<Array<E2RanDetails>>(this.basePath + 'ran');
}
/**
* Sends a request to setup an ENDC/gNodeB connection
- * @returns Observable
+ * @returns Observable. On success there is no data, only a code.
*/
- endcSetup(req: E2SetupRequest) {
- return this.httpClient.post(this.basePath + 'endcSetup', req);
+ endcSetup(req: E2SetupRequest): Observable<HttpResponse<Object>> {
+ return this.httpClient.post(this.basePath + 'endc-setup', req, { observe: 'response' });
}
/**
* Sends a request to setup an X2/eNodeB connection
- * @returns Observable
+ * @returns Observable. On success there is no data, only a code.
*/
- x2Setup(req: E2SetupRequest) {
- return this.httpClient.post(this.basePath + 'x2Setup', req);
+ x2Setup(req: E2SetupRequest): Observable<HttpResponse<Object>> {
+ return this.httpClient.post(this.basePath + 'x2-setup', req, { observe: 'response' });
}
/**
* Sends a request to drop all RAN connections
- * @returns Observable
+ * @returns Observable with body.
*/
- nodebDelete() {
- return this.httpClient.delete((this.basePath + 'nodeb'), { observe: 'response' });
+ nodebPut(): Observable<any> {
+ return this.httpClient.put((this.basePath + 'shutdown'), { observe: 'body' });
}
}