* ========================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.
import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs';
+ import { map } from 'rxjs/operators';
import { ACAdmissionIntervalControl, ACAdmissionIntervalControlAck } from '../../interfaces/ac-xapp.types';
import { DashboardSuccessTransport } from '../../interfaces/dashboard.types';
+/**
+ * Services for calling the Dashboard's A1 endpoints to get/put AC policies.
+ */
@Injectable({
providedIn: 'root'
})
-export class AcXappService {
+export class ACXappService {
+
+ private basePath = 'api/a1-p';
+ private policyPath = 'policies';
+ private acPolicyName = 'admission_control_policy';
- private basePath = 'api/xapp/ac/';
+ private buildPath(...args: any[]) {
+ let result = this.basePath;
+ args.forEach(part => {
+ result = result + '/' + part;
+ });
+ return result;
+ }
constructor(private httpClient: HttpClient) {
// injects to variable httpClient
}
/**
- * Gets A1 Mediator client version details
- * @returns Observable that should yield a SuccessTransport object
+ * Gets version details
+ * @returns Observable that should yield a String
+ */
+ getVersion(): Observable<string> {
+ const url = this.buildPath('version');
+ return this.httpClient.get<DashboardSuccessTransport>(url).pipe(
+ // Extract the string here
+ map(res => res['data'])
+ );
+ }
+
+ /**
+ * Gets admission control policy.
+ * @returns Observable that should yield an ACAdmissionIntervalControl
*/
- getVersion() {
- // Remember that AC traffic goes via A1!
- return this.httpClient.get<DashboardSuccessTransport>(this.basePath + 'version');
+ getPolicy(): Observable<ACAdmissionIntervalControl> {
+ const url = this.buildPath(this.policyPath, this.acPolicyName);
+ return this.httpClient.get<ACAdmissionIntervalControl>(url);
}
/**
- * Puts control admission time parameters to AC via A1
+ * Puts admission control policy.
* @param policy an instance of ACAdmissionIntervalControl
- * @returns Observable that should yield an ACAdmissionIntervalControlAck
+ * @returns Observable that should yield a response code, no data
*/
- putCaTime(policy: ACAdmissionIntervalControl): Observable<ACAdmissionIntervalControlAck> {
- return this.httpClient.put<ACAdmissionIntervalControlAck>(this.basePath + 'catime', policy);
+ putPolicy(policy: ACAdmissionIntervalControl): Observable<any> {
+ const url = this.buildPath(this.policyPath, this.acPolicyName);
+ return this.httpClient.put<ACAdmissionIntervalControlAck>(url, policy, { observe: 'response' });
}
}