1 files changed, 29 insertions, 194 deletions
diff --git a/openo-portal/portal-common/src/main/webapp/common/main_Fsiderbar.html b/openo-portal/portal-common/src/main/webapp/common/main_Fsiderbar.html
index 0e17530c..b7dfcb98 100644
--- a/openo-portal/portal-common/src/main/webapp/common/main_Fsiderbar.html
+++ b/openo-portal/portal-common/src/main/webapp/common/main_Fsiderbar.html
@@ -14,10 +14,10 @@
     limitations under the License.
 -->
 <li>
-    <a href="javascript:;" id="col-openo-umc-monitor-service" hparentid="openo-nsoc">
-        <i class="fa fa-comments">
+    <a href="javascript:;" id="col-openo-service-design" hparentid="openo-service">
+        <i class="fa fa-folder-open-o">
         </i>
-        <span id="org_openo_orchestrator_umc_monitor_service" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu"
+        <span id="org_openo_menu_service_design" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu"
         class="title">
         </span>
         <span class="selected">
@@ -27,22 +27,22 @@
     </a>
     <ul class="sub-menu">
         <li>
-            <a class="iframe" id="openo-umc-monitor-service-overview" parentid="openo-nsoc" hparentid="col-openo-umc-monitor-service"
+            <a class="iframe" id="openo-service-model-design" hparentid="col-openo-service-design"
             order="10.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
-            href="/iui/umcdrill/monitorns.html">
-                <i class="fa fa-comments">
+            href="/winery/servicetemplates.html">
+                <i class="fa fa-folder-open-o">
                 </i>
-                <span id="org_openo_orchestrator_umc_monitor_service_overview" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
+                <span id="org_openo_menu_service_design_model_design" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
                 </span>
             </a>
         </li>
     </ul>
 </li>
 <li>
-    <a href="javascript:;" id="col-openo-nsoc-orchestrator" hparentid="openo-nsoc">
+    <a href="javascript:;" id="col-openo-service-catalog" hparentid="openo-service">
         <i class="fa fa-folder-open-o">
         </i>
-        <span id="org_openo_orchestrator_nsoc_orchestrator" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu"
+        <span id="org_openo_menu_service_catalog" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu"
         class="title">
         </span>
         <span class="selected">
@@ -52,72 +52,32 @@
     </a>
     <ul class="sub-menu">
         <li>
-            <a class="iframe" id="openo-nsoc-model-design" parentid="openo-nsoc" hparentid="col-openo-nsoc-orchestrator"
+            <a class="iframe" id="openo-nsoc-vnfd" hparentid="col-openo-service-catalog"
             order="10.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
-            href="/winery/servicetemplates">
-                <i class="fa fa-folder-open-o">
-                </i>
-                <span id="org_openo_orchestrator_nsoc_model_design" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
-                </span>
-            </a>
-        </li>
-		<li>
-            <a class="iframe" id="openo-nsoc-node-type" parentid="openo-nsoc" hparentid="col-openo-nsoc-orchestrator"
-            order="20.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
-            href="/winery/nodetypes">
-                <i class="fa fa-folder-open-o">
-                </i>
-                <span id="org_openo_orchestrator_nsoc_node_type" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
-                </span>
-            </a>
-        </li>
-        <li>
-            <a class="iframe" id="openo-nsoc-vnfd" parentid="openo-nsoc" hparentid="col-openo-nsoc-orchestrator"
-            order="30.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
-            href="/iui/nsoc/csarPackage.html">
+            href="/openoui/catalog/csarPackage.html">
                 <i class="fa fa-folder-open-o">
                 </i>
-                <span id="org_openo_orchestrator_nsoc_pkg" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
+                <span id="org_openo_menu_service_catalog_package" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
                 </span>
             </a>
         </li>
         <li>
