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