commit 6b23b3845502c7c54b719125e5f9a9f23e740fe1
author Boyuan Yan <boyuan@opennetworking.org> Tue Jun 04 11:59:35 2019 -0700
committer Boyuan Yan <boyuan@opennetworking.org> Wed Jun 12 12:29:05 2019 -0700
tree 5c529d996bf1eac917aa469c477a60399e8de500
parent d575a3cc598a3ec0690e210c44817d23ab8890ef

[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>

web/gui2/BUILD

diff --git a/web/gui2/BUILD b/web/gui2/BUILD
index a6b5b0d..ec71d3b 100644
--- a/web/gui2/BUILD
+++ b/web/gui2/BUILD
@@ -124,6 +124,7 @@
         "//apps/faultmanagement/fm-gui2-lib:fm-gui2-lib-build",
         ":_root_level_files",
         ":_web_app_all",
+        "//apps/roadm/web/roadm-gui:roadm-gui-lib-build",
     ],
     outs = [
         "onos-gui2-ng-build-prod.log",
@@ -147,6 +148,9 @@
           " FM_GUI2_LIB_FILES=($(locations //apps/faultmanagement/fm-gui2-lib:fm-gui2-lib-build)) &&" +  # An array of filenames - sorted by time created
           " tar xf $$ROOT/$${FM_GUI2_LIB_FILES[0]} &&" +
           " mv package/ node_modules/fm-gui2-lib/ &&" +
+          " 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/ &&" +
           # End of add in modules from external packages
           " mkdir -p src/main/webapp/app/fw &&" +
           " (cd src/main/webapp/app/fw &&" +

web/gui2/src/main/webapp/app/onos-routing.module.ts

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 9cc5cc4..c461bf97 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 { RoadmGuiLibModule } from 'roadm-gui-lib';
 
 /**
  * The set of Routes in the application - can be chosen from nav menu or
@@ -89,6 +90,10 @@
         loadChildren: 'fm-gui2-lib#FmGui2LibModule'
     },
     {
+        path: 'roadm-gui',
+        loadChildren: 'roadm-gui-lib#RoadmGuiLibModule'
+    },
+    {
         path: '',
         redirectTo: 'topo2', // Default to Topology view
         pathMatch: 'full'