-            <a class="iframe" id="openo-nsoc-template" parentid="openo-nsoc" hparentid="col-openo-nsoc-orchestrator"
-            order="40.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
-            href="/iui/nsoc/template.html">
-                <i class="fa fa-list-alt">
-                </i>
-                <span id="org_openo_orchestrator_nsoc_template" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
-                </span>
-            </a>
-        </li>
-		<li>
-            <a class="iframe" id="openo-nsoc-hostimage" parentid="openo-nsoc" hparentid="col-openo-nsoc-orchestrator"
-            order="50.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
-            href="/iui/nsoc/hostMirror.html">
+            <a class="iframe" id="openo-nsoc-template" hparentid="col-openo-service-catalog"
+            order="20.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
+            href="/openoui/catalog/template.html">
                 <i class="fa fa-list-alt">
                 </i>
-                <span id="org_openo_orchestrator_nsoc_hostimage" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
-                </span>
-            </a>
-        </li>
-        <li>
-            <a class="iframe" id="openo-nsoc-vApp" parentid="openo-nsoc" hparentid="col-openo-nsoc-orchestrator"
-            order="60.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
-            href="/iui/nsoc/virtualApplication.html">
-                <i class="ict-VNF">
-                </i>
-                <span id="org_openo_orchestrator_nsoc_lifecycle" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
+                <span id="org_openo_menu_service_catalog_service_template" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
                 </span>
             </a>
         </li>
     </ul>
 </li>
 <li>
-    <a href="javascript:;" id="col-openo-roc-manageview" hparentid="openo-roc">
+    <a href="javascript:;" id="col-openo-external-system-register" hparentid="openo-resource">
         <i class="fa fa-cube">
         </i>
-        <span id="org_openo_orchestrator_roc_managementview" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu"
+        <span id="org_openo_menu_external_system_register" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu"
         class="title">
         </span>
         <span class="selected">
@@ -127,157 +87,32 @@
     </a>
     <ul class="sub-menu">
         <li>
-            <a class="iframe" id="openo-roc-vim" parentid="openo-roc" hparentid="col-openo-roc-manageview"
+            <a class="iframe" id="openo-esr-vim" hparentid="col-openo-resource-manageview"
             order="10.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
-            href="/iui/rocvim/vimView.html">
+            href="/openoui/extsys/vim/vimView.html">
                 <i class="fa fa-cube">
                 </i>
-                <span id="org_openo_orchestrator_roc_vim" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
+                <span id="org_openo_menu_vim_register" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
                 </span>
             </a>
         </li>
         <li>
-            <a class="iframe" id="openo-roc-vnfm" parentid="openo-roc" hparentid="col-openo-roc-manageview"
+            <a class="iframe" id="openo-esr-vnfm" hparentid="col-openo-resource-manageview"
             order="20.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
-            href="/iui/nsoc/vnfmView.html">
+            href="/openoui/extsys/vnfm/vnfmView.html">
                 <i class="ict-VNFM">
                 </i>
