Merge "Issue#GSO-46 Add nesting service template parameters to config for GSO service"

diff --git a/openo-portal/portal-common/src/main/webapp/common/json/menu_list.json b/openo-portal/portal-common/src/main/webapp/common/json/menu_list.json
index 148b4ba..0f9cc3d 100644 (file)
--- a/openo-portal/portal-common/src/main/webapp/common/json/menu_list.json
+++ b/openo-portal/portal-common/src/main/webapp/common/json/menu_list.json
@@ -1,102 +1,96 @@
-{
-       "parentMenus":[
-               {
-                       "id":"openo_menu_service",
-                       "url":"",
-                       "iconClass":"fa fa-comments"
-               },
-               {
-                       "id":"openo_menu_resource_mgr",
-                       "url":"",
-                       "iconClass":"fa fa-folder-open-o"
-               },
-               {
-                       "id":"openo_menu_user",
-                       "url":"",
-                       "iconClass":"fa fa-puzzle-piece"
-               },
-               {
-                       "id":"openo_menu_orchestrator",
-                       "url":"",
-                       "iconClass":"fa fa-folder-open-o"
-               },
-               {
-                       "id":"openo_menu_manage_view",
-                       "url":"",
-                       "iconClass":"fa fa-coffee"
-               },
-               {
-                       "id":"openo_menu_performance",
-                       "url":"",
-                       "iconClass":"fa fa-bar-chart"
-               }
-       ],
-       "childMenus":[
-               {
-                       "parentId":"openo_menu_service",
-                       "id":"openo_menu_service_service_management",
-                       "url":"../lifecyclemgr/gsolcmmain.html",
-                       "iconClass":"fa fa-comments"
-               },
-               {
-                       "parentId":"openo_menu_resource_mgr",
-                       "id":"openo_menu_resource_mgr_sdno",
-                       "url":"../resmgr-sdn/resource.html",
-                       "iconClass":"fa fa-folder-open-o"
-               },
-               {
-                       "parentId":"openo_menu_resource_mgr",
-                       "id":"openo_menu_resource_mgr_nfvo",
-                       "url":"../resmgr-nfv/resource.html",
-                       "iconClass":"fa fa-folder-open-o"
-               },
-               {
-                       "parentId":"openo_menu_user",
-                       "id":"openo_menu_user_user_management",
-                       "url":"../user/user.html",
-                       "iconClass":"fa fa-puzzle-piece"
-               },
-               {
-                       "parentId":"openo_menu_orchestrator",
-                       "id":"openo_menu_orchestrator_model_design",
-                       "url":"/winery/servicetemplates.html",
-                       "iconClass":"fa fa-folder-open-o"
-               },
-               {
-                       "parentId":"openo_menu_orchestrator",
-                       "id":"openo_menu_orchestrator_package",
-                       "url":"../catalog/csarPackage.html",
-                       "iconClass":"fa fa-folder-open-o"
-               },
-               {
-                       "parentId":"openo_menu_orchestrator",
-                       "id":"openo_menu_orchestrator_service_template",
-                       "url":"../catalog/template.html",
-                       "iconClass":"fa fa-list-alt"
-               },
-               {
-                       "parentId":"openo_menu_manage_view",
-                       "id":"openo_menu_manage_view_vim_manage",
-                       "url":"../extsys/vim/vimView.html",
-                       "iconClass":"fa fa-coffee"
-               },
-               {
-                       "parentId":"openo_menu_manage_view",
-                       "id":"openo_menu_manage_view_vnfm",
-                       "url":"../extsys/vnfm/vnfmView.html",
-                       "iconClass":"fa fa-coffee"
-               },
-               {
-                       "parentId":"openo_menu_performance",
-                       "id":"openo_menu_performance_performance_query",
-                       "url":"../performance/performance_view.html",
-                       "iconClass":"fa fa-bar-chart"
-               },
-               {
-                       "parentId":"openo_menu_performance",
-                       "id":"openo_menu_alarm_alarm_query",
-                       "url":"../performance/alarm_view.html",
-                       "iconClass":"fa fa-bell"
-               }
-       ]
+{\r
+       "parentMenus":[\r
+               {\r
+                       "id":"openo_menu_service",\r
+                       "url":"",\r
+                       "iconClass":"fa fa-comments"\r
+               },\r
+               {\r
+                       "id":"openo_menu_resource_mgr",\r
+                       "url":"",\r
+                       "iconClass":"fa fa-folder-open-o"\r
+               },\r
+               {\r
+                       "id":"openo_menu_user",\r
+                       "url":"",\r
+                       "iconClass":"fa fa-puzzle-piece"\r
+               },\r
+               {\r
+                       "id":"openo_menu_orchestrator",\r
+                       "url":"",\r
+                       "iconClass":"fa fa-folder-open-o"\r
+               },\r
+               {\r
+                       "id":"openo_menu_manage_view",\r
+                       "url":"",\r
+                       "iconClass":"fa fa-coffee"\r
+               },\r
+               {\r
+                       "id":"openo_menu_performance",\r
+                       "url":"",\r
+                       "iconClass":"fa fa-bar-chart"\r
+               }\r
+       ],\r
+       "childMenus":[\r
+               {\r
+                       "parentId":"openo_menu_service",\r
+                       "id":"openo_menu_service_service_management",\r
+                       "url":"../lifecyclemgr/gsolcmmain.html",\r
+                       "iconClass":"fa fa-comments"\r
+               },\r
+               {\r
+                       "parentId":"openo_menu_resource_mgr",\r
+                       "id":"openo_menu_resource_mgr",\r
+                       "url":"../resmgr-sdn/resource.html",\r
+                       "iconClass":"fa fa-folder-open-o"\r
+               },\r
+               {\r
+                       "parentId":"openo_menu_user",\r
+                       "id":"openo_menu_user_user_management",\r
+                       "url":"../user/user.html",\r
+                       "iconClass":"fa fa-puzzle-piece"\r
+               },\r
+               {\r
+                       "parentId":"openo_menu_orchestrator",\r
+                       "id":"openo_menu_orchestrator_model_design",\r
+                       "url":"/winery/servicetemplates.html",\r
+                       "iconClass":"fa fa-folder-open-o"\r
+               },\r
+               {\r
+                       "parentId":"openo_menu_orchestrator",\r
+                       "id":"openo_menu_orchestrator_package",\r
+                       "url":"../catalog/csarPackage.html",\r
+                       "iconClass":"fa fa-folder-open-o"\r
+               },\r
+               {\r
+                       "parentId":"openo_menu_orchestrator",\r
+                       "id":"openo_menu_orchestrator_service_template",\r
+                       "url":"../catalog/template.html",\r
+                       "iconClass":"fa fa-list-alt"\r
+               },\r
+               {\r
+                       "parentId":"openo_menu_manage_view",\r
+                       "id":"openo_menu_manage_view_vim_manage",\r
+                       "url":"../extsys/vim/vimView.html",\r
+                       "iconClass":"fa fa-coffee"\r
+               },\r
+               {\r
+                       "parentId":"openo_menu_manage_view",\r
+                       "id":"openo_menu_manage_view_vnfm",\r
+                       "url":"../extsys/vnfm/vnfmView.html",\r
+                       "iconClass":"fa fa-coffee"\r
+               },\r
+               {\r
+                       "parentId":"openo_menu_performance",\r
+                       "id":"openo_menu_performance_performance_query",\r
+                       "url":"../performance/performance_view.html",\r
+                       "iconClass":"fa fa-bar-chart"\r
+               },\r
+               {\r
+                       "parentId":"openo_menu_performance",\r
+                       "id":"openo_menu_alarm_alarm_query",\r
+                       "url":"../performance/alarm_view.html",\r
+                       "iconClass":"fa fa-bell"\r
+               }\r
+       ]\r
 }
\ No newline at end of file