diff options
13 files changed, 99 insertions, 357 deletions
diff --git a/.idea/gso-gui.iml b/.idea/gso-gui.iml deleted file mode 100644 index 24643cc3..00000000 --- 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 index f93a7561..00000000 --- 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 index 94a25f7f..00000000 --- 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 index 78937325..00000000 --- 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 e933c786..635cfb2d 100644 --- 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>
<script type="text/javascript">
$(document).ready(function () {
-
- var jsondata = loadControllerData();
-
- $('#controller').bootstrapTable({
- //Assigning data to table
- data: jsondata
- });
+ loadControllerData();
});
function operateFormatter(value, row, index) {
return ['<img class="siteDeleteImg" src="images/delete.png" href="javascript:void(0)" style="cursor: pointer" name="title" title="Delete" />']
@@ -48,8 +42,7 @@ window.operateEvents = {
'click .siteDeleteImg': function (e, value, row, index) {
// TO DO ajex call for delete
- deleteLink(row.id);
- console.log(value, row, index);
+ deleteController(row.id, row);
}
};
</script>
@@ -177,6 +170,15 @@ </span>
</div>
</th>
+ <th class="openo-table-state-default openo-table-th openo-table-disable-element leftHeaderAlign"
+ align="center" data-formatter="operateFormatter" data-events="operateEvents">
+ <div class="openo-table-th-border"></div>
+ <div class="DataTables_sort_wrapper openo-ellipsis ">
+ <span id="ctrler_nativeID_sorticon"
+ class="openo-table-th-sorticon overflow_elip leftHeaderAlign openo-table-disable-element ">Actions
+ </span>
+ </div>
+ </th>
</tr>
</thead>
<tbody>
@@ -299,7 +301,7 @@ </div>
<div class="modal-footer">
<button type="button" class="btn SDBtn" data-dismiss="modal" aria-hidden="true"
- id="createLink">
+ id="createController">
<span id="nfv-virtualApplication-iui-text-cancelBtn">OK</span>
</button>
<button type="button" class="btn button-previous SDBtn">
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 04437df9..df0fef51 100644 --- 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.
*/
-var url = "";
-$.getJSON("./conf/dataconfig.json", function (jsonData){
- url = jsonData.url +":"+ jsonData.port;
- console.log("URL = " + url);
-});
$('.siteDeleteImg').click(
function () {
@@ -35,7 +30,7 @@ $('.siteDeleteImg').click( });
function deleteController(objectId) {
- var requestUrl = url + "/openoapi/extsys/v1/sdncontrollers/" + objectId;
+ var requestUrl = "/openoapi/extsys/v1/sdncontrollers/" + objectId;
$.ajax({
type: "DELETE",
url: requestUrl,
@@ -54,14 +49,14 @@ function deleteController(objectId) { }
function loadControllerData() {
- var requestUrl = url + "/openoapi/extsys/v1/sdncontrollers";
+ var requestUrl = "/openoapi/extsys/v1/sdncontrollers";
$.ajax({
type: "GET",
url: requestUrl,
contentType: "application/json",
success: function (jsonobj) {
$('#controller').bootstrapTable({
- data: jsonobj.topologicalControllers
+ data: jsonobj
});
},
error: function (xhr, ajaxOptions, thrownError) {
@@ -150,11 +145,7 @@ $(function () { $('#createController').click(function () {
var formData = JSON.stringify($("#controllerForm").serializeObject());
var jsonobj = JSON.parse(formData);
- var newJson = {
- "topologicalController": jsonobj
- };
- formData = JSON.stringify(newJson);
- var requestUrl = url + "/openoapi/extsys/v1/sdncontrollers";
+ var requestUrl = "/openoapi/extsys/v1/sdncontrollers";
$.ajax({
type: "POST",
url: requestUrl,
@@ -163,7 +154,7 @@ $(function () { data: formData,
success: function (jsonResp) {
alert("Controller saved successfully!!!");
- jsonobj["id"] = jsonResp.topologicalController.id;
+ jsonobj["id"] = jsonResp.sdnControllerId;
$('#controller').bootstrapTable("append", jsonobj);
$('#vmAppDialog').removeClass('in').css('display', 'none');
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 87e36cfd..f7ee6178 100644 --- 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 @@ {
- "url": "http://localhost",
- "port": "8080"
+ "url": "http://127.0.0.1",
+ "port": "8080",
+ "context_name":"resmgr"
}
\ 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 2a27603e..27a70d02 100644 --- 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
* limitations under the License.
*/
-var url = "";
-$.getJSON("./conf/dataconfig.json", function (jsonData){
- url = jsonData.url +":"+ jsonData.port;
- console.log("URL = " + url);
-});
-
$('.siteDeleteImg').click(function () {
var data = $(this).parent().parent().parent().find('td:last').find('div:last').html();
alert(data);
@@ -31,8 +25,12 @@ $('.siteDeleteImg').click(function () { });
+function hideFirstCol() {
+ //$('table tr').find('th:eq(0)').hide();
+ //$('table tr').find('td:eq(0)').hide();
+}
function deleteSite(objectId) {
- var requestUrl = url+"/openoapi/sdnobrs/v1/sites/" + objectId;
+ var requestUrl = "/openoapi/sdnobrs/v1/sites/" + objectId;
$
.ajax({
type: "DELETE",
@@ -51,7 +49,7 @@ function deleteSite(objectId) { });
}
function deleteLink(objectId) {
- var requestUrl = url+"/openoapi/sdnobrs/v1/topological-links/" + objectId;
+ var requestUrl = "/openoapi/sdnobrs/v1/topological-links/" + objectId;
$
.ajax({
type: "DELETE",
@@ -71,7 +69,7 @@ function deleteLink(objectId) { }
function deleteNe(objectId) {
- var requestUrl = url+"/openoapi/sdnobrs/v1/managed-elements/" + objectId;
+ var requestUrl = "/openoapi/sdnobrs/v1/managed-elements/" + objectId;
$
.ajax({
type: "DELETE",
@@ -91,7 +89,7 @@ function deleteNe(objectId) { }
function deletePort(objectId) {
- var requestUrl = url+"/openoapi/sdnobrs/v1/logical-termination-points/" + objectId;
+ var requestUrl = "/openoapi/sdnobrs/v1/logical-termination-points/" + objectId;
$
.ajax({
type: "DELETE",
@@ -110,7 +108,7 @@ function deletePort(objectId) { });
}
function loadSiteData() {
- var requestUrl = url+"/openoapi/sdnobrs/v1/sites";
+ var requestUrl = "/openoapi/sdnobrs/v1/sites";
$
.ajax({
type: "GET",
@@ -127,7 +125,7 @@ function loadSiteData() { });
}
function loadLinkData() {
- var requestUrl = url+"/openoapi/sdnobrs/v1/topological-links";
+ var requestUrl = "/openoapi/sdnobrs/v1/topological-links";
$
.ajax({
type: "GET",
@@ -144,16 +142,21 @@ function loadLinkData() { });
}
function loadNeData() {
- var requestUrl = url+"/openoapi/sdnobrs/v1/managed-elements";
+
+ var requestUrl = "/openoapi/sdnobrs/v1/managed-elements";
$
.ajax({
type: "GET",
url: requestUrl,
contentType: "application/json",
success: function (jsonobj) {
+ var nedata = jsonobj.managedElements;
$('#ne').bootstrapTable({
- data: jsonobj.managedElements
+ data: nedata
});
+ $('#ne').bootstrapTable('refresh');
+ hideFirstCol();
+
},
error: function (xhr, ajaxOptions, thrownError) {
alert("Error on getting ne data : " + xhr.responseText);
@@ -161,7 +164,7 @@ function loadNeData() { });
}
function loadPortData() {
- var requestUrl = url+"/openoapi/sdnobrs/v1/logical-termination-points";
+ var requestUrl = "/openoapi/sdnobrs/v1/logical-termination-points";
$
.ajax({
type: "GET",
@@ -177,6 +180,34 @@ function loadPortData() { }
});
}
+function loadControllerData() {
+ var requestUrl = "/openoapi/extsys/v1/sdncontrollers";
+ $.ajax({
+ type: "GET",
+ url: requestUrl,
+ contentType: "application/json",
+ success: function (jsonobj) {
+ fillSelect(jsonobj);
+ },
+ error: function (xhr, ajaxOptions, thrownError) {
+ alert("Error on getting controller data : " + xhr.responseText);
+ }
+ });
+}
+function fillSelect(str){
+ var json;
+ if(typeof str === 'object'){
+ json = str;
+ }
+ else{
+ json = eval('(' + str + ')');
+ }
+ var seleObj = $('#controller')
+ seleObj.find("option").remove();
+ for(var i=0;i < json.length;i++){
+ seleObj.append('<option value="'+json[i].name+'">'+json[i].name+'</option>');
+ }
+}
$(function () {
$('.creat-btn').click(function () {
$('#vmAppDialog').addClass('in').css({'display': 'block'});
@@ -206,6 +237,7 @@ $(function () { });
$('.table tr:odd').addClass('active');
$('#false').click(function () {
+ loadControllerData();
$('#vmAppDialog').addClass('in').css({'display': 'block'});
});
$('.close,.button-previous').click(function () {
@@ -245,7 +277,7 @@ $(function () { var jsonobj = JSON.parse(formData);
var newJson = {"site": jsonobj};
formData = JSON.stringify(newJson);
- var requestUrl = url+"/openoapi/sdnobrs/v1/sites";
+ var requestUrl = "/openoapi/sdnobrs/v1/sites";
$
.ajax({
type: "POST",
@@ -270,7 +302,7 @@ $(function () { var jsonobj = JSON.parse(formData);
var newJson = {"managedElement": jsonobj};
formData = JSON.stringify(newJson);
- var requestUrl = url+"/openoapi/sdnobrs/v1/managed-elements";
+ var requestUrl = "/openoapi/sdnobrs/v1/managed-elements";
$
.ajax({
type: "POST",
@@ -296,7 +328,7 @@ $(function () { var jsonobj = JSON.parse(formData);
var newJson = {"logicalTerminationPoint": jsonobj};
formData = JSON.stringify(newJson);
- var requestUrl = url+"/openoapi/sdnobrs/v1/logical-termination-points";
+ var requestUrl = "/openoapi/sdnobrs/v1/logical-termination-points";
$
.ajax({
type: "POST",
@@ -323,7 +355,7 @@ $(function () { var jsonobj = JSON.parse(formData);
var newJson = {"topologicalLink": jsonobj};
formData = JSON.stringify(newJson);
- var requestUrl = url+"/openoapi/sdnobrs/v1/topological-links";
+ var requestUrl = "/openoapi/sdnobrs/v1/topological-links";
$
.ajax({
type: "POST",
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 19dfa6dc..5110344a 100644 --- 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>
<script type="text/javascript">
$(document).ready(function () {
-
-
- var jsondata = loadLinkData();
-
- $('#link').bootstrapTable({
- //Assigning data to table
- data: jsondata
- });
+ loadLinkData();
});
function operateFormatter(value, row, index) {
return [
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 4a1f9fdc..518da3ee 100644 --- 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>
<script type="text/javascript" src="js/bootstrap-table-filter-control.min.js"></script>
<script type="text/javascript">
+
$(document).ready(function () {
- var jsondata = [];
- jsondata = loadNeData();
- $('#ne').bootstrapTable({
- //Assigning data to table
- data: jsondata
- });
+ loadNeData();
});
function operateFormatter(value, row, index) {
return [
@@ -146,6 +142,15 @@ </div>
</th>
<th class="openo-table-state-default openo-table-th openo-table-disable-element leftHeaderAlign"
+ data-field="nativeID" data-sortable="true" data-filter-control="input">
+ <div class="openo-table-th-border"></div>
+ <div class="DataTables_sort_wrapper openo-ellipsis ">
+ <span id="native_Id"
+ class="openo-table-th-sorticon overflow_elip leftHeaderAlign openo-table-disable-element ">Native Id
+ </span>
+ </div>
+ </th>
+ <th class="openo-table-state-default openo-table-th openo-table-disable-element leftHeaderAlign"
data-field="ipAddress" data-sortable="true" data-filter-control="input">
<div class="openo-table-th-border"></div>
<div class="DataTables_sort_wrapper openo-ellipsis ">
@@ -321,11 +326,20 @@ <span>Controller</span>
</label>
<div class="col-sm-7">
- <select class="form-control" style="padding-top: 0px;padding-bottom: 0px;"
- id="controller"
- name="controller">
- <option value="Type1">Type1</option>
- </select>
+ <select class="form-control" style="padding-top: 0px;padding-bottom: 0px;"
+ id="controller"
+ name="controller">
+ <option value="Type1">No controller</option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">
+ <span>Native ID</span>
+ </label>
+ <div class="col-sm-7">
+ <input type="text" id="nativeID" name="nativeID" class="form-control"
+ placeholder="Native ID"/>
</div>
</div>
<div class="form-group">
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 70c25652..ba0d5ec2 100644 --- 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>
<script type="text/javascript">
$(document).ready(function () {
-
- var jsondata = [];
- jsondata = loadPortData();
-
- $('#port').bootstrapTable({
- //Assigning data to table
- data: jsondata
- });
+ loadPortData();
});
function operateFormatter(value, row, index) {
return [
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 0e0f1ec3..0625f70c 100644 --- 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 () {
$('#accordionContent').attr('src', 'link.html');
});
-
- $('#accordionmenuid_ul_0_0_brAppTopMenuID_UL_1_4_locationID').click(function () {
- $('#accordionContent').attr('src', '../resmgr-nfv/location.html');
- });
- $('#accordionmenuid_ul_0_0_brAppTopMenuID_UL_1_5_vimID').click(function () {
- $('#accordionContent').attr('src', '../resmgr-nfv/vim.html');
- });
- $('#accordionmenuid_ul_0_0_brAppTopMenuID_UL_1_6_datacenterID').click(function () {
- $('#accordionContent').attr('src', '../resmgr-nfv/datacenter.html');
- });
})
</script>
@@ -127,19 +117,6 @@ nodeid="brAppTlMenuID" style="display: list-item;">
<a title="Link" style="padding-left: 62px;">Link</a>
</li>
-
- <li id="accordionmenuid_ul_0_0_brAppTopMenuID_UL_1_4_locationID"
- nodeid="brAppSiteMenuID" class="" style="display: list-item;">
- <a title="Click to visit location" class="" style="padding-left: 62px;">Location</a>
- </li>
- <li id="accordionmenuid_ul_0_0_brAppTopMenuID_UL_1_5_vimID"
- nodeid="brAppMeMenuID" style="display: list-item;">
- <a title="Click to visit vim" style="padding-left: 62px;">Vim</a>
- </li>
- <li id="accordionmenuid_ul_0_0_brAppTopMenuID_UL_1_6_datacenterID"
- nodeid="brAppTpMenuID" style="display: list-item;">
- <a title="Click to visit datacenter" style="padding-left: 62px;">DataCenter</a>
- </li>
</ul>
</li>
</ul>
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 b0d6b54a..03604ff9 100644 --- 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>
<script type="text/javascript">
$(document).ready(function () {
-
- var jsondata = [];
- jsondata = loadSiteData();
- $('#site').bootstrapTable({
- //Assigning data to table
- data: jsondata
- });
-
-
+ loadSiteData();
});
function operateFormatter(value, row, index) {
|