X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fsignal%2Fsignal.component.ts;fp=webapp-frontend%2Fsrc%2Fapp%2Fsignal%2Fsignal.component.ts;h=5a9b9252ed7350a2261d0845edbbda121b04dd33;hb=2239b1d982aafe5e7dce4dbbec5100f3e3191249;hp=3af4ca8a063b2d5d5ab0a8ae975b7ecd7a31d6c1;hpb=2316ebd446dc9993b7c364ccb96d24f009195aa8;p=portal%2Fric-dashboard.git

diff --git a/webapp-frontend/src/app/signal/signal.component.ts b/webapp-frontend/src/app/signal/signal.component.ts
index 3af4ca8a..5a9b9252 100644
--- a/webapp-frontend/src/app/signal/signal.component.ts
+++ b/webapp-frontend/src/app/signal/signal.component.ts
@@ -19,139 +19,141 @@
  */
 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 { SignalService } from '../services/signal/signal.service';
+import { E2SetupRequest } from '../interfaces/e2-mgr.types';
 
 @Component({
-    selector: 'app-signal',
-    templateUrl: 'signal.component.html',
-    styleUrls: ['signal.component.css']
+  selector: 'app-signal',
+  templateUrl: 'signal.component.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));
+  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',
+      }
     }
+  };
 
-    openRanConnectDialog() {
+  source: LocalDataSource = new LocalDataSource();
 
-        const dialogRef = this.dialog.open(AppRANConnectDialog,  {
-            width: '450px',
-            data: {ranName: this.ranName, ranIp: this.ranIp, ranPort: this.ranPort}
-    })
+  constructor(private service: SignalService, public dialog: MatDialog, private http: HttpClient) {
+    this.service.getAll().subscribe((val: any[]) => this.source.load(val));
+  }
 
-        dialogRef.afterClosed().subscribe(result => {
-            this.service.getAll().subscribe((val: any[]) => this.source.load(val));
-        });
+  openRanConnectDialog() {
+    const dialogRef = this.dialog.open(AppRANConnectDialog, {
+      width: '450px',
+      data: { }
+    })
+    dialogRef.afterClosed().subscribe(result => {
+      this.service.getAll().subscribe((val: any[]) => this.source.load(val));
+    });
+  }
 
-    }
-}
+}// class SignalComponent
 
 @Component({
-    selector: 'app-signal-ranconnect-dialog',
-    templateUrl: 'signal.component.ranconnect-dialog.html',
-    styleUrls: ['signal.component.css']
+  selector: 'app-signal-ranconnect-dialog',
+  templateUrl: 'signal.component.ranconnect-dialog.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) {
-    }
-
-    public ranDialogForm: FormGroup;
+  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)])
-            });
+  constructor(
+      public dialogRef: MatDialogRef<AppRANConnectDialog>,
+      private service: SignalService, 
+      @Inject(MAT_DIALOG_DATA) public data: E2SetupRequest) { 
     }
 
-    close() {
-        this.dialogRef.close();
+  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);
     }
+  }
 
-    connectRAN(): void {
-        this.service.x2Setup(this.data).subscribe((val: any[]) => {});
-        this.dialogRef.close();
+  private executeSetupConnection = (ranFormValue) => {
+    let setupRequest: E2SetupRequest = {
+      ranName: ranFormValue.ranName,
+      ranIp:   ranFormValue.ranIp,
+      ranPort: ranFormValue.ranPort
     }
-
-    public hasError(controlName: string, errorName: string) {
-        if (this.ranDialogForm.controls[controlName].hasError(errorName))
-            return true;
-        return false;
+    if (ranFormValue.ranType === 'endc') {
+      this.service.endcSetup(setupRequest).subscribe((val: any[]) => {});
     }
+    else {
+      this.service.x2Setup(setupRequest).subscribe((val: any[]) => {});
+    }
+    this.dialogRef.close();
+  }
+
+  public hasError(controlName: string, errorName: string) {
+    if (this.ranDialogForm.controls[controlName].hasError(errorName))
+      return true;
+    return false;
+  }
 
   public validateControl(controlName: string) {
-        if (this.ranDialogForm.controls[controlName].invalid && this.ranDialogForm.controls[controlName].touched)
-            return true;
-        return false;
-    }
-}
+    if (this.ranDialogForm.controls[controlName].invalid && this.ranDialogForm.controls[controlName].touched)
+      return true;
+    return false;
+  }
+
+} // class AppRANConnectDialog