From 60f422d33e1bab1f81b64cb832333f4d5d8501b5 Mon Sep 17 00:00:00 2001 From: "Sarkar, Anand (as0481)" Date: Sun, 12 May 2019 11:45:48 -0400 Subject: [PATCH] Input validations RAN Connect Change-Id: I83862860053c0a75ccc4dbf15cedfc47714cbb3a Issue-Id: RICPLT-1277 Signed-off-by: Sarkar, Anand (as0481) Signed-off-by: Lott, Christopher (cl778h) --- docs/release-notes.rst | 3 +- webapp-frontend/src/app/app.module.ts | 20 ++++----- .../signal/signal.component.ranconnect-dialog.html | 48 ++++++++++++++-------- webapp-frontend/src/app/signal/signal.component.ts | 32 +++++++++++++-- 4 files changed, 73 insertions(+), 30 deletions(-) diff --git a/docs/release-notes.rst b/docs/release-notes.rst index 8e42eac1..e1b87fb7 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -20,12 +20,13 @@ RIC Dashboard Release Notes =========================== -Version 1.0.2, 10 May 2019 +Version 1.0.2, 13 May 2019 -------------------------- * Update A1 mediator client to version 0.4.0 * Add E2 response message with timestamp and status code * Fetch xAPP instance status information from xAPP Manager and display in dashboard * Allow the user to initiate an E2 (X2) connection between RIC and gNB/eNB +* User input validations on connections between RIC and eNB/gNB in the dashboard * Add ANR xApp backend with mock implementation Version 1.0.1, 6 May 2019 diff --git a/webapp-frontend/src/app/app.module.ts b/webapp-frontend/src/app/app.module.ts index 19d68560..a9783508 100644 --- a/webapp-frontend/src/app/app.module.ts +++ b/webapp-frontend/src/app/app.module.ts @@ -32,20 +32,20 @@ import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { LoginComponent } from './login/login.component'; -import { CatalogComponent, AppCatalogDeployDialog, } from './catalog/catalog.component'; -import { UiService} from './services/ui/ui.service'; -import { AdminService} from './services/admin/admin.service'; -import { CatalogService} from './services/catalog/catalog.service'; -import { ControlService} from './services/control/control.service'; -import { SignalService} from './services/signal/signal.service'; +import { CatalogComponent, AppCatalogDeployDialog } from './catalog/catalog.component'; +import { UiService } from './services/ui/ui.service'; +import { AdminService } from './services/admin/admin.service'; +import { CatalogService } from './services/catalog/catalog.service'; +import { ControlService } from './services/control/control.service'; +import { SignalService } from './services/signal/signal.service'; import { SidenavListComponent } from './navigation/sidenav-list/sidenav-list.component'; import { ControlComponent } from './control/control.component'; -import { SignalComponent, AppRANConnectDialog} from './signal/signal.component'; +import { SignalComponent, AppRANConnectDialog } from './signal/signal.component'; import { StatsComponent } from './stats/stats.component'; import { AdminComponent } from './admin/admin.component'; -import { CatalogCardComponent} from './ui/catalog-card/catalog-card.component'; -import { ControlCardComponent} from './ui/control-card/control-card.component'; -import { StatCardComponent} from './ui/stat-card/stat-card.component'; +import { CatalogCardComponent } from './ui/catalog-card/catalog-card.component'; +import { ControlCardComponent } from './ui/control-card/control-card.component'; +import { StatCardComponent } from './ui/stat-card/stat-card.component'; import { ModalEventComponent } from './ui/modal-event/modal-event.component'; import { XappComponent } from './xapp/xapp.component'; import { ConfigEventComponent } from './ui/config-event/config-event.component'; diff --git a/webapp-frontend/src/app/signal/signal.component.ranconnect-dialog.html b/webapp-frontend/src/app/signal/signal.component.ranconnect-dialog.html index 715943c3..25b1a28a 100644 --- a/webapp-frontend/src/app/signal/signal.component.ranconnect-dialog.html +++ b/webapp-frontend/src/app/signal/signal.component.ranconnect-dialog.html @@ -22,19 +22,35 @@ Setup RAN Connection -
- - - - - - - - - -
- -
- - -
+
+
+ + + Not more then 50 characters long. + Name is required + Valid name is required + + + + IP is required + Valid IP is required + + + + Port is required + Valid port number is required + +
+
+ + +
+
diff --git a/webapp-frontend/src/app/signal/signal.component.ts b/webapp-frontend/src/app/signal/signal.component.ts index a3ad5a24..e19f97c0 100644 --- a/webapp-frontend/src/app/signal/signal.component.ts +++ b/webapp-frontend/src/app/signal/signal.component.ts @@ -22,8 +22,8 @@ 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 {MatFormFieldModule} from '@angular/material'; -import { FormGroup, FormControl, FormBuilder } from '@angular/forms'; +import { MatFormFieldModule } from '@angular/material'; +import { FormGroup, FormControl, FormBuilder, ReactiveFormsModule, Validators} from '@angular/forms'; import { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs/Rx'; @@ -38,8 +38,8 @@ export interface DialogData { templateUrl: 'signal.component.html', styleUrls: ['signal.component.css'] }) -export class SignalComponent { +export class SignalComponent { settings = { hideSubHeader: true, actions: { @@ -116,7 +116,22 @@ export class AppRANConnectDialog implements OnInit { @Inject(MAT_DIALOG_DATA) public data: DialogData) { } + 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)]) + }); } close() { @@ -128,4 +143,15 @@ export class AppRANConnectDialog implements OnInit { 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; + } } -- 2.16.6