Review comment incorporated
Gui2 Intent and Processor View
Change-Id: Ieb3b2c818f31ee7bff73b26cd5b7150c8f6fb92c
diff --git a/web/gui2/src/main/webapp/app/view/processor/processor-routing.module.ts b/web/gui2/src/main/webapp/app/view/processor/processor-routing.module.ts
new file mode 100644
index 0000000..598e451
--- /dev/null
+++ b/web/gui2/src/main/webapp/app/view/processor/processor-routing.module.ts
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2018-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 { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { ProcessorComponent } from './processor/processor.component';
+
+const processorRoutes: Routes = [
+ {
+ path: '',
+ component: ProcessorComponent
+ }
+];
+
+@NgModule({
+ imports: [RouterModule.forChild(processorRoutes)],
+ exports: [RouterModule]
+})
+export class ProcessorRoutingModule { }
diff --git a/web/gui2/src/main/webapp/app/view/processor/processor.module.ts b/web/gui2/src/main/webapp/app/view/processor/processor.module.ts
new file mode 100644
index 0000000..961925a
--- /dev/null
+++ b/web/gui2/src/main/webapp/app/view/processor/processor.module.ts
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2018-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 { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { SvgModule } from '../../fw/svg/svg.module';
+import { WidgetModule } from '../../fw/widget/widget.module';
+import { ProcessorRoutingModule } from './processor-routing.module';
+import { ProcessorComponent } from './processor/processor.component';
+
+@NgModule({
+ imports: [
+ CommonModule,
+ ProcessorRoutingModule,
+ SvgModule,
+ WidgetModule
+ ],
+ declarations: [ProcessorComponent]
+})
+export class ProcessorModule { }
diff --git a/web/gui2/src/main/webapp/app/view/processor/processor/processor.component.css b/web/gui2/src/main/webapp/app/view/processor/processor/processor.component.css
new file mode 100644
index 0000000..ff9163e
--- /dev/null
+++ b/web/gui2/src/main/webapp/app/view/processor/processor/processor.component.css
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2018-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 -- Processor View (layout) -- CSS file
+ */
+ #ov-processor .tabular-header {
+ text-align: left;
+}
+
+#ov-processor h2 {
+ display: inline-block;
+}
+
+#ov-processor 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-processor td {
+ text-align: left;
+}
+
+#ov-processor tr.no-data td {
+ text-align: center;
+}
+
+#ov-processor td.priority {
+ text-align: center;
+}
+
+#ov-processor td.number {
+ text-align: right;
+}
+
diff --git a/web/gui2/src/main/webapp/app/view/processor/processor/processor.component.html b/web/gui2/src/main/webapp/app/view/processor/processor/processor.component.html
new file mode 100644
index 0000000..7073556
--- /dev/null
+++ b/web/gui2/src/main/webapp/app/view/processor/processor/processor.component.html
@@ -0,0 +1,56 @@
+<!--
+~ Copyright 2018-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-processor">
+ <div class="tabular-header">
+ <h2>
+ Packet Processors ({{tableData.length}} Processors total)
+ </h2>
+ <div class="ctrl-btns">
+ <div class="refresh" (click)="toggleRefresh()">
+ <onos-icon classes="{{ autoRefresh?'active refresh':'refresh' }}" iconId="refresh" iconSize="42" toolTip="{{ autoRefreshTip }}"></onos-icon>
+ </div>
+ </div>
+ </div>
+ <div class="summary-list">
+ <div class="table-header">
+ <table onosTableResize>
+ <tr>
+ <td class="priority" colId="priority" [ngStyle]="{width: '80px'}">Priority </td>
+ <td colId="type" [ngStyle]="{width: '80px'}">Type </td>
+ <td colId="processor" [ngStyle]="{width: '500px'}">Class </td>
+ <td class="number" colId="packets" [ngStyle]="{width: '100px'}">Packets </td>
+ <td class="number" colId="avgMillis" [ngStyle]="{width: '100px'}">Average (ms) </td>
+
+ </tr>
+ </table>
+ </div>
+ <div class="table-body">
+ <table onosTableResize id-prop="id">
+ <tr class="table-body" *ngIf="tableData.length === 0" class="no-data">
+ <td colspan="5">{{annots.noRowsMsg}}</td>
+ </tr>
+
+ <tr *ngFor="let processor of tableData" [ngClass]="{'data-change': isChanged(processor.id)}">
+ <td class="priority" [ngStyle]="{width: '80px'}">{{processor.priority}}</td>
+ <td [ngStyle]="{width: '80px'}">{{processor.type}}</td>
+ <td [ngStyle]="{width: '500px'}">{{processor.processor}}</td>
+ <td class="number" [ngStyle]="{width: '100px'}">{{processor.packets}}</td>
+ <td class="number" [ngStyle]="{width: '100px'}">{{processor.avgMillis}}</td>
+ </tr>
+ </table>
+ </div>
+ </div>
+</div>
\ No newline at end of file
diff --git a/web/gui2/src/main/webapp/app/view/processor/processor/processor.component.spec.ts b/web/gui2/src/main/webapp/app/view/processor/processor/processor.component.spec.ts
new file mode 100644
index 0000000..6abded1
--- /dev/null
+++ b/web/gui2/src/main/webapp/app/view/processor/processor/processor.component.spec.ts
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2018-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 { ActivatedRoute, Params } from '@angular/router';
+import { DebugElement } from '@angular/core';
+import { By } from '@angular/platform-browser';
+import { LogService } from '../../../log.service';
+import { FnService } from '../../../fw/util/fn.service';
+import { IconComponent } from '../../../fw/svg/icon/icon.component';
+import { IconService } from '../../../fw/svg/icon.service';
+import { LoadingService } from '../../../fw/layer/loading.service';
+import { WebSocketService } from '../../../fw/remote/websocket.service';
+import { of } from 'rxjs';
+import { } from 'jasmine';
+import { RouterTestingModule } from '@angular/router/testing';
+
+import { ProcessorComponent } from './processor.component';
+
+class MockActivatedRoute extends ActivatedRoute {
+ constructor(params: Params) {
+ super();
+ this.queryParams = of(params);
+ }
+}
+
+
+class MockIconService {
+ loadIconDef() { }
+}
+
+class MockLoadingService {
+ startAnim() { }
+ stop() { }
+ waiting() { }
+}
+
+class MockWebSocketService {
+ createWebSocket() { }
+ isConnected() { return false; }
+ unbindHandlers() { }
+ bindHandlers() { }
+}
+
+describe('ProcessorComponent', () => {
+ let fs: FnService;
+ let ar: MockActivatedRoute;
+ let windowMock: Window;
+ let logServiceSpy: jasmine.SpyObj<LogService>;
+ let component: ProcessorComponent;
+ let fixture: ComponentFixture<ProcessorComponent>;
+
+ const bundleObj = {
+ 'core.view.Processor': {
+ test: 'test1'
+ }
+ };
+
+ 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: [RouterTestingModule],
+ declarations: [ProcessorComponent, IconComponent],
+ providers: [
+ { provide: FnService, useValue: fs },
+ { provide: LoadingService, useClass: MockLoadingService },
+ { provide: IconService, useClass: MockIconService },
+ { provide: LogService, useValue: logSpy },
+ { provide: WebSocketService, useClass: MockWebSocketService },
+ ]
+ })
+ .compileComponents();
+ logServiceSpy = TestBed.get(LogService);
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(ProcessorComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+
+
+ it('should have a div.tabular-header inside a div#ov-processor', () => {
+ const metDe: DebugElement = fixture.debugElement;
+ const divDe = metDe.query(By.css('div#ov-processor div.tabular-header'));
+ expect(divDe).toBeTruthy();
+ });
+
+ it('should have a h2 inside the div.tabular-header', () => {
+ const metDe: DebugElement = fixture.debugElement;
+ const divDe = metDe.query(By.css('div#ov-processor div.tabular-header h2'));
+ const div: HTMLElement = divDe.nativeElement;
+ expect(div.textContent).toEqual(' Packet Processors (0 Processors total) ');
+ });
+
+ it('should have a refresh button inside the div.tabular-header', () => {
+ const metDe: DebugElement = fixture.debugElement;
+ const divDe = metDe.query(By.css('div#ov-processor div.tabular-header div.ctrl-btns div.refresh'));
+ expect(divDe).toBeTruthy();
+ });
+
+
+ it('should have a div.summary-list inside a div#ov-processor', () => {
+ const hostDe: DebugElement = fixture.debugElement;
+ const divDe = hostDe.query(By.css('div#ov-processor div.summary-list'));
+ expect(divDe).toBeTruthy();
+ });
+
+ it('should have a div.table-header inside a div.summary-list inside a div#ov-processor', () => {
+ const hostDe: DebugElement = fixture.debugElement;
+ const divDe = hostDe.query(By.css('div#ov-processor div.summary-list div.table-header'));
+ expect(divDe).toBeTruthy();
+ });
+
+ it('should have a div.table-body inside a div.summary-list inside a div#ov-processor', () => {
+ const hostDe: DebugElement = fixture.debugElement;
+ const divDe = hostDe.query(By.css('div#ov-processor div.summary-list div.table-body'));
+ expect(divDe).toBeTruthy();
+ });
+});
diff --git a/web/gui2/src/main/webapp/app/view/processor/processor/processor.component.ts b/web/gui2/src/main/webapp/app/view/processor/processor/processor.component.ts
new file mode 100644
index 0000000..a7840ec
--- /dev/null
+++ b/web/gui2/src/main/webapp/app/view/processor/processor/processor.component.ts
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2018-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, OnDestroy, OnInit } from '@angular/core';
+import { SortDir, TableBaseImpl, TableResponse } from '../../../fw/widget/table.base';
+import { WebSocketService } from '../../../fw/remote/websocket.service';
+import { LogService } from '../../../log.service';
+import { LoadingService } from '../../../fw/layer/loading.service';
+import { FnService } from '../../../fw/util/fn.service';
+import { ActivatedRoute } from '@angular/router';
+
+/**
+* ONOS GUI -- Processor View Component extends TableBaseImpl
+*/
+@Component({
+ selector: 'onos-processor',
+ templateUrl: './processor.component.html',
+ styleUrls: ['./processor.component.css', '../../../fw/widget/table.css', '../../../fw/widget/table.theme.css']
+})
+export class ProcessorComponent extends TableBaseImpl implements OnInit, OnDestroy {
+
+ constructor(
+ protected fs: FnService,
+ protected log: LogService,
+ protected ls: LoadingService,
+ protected as: ActivatedRoute,
+ protected wss: WebSocketService,
+ ) {
+ super(fs, ls, log, wss, 'processor');
+ }
+
+ ngOnInit() {
+ this.init();
+ this.log.debug('ProcessorComponent initialized');
+ }
+
+ ngOnDestroy() {
+ this.destroy();
+ this.log.debug('ProcessorComponent destroyed');
+ }
+}