-                <span id="org_openo_orchestrator_roc_vnfm" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
-                </span>
-            </a>
-        </li>
-    </ul>
-</li>
-<li>
-    <a href="javascript:;" id="col-openo-roc-resourceview" hparentid="openo-roc">
-        <i class="fa fa-cubes">
-        </i>
-        <span id="org_openo_orchestrator_roc_resourceview" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu"
-        class="title">
-        </span>
-        <span class="selected">
-        </span>
-        <span class="arrow">
-        </span>
-    </a>
-    <ul class="sub-menu">
-        <li>
-            <a class="iframe" id="openo-roc-rs-view-overview" parentid="openo-roc" hparentid="col-openo-roc-resourceview"
-            order="8.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
-            href="/iui/rocrsview/resView.html">
-                <i class="fa fa-cubes">
-                </i>
-                <span id="org_openo_orchestrator_roc_overview" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
-                </span>
-            </a>
-        </li>
-    </ul>
-</li>
-<li>
-    <a href="javascript:;" id="col-openo-umc-setting" hparentid="openo-umc">
-        <i class="fa fa-puzzle-piece">
-        </i>
-        <span id="org_openo_orchestrator_umc_monitor_setting" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu"
-        class="title">
-        </span>
-        <span class="selected">
-        </span>
-        <span class="arrow">
-        </span>
-    </a>
-    <ul class="sub-menu">
-        <li>
-            <a class="iframe" id="openo-umc-monitor-setting" parentid="openo-umc" hparentid="col-openo-umc-setting" 
-            order="10.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
-            href="/iui/umcmonitor/monitorSettingList.html">
-                <i class="fa fa-puzzle-piece">
-                </i>
-                <span id="org_openo_orchestrator_umc_monitor_para_setting" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
-                </span>
-            </a>
-        </li>
-    </ul>
-</li>
-<li>
-    <a href="javascript:;" id="col-openo-umc-topo" hparentid="openo-umc">
-        <i class="fa fa-puzzle-piece">
-        </i>
-        <span id="org_openo_orchestrator_umc_topo" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu"
-        class="title">
-        </span>
-        <span class="selected">
-        </span>
-        <span class="arrow">
-        </span>
-    </a>
-    <ul class="sub-menu">
-        <li>
-            <a class="iframe" id="openo-umc-physical-topo" parentid="openo-umc" hparentid="col-openo-umc-topo" 
-            order="10.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
-            href="/iui/umctopo/physicalTopology.html">
-                <i class="fa fa-puzzle-piece">
-                </i>
-                <span id="org_openo_orchestrator_umc_physical_topo" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
+                <span id="org_openo_menu_vnfm_register" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
                 </span>
             </a>
         </li>
         <li>
-            <a class="iframe" id="openo-umc-service-topo" parentid="openo-umc" hparentid="col-openo-umc-topo" 
-            order="10.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
-            href="/iui/umctopo/serviceTopology.html">
-                <i class="fa fa-puzzle-piece">
-                </i>
-                <span id="org_openo_orchestrator_umc_service_topo" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
-                </span>
-            </a>
-        </li>
-    </ul>
-</li>
-<li>
-    <a href="javascript:;" id="col-openo-umc-fm" hparentid="openo-umc">
-        <i class="fa fa-comments">
-        </i>
-        <span id="org_openo_orchestrator_umc_fm" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu"
-        class="title">
-        </span>
-        <span class="selected">
-        </span>
-        <span class="arrow">
-        </span>
-    </a>
-    <ul class="sub-menu">
-        <li>
-            <a class="iframe" id="openo-umc-monitor-alarm-currentAlarm" parentid="openo-umc" hparentid="col-openo-umc-fm"
-            order="10.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
-            href="/iui/umcfm/html/fm_currentAlarm_view.html">
-                <i class="fa fa-comments">
-                </i>
-                <span id="org_openo_orchestrator_umc_fm_currentAlarm" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
-                </span>
-            </a>
-        </li>
-    </ul>
-</li>
-<li>
-    <a href="javascript:;" id="col-openo-umc-pm" hparentid="openo-umc">
-        <i class="fa fa-coffee">
-        </i>
-        <span id="org_openo_orchestrator_umc_pm" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu"
-        class="title">
-        </span>
-        <span class="selected">
-        </span>
-        <span class="arrow">
-        </span>
-    </a>
-    <ul class="sub-menu">
-        <li>
-            <a class="iframe" id="openo-umc-monitor-pm-historyQuery" parentid="openo-umc" hparentid="col-openo-umc-pm"
-            order="10.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
-            href="/iui/umcpm/html/meatask/meataskQueryView.html">
-                <i class="fa fa-coffee">
+            <a class="iframe" id="openo-esr-sdnc" hparentid="col-openo-resource-manageview"
+            order="30.0" horgroup="10.0" cachenum="" shiftjs="" iframeautoscroll="auto"
+            href="/openoui/extsys/sdncontroller/controller.html">
+                <i class="ict-VNFM">
                 </i>
-                <span id="org_openo_orchestrator_umc_pm_performance_query" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
+                <span id="org_openo_menu_sdn_controller_register" name_i18n="com_zte_ums_ict_framework_ui_i18n_sideMenu">
                 </span>
             </a>
         </li>