GUI2 bug fix for Force graph
Change-Id: I6f47f22327ec115a7a59dd8a6d685f74fccfbe5f
diff --git a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/layer/forcesvg/forcesvg.component.spec.ts b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/layer/forcesvg/forcesvg.component.spec.ts
index 9a2ae0e..aa9ce64 100644
--- a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/layer/forcesvg/forcesvg.component.spec.ts
+++ b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/layer/forcesvg/forcesvg.component.spec.ts
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import {async, ComponentFixture, TestBed} from '@angular/core/testing';
-import { ForceSvgComponent } from './forcesvg.component';
+import {ForceSvgComponent} from './forcesvg.component';
import {FnService, LogService} from 'gui2-fw-lib';
import {DraggableDirective} from './draggable/draggable.directive';
import {ActivatedRoute, Params} from '@angular/router';
@@ -25,6 +25,8 @@
import {SubRegionNodeSvgComponent} from './visuals/subregionnodesvg/subregionnodesvg.component';
import {HostNodeSvgComponent} from './visuals/hostnodesvg/hostnodesvg.component';
import {LinkSvgComponent} from './visuals/linksvg/linksvg.component';
+import {Device, Host, Link, LinkType, Region} from './models';
+import {SimpleChange} from '@angular/core';
class MockActivatedRoute extends ActivatedRoute {
constructor(params: Params) {
@@ -40,6 +42,9 @@
let logServiceSpy: jasmine.SpyObj<LogService>;
let component: ForceSvgComponent;
let fixture: ComponentFixture<ForceSvgComponent>;
+ const sampledata = require('./tests/test-module-topo2CurrentRegion.json');
+ const regionData: Region = <Region><unknown>(sampledata.payload);
+ const emptyRegion: Region = <Region>{devices: [ [], [], [] ], hosts: [ [], [], [] ], links: []};
beforeEach(async(() => {
const logSpy = jasmine.createSpyObj('LogService', ['info', 'debug', 'warn', 'error']);
@@ -88,4 +93,106 @@
it('should create', () => {
expect(component).toBeTruthy();
});
+
+ it('load sample file', () => {
+ expect(sampledata).toBeTruthy();
+ expect(sampledata.payload).toBeTruthy();
+ expect(sampledata.payload.id).toBe('(root)');
+ });
+
+ it('should read sample data payload as Region', () => {
+ expect(regionData).toBeTruthy();
+ // console.log(regionData);
+ expect(regionData.id).toBe('(root)');
+ expect(regionData.devices).toBeTruthy();
+ expect(regionData.devices.length).toBe(3);
+ expect(regionData.devices[2].length).toBe(10);
+ expect(regionData.hosts.length).toBe(3);
+ expect(regionData.hosts[2].length).toBe(20);
+ expect(regionData.links.length).toBe(44);
+ });
+
+ it('should read device246 correctly', () => {
+ const device246: Device = regionData.devices[2][0];
+ expect(device246.id).toBe('of:0000000000000246');
+ expect(device246.nodeType).toBe('device');
+ expect(device246.type).toBe('switch');
+ expect(device246.online).toBe(true);
+ expect(device246.master).toBe('10.192.19.68');
+ expect(device246.layer).toBe('def');
+
+ expect(device246.props.managementAddress).toBe('10.192.19.69');
+ expect(device246.props.protocol).toBe('OF_13');
+ expect(device246.props.driver).toBe('ofdpa-ovs');
+ expect(device246.props.latitude).toBe('40.15');
+ expect(device246.props.name).toBe('s246');
+ expect(device246.props.locType).toBe('geo');
+ expect(device246.props.channelId).toBe('10.192.19.69:59980');
+ expect(device246.props.longitude).toBe('-121.679');
+
+ expect(device246.location.locType).toBe('geo');
+ expect(device246.location.latOrY).toBe(40.15);
+ expect(device246.location.longOrX).toBe(-121.679);
+ });
+
+ it('should read host 3 correctly', () => {
+ const host3: Host = regionData.hosts[2][0];
+ expect(host3.id).toBe('00:88:00:00:00:03/110');
+ expect(host3.nodeType).toBe('host');
+ expect(host3.layer).toBe('def');
+ expect(host3.configured).toBe(false);
+ expect(host3.ips.length).toBe(3);
+ expect(host3.ips[0]).toBe('fe80::288:ff:fe00:3');
+ expect(host3.ips[1]).toBe('2000::102');
+ expect(host3.ips[2]).toBe('10.0.1.2');
+ });
+
+ it('should read link 3-205 correctly', () => {
+ const link3_205: Link = regionData.links[0];
+ expect(link3_205.id).toBe('00:AA:00:00:00:03/None~of:0000000000000205/6');
+ expect(link3_205.epA).toBe('00:AA:00:00:00:03/None');
+ expect(link3_205.epB).toBe('of:0000000000000205');
+ expect(String(LinkType[link3_205.type])).toBe('2');
+ expect(link3_205.portA).toBe(undefined);
+ expect(link3_205.portB).toBe('6');
+
+ expect(link3_205.rollup).toBeTruthy();
+ expect(link3_205.rollup.length).toBe(1);
+ expect(link3_205.rollup[0].id).toBe('00:AA:00:00:00:03/None~of:0000000000000205/6');
+ expect(link3_205.rollup[0].epA).toBe('00:AA:00:00:00:03/None');
+ expect(link3_205.rollup[0].epB).toBe('of:0000000000000205');
+ expect(String(LinkType[link3_205.rollup[0].type])).toBe('2');
+ expect(link3_205.rollup[0].portA).toBe(undefined);
+ expect(link3_205.rollup[0].portB).toBe('6');
+
+ });
+
+ it('should handle regionData change - empty Region', () => {
+ component.ngOnChanges(
+ {'regionData' : new SimpleChange(<Region>{}, emptyRegion, true)});
+
+ expect(component.graph.nodes.length).toBe(0);
+ });
+
+ it('should know hwo to format names', () => {
+ expect(ForceSvgComponent.extractNodeName('00:AA:00:00:00:03/None'))
+ .toEqual('00:AA:00:00:00:03/None');
+
+ expect(ForceSvgComponent.extractNodeName('00:AA:00:00:00:03/161'))
+ .toEqual('00:AA:00:00:00:03/161');
+
+ expect(ForceSvgComponent.extractNodeName('of:0000000000000206/6'))
+ .toEqual('of:0000000000000206');
+ });
+
+ it('should handle regionData change - sample Region', () => {
+ component.regionData = regionData;
+ component.ngOnChanges(
+ {'regionData' : new SimpleChange(<Region>{}, regionData, true)});
+
+ expect(component.graph.nodes.length).toBe(30);
+
+ expect(component.graph.links.length).toBe(44);
+
+ });
});