* 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 { Component, OnInit, Inject } from '@angular/core';
import { LocalDataSource } from 'ng2-smart-table';
-import { SignalService } from '../services/signal/signal.service';
import { Router } from '@angular/router';
-import { MatDialog, MatDialogConfig, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog';
+import { MatDialog, MatDialogConfig, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { MatFormFieldModule } from '@angular/material';
-import { FormGroup, FormControl, FormBuilder, ReactiveFormsModule, Validators} from '@angular/forms';
+import { MatRadioModule } from '@angular/material/radio';
+import { FormGroup, FormControl, FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms';
import { HttpClient } from '@angular/common/http';
-import { Observable } from 'rxjs/Rx';
-
-export interface DialogData {
- ranName: string;
- ranIp: number;
- ranPort: number;
-}
+import { E2ManagerService } from '../services/e2-mgr/e2-mgr.service';
+import { E2SetupRequest } from '../interfaces/e2-mgr.types';
@Component({
- selector: 'app-signal',
- templateUrl: 'signal.component.html',
- styleUrls: ['signal.component.css']
+ selector: 'app-signal-ranconnect-dialog',
+ templateUrl: 'signal.component.ranconnect-dialog.html',
+ styleUrls: ['signal.component.css']
})
-export class SignalComponent {
- settings = {
- hideSubHeader: true,
- actions: {
- columnTitle: 'Actions',
- add: false,
- edit: false,
- delete: false,
- position: 'right'
- },
- columns: {
- requestType: {
- title: 'Request Type',
- type: 'string',
- },
- ranName: {
- title: 'eNodeB/gNodeB Name',
- type: 'string',
- },
- ranIp: {
- title: 'IP',
- type: 'number',
- },
- ranPort: {
- title: 'Port',
- type: 'number',
- },
- responseCode: {
- title: 'Response',
- type: 'number',
- },
- timeStamp: {
- title: 'Time Stamp',
- type: 'string',
- }
- }
- };
-
- source: LocalDataSource = new LocalDataSource();
-
- ranName: string;
-
- ranIp: number;
-
- ranPort: number;
-
- constructor(private service: SignalService, public dialog: MatDialog, private http: HttpClient) {
- this.service.getAll().subscribe((val: any[]) => this.source.load(val));
+export class RANConnectDialogComponent implements OnInit {
+
+ public ranDialogForm: FormGroup;
+
+ constructor(
+ public dialogRef: MatDialogRef<RANConnectDialogComponent>,
+ private service: E2ManagerService
+ ,
+ @Inject(MAT_DIALOG_DATA) public data: E2SetupRequest) { }
+
+ ngOnInit() {
+ const namePattern = /^([A-Z]){4}([0-9]){6}$/;
+ const ipPattern = /((^\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\s*$)|(^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$))/;
+ const portPattern = /^([0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$/;
+ this.ranDialogForm = new FormGroup({
+ ranType: new FormControl('endc'),
+ ranName: new FormControl('', [Validators.required, Validators.pattern(namePattern)]),
+ ranIp: new FormControl('', [Validators.required, Validators.pattern(ipPattern)]),
+ ranPort: new FormControl('', [Validators.required, Validators.pattern(portPattern)])
+ });
+ }
+
+ onCancel() {
+ this.dialogRef.close();
+ }
+
+ public setupConnection = (ranFormValue) => {
+ if (this.ranDialogForm.valid) {
+ this.executeSetupConnection(ranFormValue);
}
+ }
- openRanConnectDialog() {
+ private executeSetupConnection = (ranFormValue) => {
+ const setupRequest: E2SetupRequest = {
+ ranName: ranFormValue.ranName,
+ ranIp: ranFormValue.ranIp,
+ ranPort: ranFormValue.ranPort
+ };
+ if (ranFormValue.ranType === 'endc') {
+ this.service.endcSetup(setupRequest).subscribe((val: any[]) => {});
+ } else {
+ this.service.x2Setup(setupRequest).subscribe((val: any[]) => {});
+ }
+ this.dialogRef.close();
+ }
- const dialogRef = this.dialog.open(AppRANConnectDialog, {
- width: '450px',
- data: {ranName: this.ranName, ranIp: this.ranIp, ranPort: this.ranPort}
- })
+ public hasError(controlName: string, errorName: string) {
+ if (this.ranDialogForm.controls[controlName].hasError(errorName)) { return true; }
+ return false;
+ }
- dialogRef.afterClosed().subscribe(result => {
- this.service.getAll().subscribe((val: any[]) => this.source.load(val));
- });
+ public validateControl(controlName: string) {
+ if (this.ranDialogForm.controls[controlName].invalid && this.ranDialogForm.controls[controlName].touched) { return true; }
+ return false;
+ }
- }
-}
+} // class RANConnectDialogComponent
@Component({
- selector: 'app-signal-ranconnect-dialog',
- templateUrl: 'signal.component.ranconnect-dialog.html',
- styleUrls: ['signal.component.css']
+ selector: 'app-signal',
+ templateUrl: 'signal.component.html',
+ styleUrls: ['signal.component.css']
})
-export class AppRANConnectDialog implements OnInit {
-
- constructor(public dialogRef: MatDialogRef<AppRANConnectDialog>,
- private service: SignalService,
- @Inject(MAT_DIALOG_DATA) public data: DialogData) {
+export class SignalComponent {
+ settings = {
+ hideSubHeader: true,
+ actions: {
+ columnTitle: 'Actions',
+ add: false,
+ edit: false,
+ delete: false,
+ position: 'right'
+ },
+ columns: {
+ requestType: {
+ title: 'RAN Type',
+ type: 'string',
+ },
+ ranName: {
+ title: 'eNodeB/gNodeB Name',
+ type: 'string',
+ },
+ ranIp: {
+ title: 'IP',
+ type: 'number',
+ },
+ ranPort: {
+ title: 'Port',
+ type: 'number',
+ },
+ responseCode: {
+ title: 'Response',
+ type: 'number',
+ },
+ timeStamp: {
+ title: 'Time Stamp',
+ type: 'string',
+ }
}
+ };
- public ranDialogForm: FormGroup;
-
- public ranName: string;
-
- public ranIp: number;
-
- public ranPort: number;
-
- ngOnInit() {
- const ipPattern = /((^\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\s*$)|(^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$))/;
- const portPattern = /^([0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$/;
- this.ranDialogForm = new FormGroup({
- ranName: new FormControl('', [Validators.required, Validators.maxLength(50)]),
- ranIp: new FormControl('', [Validators.required, Validators.pattern(ipPattern)]),
- ranPort: new FormControl('', [Validators.required, Validators.pattern(portPattern)])
- });
- }
+ source: LocalDataSource = new LocalDataSource();
- close() {
- this.dialogRef.close();
- }
+ constructor(private service: E2ManagerService
+ , public dialog: MatDialog, private http: HttpClient) {
+ this.service.getAll().subscribe((val: any[]) => this.source.load(val));
+ }
- connectRAN(): void {
- this.service.x2Setup(this.data).subscribe((val: any[]) => {});
- this.dialogRef.close();
- }
+ openRanConnectDialog() {
+ const dialogRef = this.dialog.open(RANConnectDialogComponent, {
+ width: '450px',
+ data: { }
+ });
+ dialogRef.afterClosed().subscribe(result => {
+ this.service.getAll().subscribe((val: any[]) => this.source.load(val));
+ });
+ }
- public hasError(controlName: string, errorName: string) {
- if (this.ranDialogForm.controls[controlName].hasError(errorName))
- return true;
- return false;
- }
+}// class SignalComponent
- public validateControl(controlName: string) {
- if (this.ranDialogForm.controls[controlName].invalid && this.ranDialogForm.controls[controlName].touched)
- return true;
- return false;
- }
-}