fix all bug in sdno resource page and controller page.

delete all the idea configuration files in source code.
rewrite the storage and query function in controller page.
fix wrong logic in ne, link, port, site page and brs.js.

SDNO-805

Change-Id: I2fdecc186a5790a9b27c4cade8aa78c3d1575f6e
Signed-off-by: yuhao10 <yuhao10@huawei.com>
(cherry picked from commit 2b340a445aa07d38fcbd2eff8d7cdb6c3d7cf518)

diff --git a/.idea/gso-gui.iml b/.idea/gso-gui.iml
deleted file mode 100644 (file)
index 24643cc..0000000
--- a/.idea/gso-gui.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file

diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644 (file)
index f93a756..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/gso-gui.iml" filepath="$PROJECT_DIR$/.idea/gso-gui.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644 (file)
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644 (file)
index 7893732..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="ce433220-3aab-4255-b54d-449a6f98dbe2" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/css/RMain.css" afterPath="$PROJECT_DIR$/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/css/RMain.css" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/css/VMMain.css" afterPath="$PROJECT_DIR$/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/css/VMMain.css" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/gsolcmmain.html" afterPath="$PROJECT_DIR$/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/gsolcmmain.html" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/rest.js" afterPath="$PROJECT_DIR$/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/rest.js" />
-    </list>
-    <ignored path="gso-gui.iws" />
-    <ignored path=".idea/workspace.xml" />
-    <ignored path="$PROJECT_DIR$/.tmp/" />
-    <ignored path="$PROJECT_DIR$/temp/" />
-    <ignored path="$PROJECT_DIR$/tmp/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="TRACKING_ENABLED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="CreatePatchCommitExecutor">
-    <option name="PATCH_PATH" value="" />
-  </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
-  <component name="FavoritesManager">
-    <favorites_list name="gso-gui" />
-  </component>
-  <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="gsolcmmain.html" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/../portal-lifecyclemgr/portal-lifecyclemgr/gsolcmmain.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="228">
-              <caret line="29" column="74" selection-start-line="29" selection-start-column="74" selection-end-line="29" selection-end-column="74" />
-              <folding>
-                <marker date="1475055500946" expanded="true" signature="3717:3732" ph="..." />
-                <marker date="1475055500946" expanded="true" signature="4017:4042" ph="..." />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/../portal-lifecyclemgr/portal-lifecyclemgr/gsolcmmain.html" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="1" />
-    <option name="width" value="1262" />
-    <option name="height" value="628" />
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
-      <flattenPackages />
-      <showMembers />
-      <showModules />
-      <showLibraryContents />
-      <hideEmptyPackages />
-      <abbreviatePackageNames />
-      <autoscrollToSource />
-      <autoscrollFromSource />
-      <sortByType />
-      <manualOrder />
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="gso-gui" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
-      <pane id="Scratches" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="HbShouldOpenHtmlAsHb" value="" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../portal-lifecyclemgr" />
-  </component>
-  <component name="RunManager">
-    <configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application">
-      <method />
-    </configuration>
-    <configuration default="true" type="DartTestRunConfigurationType" factoryName="Dart Test">
-      <method />
-    </configuration>
-    <configuration default="true" type="JavaScriptTestRunnerKarma" factoryName="Karma">
-      <config-file value="" />
-      <node-interpreter value="project" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
-      <method />
-    </configuration>
-    <configuration default="true" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="project" working-dir="">
-      <method />
-    </configuration>
-    <configuration default="true" type="cucumber.js" factoryName="Cucumber.js">
-      <option name="cucumberJsArguments" value="" />
-      <option name="executablePath" />
-      <option name="filePath" />
-      <method />
-    </configuration>
-    <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
-      <method />
-    </configuration>
-    <configuration default="true" type="js.build_tools.npm" factoryName="npm">
-      <command value="run-script" />
-      <scripts />
-      <node-interpreter value="project" />
-      <envs />
-      <method />
-    </configuration>
-    <configuration default="true" type="mocha-javascript-test-runner" factoryName="Mocha">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <working-directory />
-      <pass-parent-env>true</pass-parent-env>
-      <envs />
-      <ui />
-      <extra-mocha-options />
-      <test-kind>DIRECTORY</test-kind>
-      <test-directory />
-      <recursive>false</recursive>
-      <method />
-    </configuration>
-  </component>
-  <component name="ShelveChangesManager" show_recycled="false">
-    <option name="remove_strategy" value="false" />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="ce433220-3aab-4255-b54d-449a6f98dbe2" name="Default" comment="" />
-      <created>1475055308362</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1475055308362</updated>
-      <workItem from="1475055311719" duration="189000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="189000" />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="1" y="0" width="1262" height="628" extended-state="0" />
-    <editor active="false" />
-    <layout>
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24959871" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24959871" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-    </layout>
-  </component>
-  <component name="Vcs.Log.UiProperties">
-    <option name="RECENTLY_FILTERED_USER_GROUPS">
-      <collection />
-    </option>
-    <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-      <collection />
-    </option>
-  </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager />
-    <watches-manager />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/../portal-lifecyclemgr/portal-lifecyclemgr/gsolcmmain.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="228">
-          <caret line="29" column="74" selection-start-line="29" selection-start-column="74" selection-end-line="29" selection-end-column="74" />
-          <folding>
-            <marker date="1475055500946" expanded="true" signature="3717:3732" ph="..." />
-            <marker date="1475055500946" expanded="true" signature="4017:4042" ph="..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-  </component>
-</project>
\ No newline at end of file

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/sdncontroller/controller.html b/openo-portal/portal-extsys/src/main/webapp/extsys/sdncontroller/controller.html
index e933c78..635cfb2 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/sdncontroller/controller.html
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/sdncontroller/controller.html
@@ -32,13 +32,7 @@
         <script type="text/javascript" src="js/bootstrap-table-filter-control.min.js"></script>\r
         <script type="text/javascript">\r
             $(document).ready(function () {\r
-\r
-                var jsondata = loadControllerData();\r
-\r
-                $('#controller').bootstrapTable({\r
-                    //Assigning data to table\r
-                    data: jsondata\r
-                });\r
+                loadControllerData();\r
             });\r
             function operateFormatter(value, row, index) {\r
                 return ['<img class="siteDeleteImg" src="images/delete.png" href="javascript:void(0)" style="cursor: pointer" name="title" title="Delete" />']\r
@@ -48,8 +42,7 @@
             window.operateEvents = {\r
                 'click .siteDeleteImg': function (e, value, row, index) {\r
                     // TO DO ajex call for delete\r
-                    deleteLink(row.id);\r
-                    console.log(value, row, index);\r
+                    deleteController(row.id, row);\r
                 }\r
             };\r
         </script>\r
@@ -177,6 +170,15 @@
                                             </span>\r
                                 </div>\r
                             </th>\r
+                            <th class="openo-table-state-default openo-table-th openo-table-disable-element  leftHeaderAlign"\r
+                                align="center" data-formatter="operateFormatter" data-events="operateEvents">\r
+                                <div class="openo-table-th-border"></div>\r
+                                <div class="DataTables_sort_wrapper openo-ellipsis ">\r
+                                                                       <span id="ctrler_nativeID_sorticon"\r
+                                                  class="openo-table-th-sorticon overflow_elip  leftHeaderAlign  openo-table-disable-element ">Actions\r
+                                            </span>\r
+                                </div>\r
+                            </th>\r
                         </tr>\r
                         </thead>\r
                         <tbody>\r
@@ -299,7 +301,7 @@
                             </div>\r
                             <div class="modal-footer">\r
                                 <button type="button" class="btn SDBtn" data-dismiss="modal" aria-hidden="true"\r
-                                        id="createLink">\r
+                                        id="createController">\r
                                     <span id="nfv-virtualApplication-iui-text-cancelBtn">OK</span>\r
                                 </button>\r
                                 <button type="button" class="btn button-previous SDBtn">\r

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/sdncontroller/js/controller.js b/openo-portal/portal-extsys/src/main/webapp/extsys/sdncontroller/js/controller.js
index 04437df..df0fef5 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/sdncontroller/js/controller.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/sdncontroller/js/controller.js
@@ -13,11 +13,6 @@
  * limitations under the License.\r
  */\r
 \r
-var url = "";\r
-$.getJSON("./conf/dataconfig.json", function (jsonData){\r
-    url = jsonData.url +":"+ jsonData.port;\r
-    console.log("URL = " + url);\r
-});\r
 \r
 $('.siteDeleteImg').click(\r
     function () {\r
@@ -35,7 +30,7 @@ $('.siteDeleteImg').click(
     });\r
 \r
 function deleteController(objectId) {\r
-    var requestUrl = url + "/openoapi/extsys/v1/sdncontrollers/" + objectId;\r
+    var requestUrl = "/openoapi/extsys/v1/sdncontrollers/" + objectId;\r
     $.ajax({\r
         type: "DELETE",\r
         url: requestUrl,\r
@@ -54,14 +49,14 @@ function deleteController(objectId) {
 }\r
 \r
 function loadControllerData() {\r
-    var requestUrl = url + "/openoapi/extsys/v1/sdncontrollers";\r
+    var requestUrl = "/openoapi/extsys/v1/sdncontrollers";\r
     $.ajax({\r
         type: "GET",\r
         url: requestUrl,\r
         contentType: "application/json",\r
         success: function (jsonobj) {\r
             $('#controller').bootstrapTable({\r
-                data: jsonobj.topologicalControllers\r
+                data: jsonobj\r
             });\r
         },\r
         error: function (xhr, ajaxOptions, thrownError) {\r
@@ -150,11 +145,7 @@ $(function () {
     $('#createController').click(function () {\r
         var formData = JSON.stringify($("#controllerForm").serializeObject());\r
         var jsonobj = JSON.parse(formData);\r
-        var newJson = {\r
-            "topologicalController": jsonobj\r
-        };\r
-        formData = JSON.stringify(newJson);\r
-        var requestUrl = url + "/openoapi/extsys/v1/sdncontrollers";\r
+        var requestUrl = "/openoapi/extsys/v1/sdncontrollers";\r
         $.ajax({\r
             type: "POST",\r
             url: requestUrl,\r
@@ -163,7 +154,7 @@ $(function () {
             data: formData,\r
             success: function (jsonResp) {\r
                 alert("Controller saved successfully!!!");\r
-                jsonobj["id"] = jsonResp.topologicalController.id;\r
+                jsonobj["id"] = jsonResp.sdnControllerId;\r
                 $('#controller').bootstrapTable("append", jsonobj);\r
                 $('#vmAppDialog').removeClass('in').css('display', 'none');\r
 \r

diff --git a/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/conf/dataconfig.json b/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/conf/dataconfig.json
index 87e36cf..f7ee617 100644 (file)
--- a/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/conf/dataconfig.json
+++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/conf/dataconfig.json
@@ -1,4 +1,5 @@
 {\r
-  "url": "http://localhost",\r
-  "port": "8080"\r
+  "url": "http://127.0.0.1",\r
+  "port": "8080",\r
+  "context_name":"resmgr"\r
 }
\ No newline at end of file

diff --git a/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/js/brs.js b/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/js/brs.js
index b9cace8..91fd0c5 100644 (file)
--- a/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/js/brs.js
+++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/js/brs.js
@@ -12,12 +12,6 @@
  * See the License for the specific language governing permissions and\r
  * limitations under the License.\r
  */\r
-var url = "";\r
-$.getJSON("./conf/dataconfig.json", function (jsonData){\r
-    url = jsonData.url +":"+ jsonData.port;\r
-    console.log("URL = " + url);\r
-});\r
-\r
 $('.siteDeleteImg').click(function () {\r
     var data = $(this).parent().parent().parent().find('td:last').find('div:last').html();\r
     alert(data);\r
@@ -31,8 +25,12 @@ $('.siteDeleteImg').click(function () {
 });\r
 \r
 \r
+function hideFirstCol() {\r
+    //$('table tr').find('th:eq(0)').hide();\r
+    //$('table tr').find('td:eq(0)').hide();\r
+}\r
 function deleteSite(objectId) {\r
-    var requestUrl = url+"/openoapi/sdnobrs/v1/sites/" + objectId;\r
+    var requestUrl = "/openoapi/sdnobrs/v1/sites/" + objectId;\r
     $\r
         .ajax({\r
             type: "DELETE",\r
@@ -51,7 +49,7 @@ function deleteSite(objectId) {
         });\r
 }\r
 function deleteLink(objectId) {\r
-    var requestUrl = url+"/openoapi/sdnobrs/v1/topological-links/" + objectId;\r
+    var requestUrl = "/openoapi/sdnobrs/v1/topological-links/" + objectId;\r
     $\r
         .ajax({\r
             type: "DELETE",\r
@@ -71,7 +69,7 @@ function deleteLink(objectId) {
 }\r
 \r
 function deleteNe(objectId) {\r
-    var requestUrl = url+"/openoapi/sdnobrs/v1/managed-elements/" + objectId;\r
+    var requestUrl = "/openoapi/sdnobrs/v1/managed-elements/" + objectId;\r
     $\r
         .ajax({\r
             type: "DELETE",\r
@@ -91,7 +89,7 @@ function deleteNe(objectId) {
 }\r
 \r
 function deletePort(objectId) {\r
-    var requestUrl = url+"/openoapi/sdnobrs/v1/logical-termination-points/" + objectId;\r
+    var requestUrl = "/openoapi/sdnobrs/v1/logical-termination-points/" + objectId;\r
     $\r
         .ajax({\r
             type: "DELETE",\r
@@ -110,7 +108,7 @@ function deletePort(objectId) {
         });\r
 }\r
 function loadSiteData() {\r
-    var requestUrl = url+"/openoapi/sdnobrs/v1/sites";\r
+    var requestUrl = "/openoapi/sdnobrs/v1/sites";\r
     $\r
         .ajax({\r
             type: "GET",\r
@@ -127,7 +125,7 @@ function loadSiteData() {
         });\r
 }\r
 function loadLinkData() {\r
-    var requestUrl = url+"/openoapi/sdnobrs/v1/topological-links";\r
+    var requestUrl = "/openoapi/sdnobrs/v1/topological-links";\r
     $\r
         .ajax({\r
             type: "GET",\r
@@ -144,16 +142,21 @@ function loadLinkData() {
         });\r
 }\r
 function loadNeData() {\r
-    var requestUrl = url+"/openoapi/sdnobrs/v1/managed-elements";\r
+\r
+    var requestUrl = "/openoapi/sdnobrs/v1/managed-elements";\r
     $\r
         .ajax({\r
             type: "GET",\r
             url: requestUrl,\r
             contentType: "application/json",\r
             success: function (jsonobj) {\r
+                var nedata = jsonobj.managedElements;\r
                 $('#ne').bootstrapTable({\r
-                    data: jsonobj.managedElements\r
+                    data: nedata\r
                 });\r
+                $('#ne').bootstrapTable('refresh');\r
+                hideFirstCol();\r
+\r
             },\r
             error: function (xhr, ajaxOptions, thrownError) {\r
                 alert("Error on getting ne data : " + xhr.responseText);\r
@@ -161,7 +164,7 @@ function loadNeData() {
         });\r
 }\r
 function loadPortData() {\r
-    var requestUrl = url+"/openoapi/sdnobrs/v1/logical-termination-points";\r
+    var requestUrl = "/openoapi/sdnobrs/v1/logical-termination-points";\r
     $\r
         .ajax({\r
             type: "GET",\r
@@ -177,6 +180,34 @@ function loadPortData() {
             }\r
         });\r
 }\r
+function loadControllerData() {\r
+    var requestUrl = "/openoapi/extsys/v1/sdncontrollers";\r
+    $.ajax({\r
+        type: "GET",\r
+        url: requestUrl,\r
+        contentType: "application/json",\r
+        success: function (jsonobj) {\r
+            fillSelect(jsonobj);\r
+        },\r
+        error: function (xhr, ajaxOptions, thrownError) {\r
+            alert("Error on getting controller data : " + xhr.responseText);\r
+        }\r
+    });\r
+}\r
+function fillSelect(str){\r
+    var json;\r
+    if(typeof str === 'object'){\r
+        json = str;\r
+    }\r
+    else{\r
+        json = eval('(' + str + ')');\r
+    }\r
+    var seleObj = $('#controller')\r
+    seleObj.find("option").remove();\r
+    for(var i=0;i < json.length;i++){\r
+        seleObj.append('<option value="'+json[i].name+'">'+json[i].name+'</option>');\r
+    }\r
+}\r
 $(function () {\r
     $('.creat-btn').click(function () {\r
         $('#vmAppDialog').addClass('in').css({'display': 'block'});\r
@@ -206,6 +237,7 @@ $(function () {
     });\r
     $('.table tr:odd').addClass('active');\r
     $('#false').click(function () {\r
+        loadControllerData();\r
         $('#vmAppDialog').addClass('in').css({'display': 'block'});\r
     });\r
     $('.close,.button-previous').click(function () {\r
@@ -245,7 +277,7 @@ $(function () {
         var jsonobj = JSON.parse(formData);\r
         var newJson = {"site": jsonobj};\r
         formData = JSON.stringify(newJson);\r
-        var requestUrl = url+"/openoapi/sdnobrs/v1/sites";\r
+        var requestUrl = "/openoapi/sdnobrs/v1/sites";\r
         $\r
             .ajax({\r
                 type: "POST",\r
@@ -270,7 +302,7 @@ $(function () {
         var jsonobj = JSON.parse(formData);\r
         var newJson = {"managedElement": jsonobj};\r
         formData = JSON.stringify(newJson);\r
-        var requestUrl = url+"/openoapi/sdnobrs/v1/managed-elements";\r
+        var requestUrl = "/openoapi/sdnobrs/v1/managed-elements";\r
         $\r
             .ajax({\r
                 type: "POST",\r
@@ -296,7 +328,7 @@ $(function () {
         var jsonobj = JSON.parse(formData);\r
         var newJson = {"logicalTerminationPoint": jsonobj};\r
         formData = JSON.stringify(newJson);\r
-        var requestUrl = url+"/openoapi/sdnobrs/v1/logical-termination-points";\r
+        var requestUrl = "/openoapi/sdnobrs/v1/logical-termination-points";\r
         $\r
             .ajax({\r
                 type: "POST",\r
@@ -323,7 +355,7 @@ $(function () {
         var jsonobj = JSON.parse(formData);\r
         var newJson = {"topologicalLink": jsonobj};\r
         formData = JSON.stringify(newJson);\r
-        var requestUrl = url+"/openoapi/sdnobrs/v1/topological-links";\r
+        var requestUrl = "/openoapi/sdnobrs/v1/topological-links";\r
         $\r
             .ajax({\r
                 type: "POST",\r

diff --git a/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/link.html b/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/link.html
index 19dfa6d..5110344 100644 (file)
--- a/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/link.html
+++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/link.html
@@ -32,14 +32,7 @@
         <script type="text/javascript" src="js/bootstrap-table-filter-control.min.js"></script>\r
         <script type="text/javascript">\r
             $(document).ready(function () {\r
-\r
-\r
-                var jsondata = loadLinkData();\r
-\r
-                $('#link').bootstrapTable({\r
-                    //Assigning data to table\r
-                    data: jsondata\r
-                });\r
+                loadLinkData();\r
             });\r
             function operateFormatter(value, row, index) {\r
                 return [\r

diff --git a/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/ne.html b/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/ne.html
index 4a1f9fd..518da3e 100644 (file)
--- a/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/ne.html
+++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/ne.html
@@ -31,14 +31,10 @@
         <script type="text/javascript" src="js/bootstrap-table.min.js"></script>\r
         <script type="text/javascript" src="js/bootstrap-table-filter-control.min.js"></script>\r
         <script type="text/javascript">\r
+\r
             $(document).ready(function () {\r
-                var jsondata = [];\r
-                jsondata = loadNeData();\r
-                $('#ne').bootstrapTable({\r
-                    //Assigning data to table\r
-                    data: jsondata\r
-                });\r
 \r
+                loadNeData();\r
             });\r
             function operateFormatter(value, row, index) {\r
                 return [\r
@@ -145,6 +141,15 @@
                                             </span>\r
                                 </div>\r
                             </th>\r
+                            <th class="openo-table-state-default openo-table-th openo-table-disable-element  leftHeaderAlign"\r
+                                data-field="nativeID" data-sortable="true" data-filter-control="input">\r
+                                <div class="openo-table-th-border"></div>\r
+                                <div class="DataTables_sort_wrapper openo-ellipsis ">\r
+                                            <span id="native_Id"\r
+                                                  class="openo-table-th-sorticon overflow_elip  leftHeaderAlign  openo-table-disable-element ">Native Id\r
+                                            </span>\r
+                                </div>\r
+                            </th>\r
                             <th class="openo-table-state-default openo-table-th openo-table-disable-element  leftHeaderAlign"\r
                                 data-field="ipAddress" data-sortable="true" data-filter-control="input">\r
                                 <div class="openo-table-th-border"></div>\r
@@ -321,11 +326,20 @@
                                                 <span>Controller</span>&nbsp;&nbsp;&nbsp;\r
                                             </label>\r
                                             <div class="col-sm-7">\r
-                                            <select class="form-control" style="padding-top: 0px;padding-bottom: 0px;"\r
-                                                    id="controller"\r
-                                                    name="controller">\r
-                                                <option value="Type1">Type1</option>\r
-                                            </select>\r
+                                                <select class="form-control" style="padding-top: 0px;padding-bottom: 0px;"\r
+                                                        id="controller"\r
+                                                        name="controller">\r
+                                                    <option value="Type1">No controller</option>\r
+                                                </select>\r
+                                            </div>\r
+                                        </div>\r
+                                        <div class="form-group">\r
+                                            <label class="col-sm-3 control-label">\r
+                                                <span>Native ID</span>&nbsp;&nbsp;&nbsp;\r
+                                            </label>\r
+                                            <div class="col-sm-7">\r
+                                                <input type="text" id="nativeID" name="nativeID" class="form-control"\r
+                                                       placeholder="Native ID"/>\r
                                             </div>\r
                                         </div>\r
                                         <div class="form-group">\r

diff --git a/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/port.html b/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/port.html
index 70c2565..ba0d5ec 100644 (file)
--- a/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/port.html
+++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/port.html
@@ -32,14 +32,7 @@
         <script type="text/javascript" src="js/bootstrap-table-filter-control.min.js"></script>\r
         <script type="text/javascript">\r
             $(document).ready(function () {\r
-\r
-                var jsondata = [];\r
-                jsondata = loadPortData();\r
-\r
-                $('#port').bootstrapTable({\r
-                    //Assigning data to table\r
-                    data: jsondata\r
-                });\r
+                loadPortData();\r
             });\r
             function operateFormatter(value, row, index) {\r
                 return [\r

diff --git a/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/resource.html b/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/resource.html
index 0e0f1ec..0625f70 100644 (file)
--- a/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/resource.html
+++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/resource.html
@@ -69,16 +69,6 @@
         $('#accordionmenuid_ul_0_0_brAppTopMenuID_UL_1_3_brAppTlMenuID').click(function () {\r
             $('#accordionContent').attr('src', 'link.html');\r
         });\r
-        \r
-        $('#accordionmenuid_ul_0_0_brAppTopMenuID_UL_1_4_locationID').click(function () {\r
-            $('#accordionContent').attr('src', '../resmgr-nfv/location.html');\r
-        });\r
-        $('#accordionmenuid_ul_0_0_brAppTopMenuID_UL_1_5_vimID').click(function () {\r
-            $('#accordionContent').attr('src', '../resmgr-nfv/vim.html');\r
-        });\r
-        $('#accordionmenuid_ul_0_0_brAppTopMenuID_UL_1_6_datacenterID').click(function () {\r
-            $('#accordionContent').attr('src', '../resmgr-nfv/datacenter.html');\r
-        });\r
 \r
     })\r
 </script>\r
@@ -127,19 +117,6 @@
                                                 nodeid="brAppTlMenuID" style="display: list-item;">\r
                                                 <a title="Link" style="padding-left: 62px;">Link</a>\r
                                             </li>\r
-                                            \r
-                                            <li id="accordionmenuid_ul_0_0_brAppTopMenuID_UL_1_4_locationID"\r
-                                                nodeid="brAppSiteMenuID" class="" style="display: list-item;">\r
-                                                <a title="Click to visit location" class="" style="padding-left: 62px;">Location</a>\r
-                                            </li>\r
-                                            <li id="accordionmenuid_ul_0_0_brAppTopMenuID_UL_1_5_vimID"\r
-                                                nodeid="brAppMeMenuID" style="display: list-item;">\r
-                                                <a title="Click to visit vim" style="padding-left: 62px;">Vim</a>\r
-                                            </li>\r
-                                            <li id="accordionmenuid_ul_0_0_brAppTopMenuID_UL_1_6_datacenterID"\r
-                                                nodeid="brAppTpMenuID" style="display: list-item;">\r
-                                                <a title="Click to visit datacenter" style="padding-left: 62px;">DataCenter</a>\r
-                                            </li>\r
                                         </ul>\r
                                     </li>\r
                                 </ul>\r

diff --git a/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/site.html b/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/site.html
index b0d6b54..03604ff 100644 (file)
--- a/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/site.html
+++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/site.html
@@ -35,15 +35,7 @@
         </style>\r
         <script type="text/javascript">\r
             $(document).ready(function () {\r
-\r
-                var jsondata = [];\r
-                jsondata = loadSiteData();\r
-                $('#site').bootstrapTable({\r
-                    //Assigning data to table\r
-                    data: jsondata\r
-                });\r
-\r
-\r
+                loadSiteData();\r
             });\r
 \r
             function operateFormatter(value, row, index) {\r