[ONOS-7995] upgrade roadm custom view from GUI to GUI2
1. [Finished] Optical-related device view
2. [Finished] Port view
3. [Finished] Power config on Port view (Private implementation)
4. [Finished] Protocol view for TAPI device
Change-Id: Ie9b81cfa9991a7af2dd485a5df3fe582df830d27
Signed-off-by: Boyuan Yan <boyuan@opennetworking.org>
diff --git a/apps/roadm/web/roadm-gui/projects/roadm-gui-lib/src/lib/roadm/roadm.component.css b/apps/roadm/web/roadm-gui/projects/roadm-gui-lib/src/lib/roadm/roadm.component.css
new file mode 100644
index 0000000..a49562c
--- /dev/null
+++ b/apps/roadm/web/roadm-gui/projects/roadm-gui-lib/src/lib/roadm/roadm.component.css
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2019-present Open Networking Foundation
+ *
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ov-roadm {
+ padding: 20px;
+ color: navy;
+}
+
+#ov-roadm .button-panel {
+ margin: 10px;
+ width: 200px;
+ background-color: #ccf;
+}
+
+#ov-roadm .my-button {
+ cursor: pointer;
+ padding: 4px;
+ text-align: center;
+ color: white;
+ background-color: #99d;
+}
+
+#ov-roadm .number {
+ font-size: 140%;
+ text-align: right;
+}
+
+#ov-roadm .quote {
+ margin: 10px 20px;
+ font-style: italic;
+}
\ No newline at end of file
diff --git a/apps/roadm/web/roadm-gui/projects/roadm-gui-lib/src/lib/roadm/roadm.component.disabledspec.ts b/apps/roadm/web/roadm-gui/projects/roadm-gui-lib/src/lib/roadm/roadm.component.disabledspec.ts
new file mode 100644
index 0000000..815fc0b
--- /dev/null
+++ b/apps/roadm/web/roadm-gui/projects/roadm-gui-lib/src/lib/roadm/roadm.component.disabledspec.ts
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2019-present Open Networking Foundation
+ *
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { RoadmDeviceComponent } from './roadm.component';
+import {ActivatedRoute, Params} from '@angular/router';
+import {CommonModule} from '@angular/common';
+import { of } from 'rxjs';
+import { } from 'jasmine';
+import {
+ FnService,
+ IconService,
+ IconComponent,
+ LogService,
+ TableFilterPipe,
+ LoadingComponent,
+ Gui2FwLibModule,
+} from 'gui2-fw-lib';
+import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
+import {FormsModule} from '@angular/forms';
+import {RouterTestingModule} from '@angular/router/testing';
+
+class MockActivatedRoute extends ActivatedRoute {
+ constructor(params: Params) {
+ super();
+ this.queryParams = of(params);
+ }
+}
+
+class MockIconService {
+ loadIconDef() { }
+}
+
+describe('RoadmDeviceComponent', () => {
+ let fs: FnService;
+ let ar: MockActivatedRoute;
+ let windowMock: Window;
+ let logServiceSpy: jasmine.SpyObj<LogService>;
+ let component: RoadmDeviceComponent;
+ let fixture: ComponentFixture<RoadmDeviceComponent>;
+
+ beforeEach(async(() => {
+ const logSpy = jasmine.createSpyObj('LogService', ['info', 'debug', 'warn', 'error']);
+ ar = new MockActivatedRoute({ 'debug': 'txrx' });
+
+ windowMock = <any>{
+ location: <any>{
+ hostname: 'foo',
+ host: 'foo',
+ port: '80',
+ protocol: 'http',
+ search: { debug: 'true' },
+ href: 'ws://foo:123/onos/ui/websock/path',
+ absUrl: 'ws://foo:123/onos/ui/websock/path'
+ }
+ };
+ fs = new FnService(ar, logSpy, windowMock);
+
+ TestBed.configureTestingModule({
+ imports: [BrowserAnimationsModule, CommonModule, FormsModule, RouterTestingModule, Gui2FwLibModule],
+ declarations: [
+ RoadmDeviceComponent
+ ],
+ providers: [
+ { provide: FnService, useValue: fs },
+ { provide: LogService, useValue: logSpy },
+ { provide: IconService, useClass: MockIconService },
+ { provide: 'Window', useValue: windowMock },
+ ]
+ })
+ .compileComponents();
+ logServiceSpy = TestBed.get(LogService);
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(RoadmDeviceComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/apps/roadm/web/roadm-gui/projects/roadm-gui-lib/src/lib/roadm/roadm.component.html b/apps/roadm/web/roadm-gui/projects/roadm-gui-lib/src/lib/roadm/roadm.component.html
new file mode 100644
index 0000000..3068d77
--- /dev/null
+++ b/apps/roadm/web/roadm-gui/projects/roadm-gui-lib/src/lib/roadm/roadm.component.html
@@ -0,0 +1,115 @@
+<!--
+~ Copyright 2019-present Open Networking Foundation
+~
+~ 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.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
+<div id="ov-device">
+ <onos-loading [theme]="'light'" [running]="loadingIconShown"></onos-loading>
+ <div class="tabular-header">
+ <h2>Devices ({{ tableData.length }} total)</h2>
+ <div class="ctrl-btns">
+ <div class="refresh" (click)="toggleRefresh()">
+ <!-- See icon.theme.css for the defintions of the classes active and refresh-->
+ <onos-icon classes="{{ autoRefresh?'active refresh':'refresh' }}" iconId="refresh" iconSize="42" toolTip="{{ autoRefreshTip }}"></onos-icon>
+ </div>
+ <div class="separator"></div>
+
+ <!--<div>-->
+ <!--<onos-icon classes="{{ selId ? 'current-view':undefined }}" iconId="deviceTable" iconSize="42"></onos-icon>-->
+ <!--</div>-->
+
+ <!--<div (click)="navto('/flow')">-->
+ <!--<onos-icon classes="{{ selId ? 'active-rect' :undefined}}" iconId="flowTable" iconSize="42" toolTip="{{ flowTip }}"></onos-icon>-->
+ <!--</div>-->
+
+ <div (click)="navto('/roadm-gui/roadm-port-gui')">
+ <onos-icon classes="{{ selId ? 'active-rect' :undefined}}" iconId="portTable" iconSize="42" toolTip="{{ portTip }}"></onos-icon>
+ </div>
+
+ </div>
+ <div class="search">
+ <input id="searchinput" [(ngModel)]="tableDataFilter.queryStr" type="search" #search placeholder="Search" />
+ <select [(ngModel)]="tableDataFilter.queryBy">
+ <option value="" disabled>Search By</option>
+ <option value="$">All Fields</option>
+ <option value="id">Device-Id</option>
+ <option value="name">Name</option>
+ <option value="protocol">Protocol</option>
+ </select>
+ </div>
+ </div>
+
+ <div id="summary-list" class="summary-list" onosTableResize>
+ <div class="table-header">
+ <table>
+ <tr>
+ <td colId="available" class="table-icon"></td>
+ <td colId="type" class="table-icon"></td>
+ <td colId="name" (click)="onSort('name')">Friendly Name
+ <onos-icon classes="active-sort" [iconSize]="10" [iconId]="sortIcon('name')"></onos-icon>
+ </td>
+ <td colId="id" (click)="onSort('id')">Device ID
+ <onos-icon classes="active-sort" [iconSize]="10" [iconId]="sortIcon('id')"></onos-icon>
+ </td>
+ <td colId="master" [ngClass]="{width: '130px'}" (click)="onSort('master')">Master
+ <onos-icon classes="active-sort" [iconSize]="10" [iconId]="sortIcon('master')"></onos-icon>
+ </td>
+ <td colId="ports" [ngClass]="{width: '70px'}" (click)="onSort('ports')">Ports
+ <onos-icon classes="active-sort" [iconSize]="10" [iconId]="sortIcon('ports')"></onos-icon>
+ </td>
+ <td colId="vendor" (click)="onSort('vendor')">Vendor
+ <onos-icon classes="active-sort" [iconSize]="10" [iconId]="sortIcon('vendor')"></onos-icon>
+ </td>
+ <td colId="hwVersion" (click)="onSort('hwVersion')">H/W Version
+ <onos-icon classes="active-sort" [iconSize]="10" [iconId]="sortIcon('hwVersion')"></onos-icon>
+ </td>
+ <td colId="swVersion" (click)="onSort('swVersion')">S/W Version
+ <onos-icon classes="active-sort" [iconSize]="10" [iconId]="sortIcon('swVersion')"></onos-icon>
+ </td>
+ <td colId="protocol" [ngClass]="{width: '100px'}" (click)="onSort('protocol')">Protocol
+ <onos-icon classes="active-sort" [iconSize]="10" [iconId]="sortIcon('protocol')"></onos-icon>
+ </td>
+ <td colId="type" (click)="onSort('type')">Type
+ <onos-icon classes="active-sort" [iconSize]="10" [iconId]="sortIcon('type')"></onos-icon>
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div class="table-body">
+ <table>
+ <tr class="table-body" *ngIf="tableData.length === 0" class="no-data">
+ <td colspan="9">{{ annots.noRowsMsg }}</td>
+ </tr>
+ <tr *ngFor="let dev of tableData | filter : tableDataFilter" (click)="selectCallback($event, dev)" [ngClass]="{selected: dev.id === selId, 'data-change': isChanged(dev.id)}">
+ <td class="table-icon">
+ <onos-icon classes="{{ dev._iconid_available}}" iconId={{dev._iconid_available}}></onos-icon>
+ </td>
+ <td class="table-icon">
+ <onos-icon classes="{{dev._iconid_type? 'active-type':undefined}}" iconId="{{dev._iconid_type}}"></onos-icon>
+ </td>
+ <td>{{ dev.name }}</td>
+ <td>{{ dev.id }}</td>
+ <td>{{ dev.master }}</td>
+ <td>{{ dev.ports }}</td>
+ <td>{{ dev.vendor }}</td>
+ <td>{{ dev.hwVersion }}</td>
+ <td>{{ dev.swVersion }}</td>
+ <td>{{ dev.protocol }}</td>
+ <td>{{ dev.type }}</td>
+ </tr>
+ </table>
+ </div>
+ </div>
+
+ <!--<onos-devicedetails class="floatpanels" id="{{ selId }}" (closeEvent)="deselectRow($event)"></onos-devicedetails>-->
+</div>
diff --git a/apps/roadm/web/roadm-gui/projects/roadm-gui-lib/src/lib/roadm/roadm.component.ts b/apps/roadm/web/roadm-gui/projects/roadm-gui-lib/src/lib/roadm/roadm.component.ts
new file mode 100644
index 0000000..592be6b
--- /dev/null
+++ b/apps/roadm/web/roadm-gui/projects/roadm-gui-lib/src/lib/roadm/roadm.component.ts
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2019-present Open Networking Foundation
+ *
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { Component, OnInit, OnDestroy} from '@angular/core';
+
+import {
+ FnService,
+ LogService,
+ WebSocketService,
+ SortDir, TableBaseImpl, TableResponse
+} from 'gui2-fw-lib';
+
+import { ActivatedRoute, Router } from '@angular/router';
+
+/**
+ * Model of the response from WebSocket
+ */
+interface RoadmDeviceTableResponse extends TableResponse {
+ roadms: RoadmDevice[];
+}
+
+/**
+ * Model of the ROADM devices returned from the WebSocket
+ */
+interface RoadmDevice {
+ available: boolean;
+ chassisid: string;
+ hwVersion: string;
+ id: string;
+ master: string;
+ Vendor: string;
+ name: string;
+ ports: number;
+ protocol: string;
+ serial: string;
+ swVersion: string;
+ type: string;
+ _iconid_available: string;
+ _iconid_type: string;
+}
+
+
+/**
+ * ONOS GUI -- Roadm Device View Component
+ */
+@Component({
+ selector: 'roadm-device',
+ templateUrl: './roadm.component.html',
+ styleUrls: ['./roadm.component.css', './roadm.theme.css', '../../../fw/widget/table.css', '../../../fw/widget/table.theme.css']
+})
+export class RoadmDeviceComponent extends TableBaseImpl implements OnInit, OnDestroy {
+
+ // TODO: Update for LION
+ flowTip = 'Show flow view for selected device';
+ portTip = 'Show port view for selected device';
+ groupTip = 'Show group view for selected device';
+ meterTip = 'Show meter view for selected device';
+ pipeconfTip = 'Show pipeconf view for selected device';
+
+ constructor(
+ protected fs: FnService,
+ protected log: LogService,
+ protected as: ActivatedRoute,
+ protected router: Router,
+ protected wss: WebSocketService,
+ ) {
+ super(fs, log, wss, 'roadm');
+ this.responseCallback = this.deviceResponseCb;
+
+ this.as.queryParams.subscribe(params => {
+ this.selId = params['devId'];
+
+ });
+
+ this.payloadParams = {
+ devId: this.selId
+ };
+
+ this.sortParams = {
+ firstCol: 'name',
+ firstDir: SortDir.asc,
+ secondCol: 'id',
+ secondDir: SortDir.desc,
+ };
+ }
+
+ ngOnInit() {
+ this.init();
+ this.log.debug('RoadmDeviceComponent initialized');
+ }
+
+ ngOnDestroy() {
+ this.destroy();
+ this.log.debug('RoadmDeviceComponent destroyed');
+ }
+
+ deviceResponseCb(data: RoadmDeviceTableResponse) {
+ this.log.debug('Device response received for ', data.roadms.length, 'roadm devices');
+ }
+
+ navto(path) {
+ this.log.debug('navigate');
+ if (this.selId) {
+ this.router.navigate([path], { queryParams: { devId: this.selId } });
+ }
+ }
+
+}
diff --git a/apps/roadm/web/roadm-gui/projects/roadm-gui-lib/src/lib/roadm/roadm.theme.css b/apps/roadm/web/roadm-gui/projects/roadm-gui-lib/src/lib/roadm/roadm.theme.css
new file mode 100644
index 0000000..cdc0aba
--- /dev/null
+++ b/apps/roadm/web/roadm-gui/projects/roadm-gui-lib/src/lib/roadm/roadm.theme.css
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2019-present Open Networking Foundation
+ *
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ ONOS GUI -- Roadm Device View (theme) -- CSS file
+ */
+
+.light #device-details-panel .bottom th {
+ background-color: #e5e5e6;
+}
+
+.light #device-details-panel .bottom tr:nth-child(odd) {
+ background-color: #fbfbfb;
+}
+.light #device-details-panel .bottom tr:nth-child(even) {
+ background-color: #f4f4f4;
+}
+#ov-device .tabular-header {
+ text-align: left;
+}
+#ov-device div.summary-list .table-header td {
+ font-weight: bold;
+ font-variant: small-caps;
+ text-transform: uppercase;
+ font-size: 10pt;
+ padding-top: 8px;
+ padding-bottom: 8px;
+ letter-spacing: 0.02em;
+ cursor: pointer;
+ background-color: #e5e5e6;
+ color: #3c3a3a;
+}
+
+#ov-device div.summary-list .table-body {
+ overflow:scroll;
+}
+#ov-device h2 {
+ display: inline-block;
+}
+
+#ov-device, div.ctrl-btns {
+}
+
+#ov-device th, td {
+ text-align: left;
+ padding: 8px;
+}