INT app gui2
This patch contains the files needed by the INT app to work with gui2.
More in detail I reuse/modifie the html and the css, already provided in
the inbandtelemetry folder. I add the file needed to utilize the gui2,
e.g,intapp-gui2-lib.module.ts.
Link to my dropbox for screenshots:
https://www.dropbox.com/sh/ie2l0flcm8igesk/AAAsP2RdMbNbnt6A88lmBczaa?dl=0
Change-Id: I710c09f3a04a139a4482bb7aae3b3b76b39e67e6
diff --git a/web/gui2/BUILD b/web/gui2/BUILD
index 6a61a92..6e7b380 100644
--- a/web/gui2/BUILD
+++ b/web/gui2/BUILD
@@ -124,6 +124,7 @@
"//web/gui2-fw-lib:gui2_fw_lib_ext_css",
"//web/gui2-topo-lib:gui2-topo-lib-build",
"//apps/faultmanagement/fm-gui2-lib:fm-gui2-lib-build",
+ "//apps/inbandtelemetry/int-gui2-lib:int-gui2-lib-build",
":_root_level_files",
":_web_app_all",
"//apps/roadm/web/roadm-gui:roadm-gui-lib-build",
@@ -153,6 +154,9 @@
" ROADM_GUI_LIB_FILES=($(locations //apps/roadm/web/roadm-gui:roadm-gui-lib-build)) &&" + # An array of filenames - sorted by time created
" tar xf $$ROOT/$${ROADM_GUI_LIB_FILES[0]} &&" +
" mv package/ node_modules/roadm-gui-lib/ &&" +
+ " INT_GUI2_LIB_FILES=($(locations //apps/inbandtelemetry/int-gui2-lib:int-gui2-lib-build)) &&" + # An array of filenames - sorted by time created
+ " tar xf $$ROOT/$${INT_GUI2_LIB_FILES[0]} &&" +
+ " mv package/ node_modules/int-gui2-lib/ &&" +
# End of add in modules from external packages
" mkdir -p src/main/webapp/app/fw &&" +
" (cd src/main/webapp/app/fw &&" +
diff --git a/web/gui2/package.json b/web/gui2/package.json
index d5f143d..5c47184 100644
--- a/web/gui2/package.json
+++ b/web/gui2/package.json
@@ -25,6 +25,7 @@
"core-js": "^2.5.4",
"d3": "^5.2.0",
"fm-gui2-lib": "file:../../apps/faultmanagement/fm-gui2-lib/fm-gui2-lib-2.1.0.tgz",
+ "int-gui2-lib": "file:../../apps/inbandtelemetry/int-gui2-lib/int-gui2-lib-2.2.3.tgz",
"gui2-fw-lib": "file:../gui2-fw-lib/gui2-fw-lib-2.1.1.tgz",
"gui2-topo-lib": "file:../gui2-topo-lib/gui2-topo-lib-2.1.1.tgz",
"rxjs": "^6.0.0",
diff --git a/web/gui2/src/main/webapp/app/onos-routing.module.ts b/web/gui2/src/main/webapp/app/onos-routing.module.ts
index fc8375d..69433fa 100644
--- a/web/gui2/src/main/webapp/app/onos-routing.module.ts
+++ b/web/gui2/src/main/webapp/app/onos-routing.module.ts
@@ -17,6 +17,7 @@
import {Routes, RouterModule} from '@angular/router';
import {Gui2TopoLibModule} from 'gui2-topo-lib';
import {FmGui2LibModule} from 'fm-gui2-lib';
+import {intAppGui2LibModule} from 'int-gui2-lib';
import {RoadmGuiLibModule} from 'roadm-gui-lib';
/**
@@ -98,10 +99,14 @@
loadChildren: 'roadm-gui-lib#RoadmGuiLibModule'
},
{
+ path: 'intApp',
+ loadChildren: 'int-gui2-lib#intAppGui2LibModule'
+ },
+ {
path: '',
redirectTo: 'topo2', // Default to Topology view
pathMatch: 'full'
- }
+ },
];
/**