From 432af2525227d4d1ce021863f96fd419547c0490 Mon Sep 17 00:00:00 2001 From: Siva Bavanasi Date: Tue, 7 Oct 2014 16:19:13 +0530 Subject: [PATCH 01/25] Menus and Folder structure for baremetal_servers feature Change-Id: Iceaee6be89a2ad1dd60d798b5415e0f7dcbd7afc --- .../virtualrouters/api/parseURL.xml | 0 .../api/virtualRouters_config.api.js | 0 .../ui/virtualRouters_config.js | 0 .../ui/virtualRouters_config.view | 0 webroot/menu.xml | 79 +++++++++++++++++++ 5 files changed, 79 insertions(+) create mode 100644 webroot/config/physicaldevices/virtualrouters/api/parseURL.xml create mode 100644 webroot/config/physicaldevices/virtualrouters/api/virtualRouters_config.api.js create mode 100644 webroot/config/physicaldevices/virtualrouters/ui/virtualRouters_config.js create mode 100644 webroot/config/physicaldevices/virtualrouters/ui/virtualRouters_config.view diff --git a/webroot/config/physicaldevices/virtualrouters/api/parseURL.xml b/webroot/config/physicaldevices/virtualrouters/api/parseURL.xml new file mode 100644 index 000000000..e69de29bb diff --git a/webroot/config/physicaldevices/virtualrouters/api/virtualRouters_config.api.js b/webroot/config/physicaldevices/virtualrouters/api/virtualRouters_config.api.js new file mode 100644 index 000000000..e69de29bb diff --git a/webroot/config/physicaldevices/virtualrouters/ui/virtualRouters_config.js b/webroot/config/physicaldevices/virtualrouters/ui/virtualRouters_config.js new file mode 100644 index 000000000..e69de29bb diff --git a/webroot/config/physicaldevices/virtualrouters/ui/virtualRouters_config.view b/webroot/config/physicaldevices/virtualrouters/ui/virtualRouters_config.view new file mode 100644 index 000000000..e69de29bb diff --git a/webroot/menu.xml b/webroot/menu.xml index f62b7ce9c..e4888e5ab 100644 --- a/webroot/menu.xml +++ b/webroot/menu.xml @@ -512,6 +512,85 @@ and need to add the iconClass tag wherever we need to show some icons + + + + + member + + + openstack + + + icon-globe + + + + config_pd_virtualRouters + + + /config/pd/ui + virtualRouters_config.js + virtualRouters_config.view + virtualRoutersConfigObj + + + Configure Virtual Routers + + + + config_pd_physicalRouters + + + /config/pd/ui + physicalRouters_config.js + physicalRouters_config.view + physicalRoutersConfigObj + + + Configure Physical Routers + + + + config_pd_physicalInterfaces + + + /config/pd/ui + physicalInterfaces_config.js + physicalInterfaces_config.view + physicalInterfacesConfigObj + + + Configure Physical Interfaces + + + + config_pd_serviceAppliances + + + /config/pd/ui + serviceAppliances_config.js + serviceAppliances_config.view + serviceAppliancesConfigObj + + + Configure Service Appliances + + + + config_pd_baremetalServers + + + /config/pd/ui + baremetalServers_config.js + baremetalServers_config.view + baremetalServersConfigObj + + + Configure Baremetal Servers + + + + + + parseURLReq + process.mainModule.exports["corePath"] + '/src/serverroot/common/parseURLRequire' + + + virtualroutersconfigapi + ./virtualroutersconfig.api + + + + + /api/tenants/config/virtual-routers + get + virtualroutersconfig + virtualroutersconfigapi.getVirtualRouters + + + /api/tenants/config/virtual-routers + post + virtualroutersconfig + virtualroutersconfigapi.createVirtualRouters + + + /api/tenants/config/virtual-router/:id + put + virtualroutersconfig + virtualroutersconfigapi.updateVirtualRouters + + + /api/tenants/config/virtual-router/:id + delete + virtualroutersconfig + virtualroutersconfigapi.deleteVirtualRouters + + \ No newline at end of file diff --git a/webroot/config/physicaldevices/virtualrouters/api/virtualRouters_config.api.js b/webroot/config/physicaldevices/virtualrouters/api/virtualRouters_config.api.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/webroot/config/physicaldevices/virtualrouters/api/virtualroutersconfig.api.js b/webroot/config/physicaldevices/virtualrouters/api/virtualroutersconfig.api.js new file mode 100644 index 000000000..102ae0432 --- /dev/null +++ b/webroot/config/physicaldevices/virtualrouters/api/virtualroutersconfig.api.js @@ -0,0 +1,138 @@ +/* + * Copyright (c) 2014 Juniper Networks, Inc. All rights reserved. + */ + + /** + * @quotasconfig.api.js + * - Handlers for project quotas + * - Interfaces with config api server + */ +var rest = require(process.mainModule.exports["corePath"] + + '/src/serverroot/common/rest.api'); +var async = require('async'); +var quotasconfigapi = module.exports; +var logutils = require(process.mainModule.exports["corePath"] + + '/src/serverroot/utils/log.utils'); +var commonUtils = require(process.mainModule.exports["corePath"] + + '/src/serverroot/utils/common.utils'); +var config = require(process.mainModule.exports["corePath"] + + '/config/config.global.js'); +var messages = require(process.mainModule.exports["corePath"] + + '/src/serverroot/common/messages'); +var global = require(process.mainModule.exports["corePath"] + + '/src/serverroot/common/global'); +var appErrors = require(process.mainModule.exports["corePath"] + + '/src/serverroot/errors/app.errors'); +var util = require('util'); +var url = require('url'); +var configApiServer = require(process.mainModule.exports["corePath"] + + '/src/serverroot/common/configServer.api'); +var async = require('async'); + +/** + * @getVirtualRouters + * public function + * 1. URL /api/tenants/config/virtual-routers/ + * 2. Gets virtual routers from config api server + */ +function getVirtualRouters (request, response, appData) +{ + configApiServer.apiGet('/virtual-routers', appData, + function(error, data) { + getVirtualRoutersDetails(error, data, response, appData); + }); +} + +function getVirtualRoutersDetails(error, data, response, appData) +{ + var reqUrl = null; + var dataObjArr = []; + var i = 0, vRoutersLength = 0; + + if (error) { + commonUtils.handleJSONResponse(error, response, null); + return; + } + vRoutersLength = data['virtual-routers'].length; + for(i = 0; i < vRoutersLength; i++) { + reqUrl = '/virtual-router/' + data['virtual-routers'][i]['uuid']; + commonUtils.createReqObj(dataObjArr, reqUrl, global.HTTP_REQUEST_GET, + null, null, null, appData); + } + async.map(dataObjArr, + commonUtils.getAPIServerResponse(configApiServer.apiGet, false), + function(error, results) { + if (error) { + commonUtils.handleJSONResponse(error, response, null); + return; + } + commonUtils.handleJSONResponse(error, response, results); + } + ) +} + +/** + * @createVirtualRouters + * public function + * 1. URL /api/tenants/config/virtual-routers/ + * 2. creats a virtual router in config api server + */ +function createVirtualRouters (request, response, appData) +{ + var postData = request.body; + configApiServer.apiPost('/virtual-routers', postData, appData, + function(error, data) { + getVirtualRouters(request, response, appData); + }); +} + +/** + * @updateVirtualRouters + * public function + * 1. URL /api/tenants/config/virtual-router/:id + * 2. updates a virtual router in config api server + */ +function updateVirtualRouters (request, response, appData) +{ + var vRouterID = validateVirtualRouterId(request); + var postData = request.body; + configApiServer.apiPut('/virtual-router/' + vRouterID, postData, appData, + function(error, data) { + getVirtualRouters(request, response, appData); + }); +} + +/** + * @deleteVirtualRouters + * public function + * 1. URL /api/tenants/config/virtual-router/:id + * 2. deletes a virtual router in config api server + */ +function deleteVirtualRouters (request, response, appData) +{ + var vRouterID = validateVirtualRouterId(request); + var postData = request.body; + configApiServer.apiDelete('/virtual-router/' + vRouterID, appData, + function(error, data) { + getVirtualRouters(request, response, appData); + }); +} + +function validateVirtualRouterId (request) +{ + var vRouterId = null; + if (!(vRouterId = request.param('id').toString())) { + error = new appErrors.RESTServerError('Add Virtual Router id'); + commonUtils.handleJSONResponse(error, response, null); + return; + } + return vRouterId; +} + + /* List all public function here */ + +exports.getVirtualRouters = getVirtualRouters; +exports.createVirtualRouters = createVirtualRouters; +exports.updateVirtualRouters = updateVirtualRouters; +exports.deleteVirtualRouters = deleteVirtualRouters; + \ No newline at end of file diff --git a/webroot/config/physicaldevices/virtualrouters/ui/js/virtualrouters_config.js b/webroot/config/physicaldevices/virtualrouters/ui/js/virtualrouters_config.js new file mode 100644 index 000000000..2e02aca93 --- /dev/null +++ b/webroot/config/physicaldevices/virtualrouters/ui/js/virtualrouters_config.js @@ -0,0 +1,310 @@ +/* + * Copyright (c) 2014 Juniper Networks, Inc. All rights reserved. + */ + +virtualRoutersConfigObj = new virtualRoutersConfig(); +function virtualRoutersConfig() { + //Variable Definations + var gridVirtualRouters; + + //Method Definations + this.load = load; + this.destroy = destroy; + + function load() { + var configTemplate = Handlebars.compile($("#virtualrouters-config-template").html()); + $(contentContainer).html(''); + $(contentContainer).html(configTemplate); + init(); + } + + function init() { + initComponents(); + initActions(); + fetchData(); + } + + function initComponents() { + //initializing the virtual routers Grid + $("#gridVirtualRouters").contrailGrid({ + header : { + title: { + text : 'Virtual Routers', + //cssClass : 'blue', + //icon : 'icon-list', + //iconCssClass : 'blue' + }, + customControls: ['', + ''] + }, + columnHeader : { + columns : [ + { + id : 'name', + field : 'name', + name : 'Name' + }, + { + id : 'ip_address', + field : 'ip_address', + name : 'IP Address' + }, + { + id : 'type', + field : 'type', + name : 'Type' + }] + }, + body : { + options : { + checkboxSelectable: { + onNothingChecked: function(e){ + $('#btnDeleteVirtualRouter').addClass('disabled-link'); + }, + onSomethingChecked: function(e){ + $('#btnDeleteVirtualRouter').removeClass('disabled-link'); + } + }, + forceFitColumns: true, + actionCell: [ + { + title: 'Edit', + iconClass: 'icon-edit', + onClick: function(rowIndex){ + virtualRouterEditWindow(rowIndex); + } + }, + { + title: 'Delete', + iconClass: 'icon-trash', + onClick: function(rowIndex){ + showVirtualRouterDelWindow(rowIndex); + } + } + ], + detail : { + template : $("#gridVirtualRoutersDetailTemplate").html() + } + }, + dataSource : { + data : [] + }, + statusMessages: { + loading: { + text: 'Loading Virtual Routers..' + }, + empty: { + text: 'No Virtual Routers.' + }, + errorGettingData: { + type: 'error', + iconClasses: 'icon-warning', + text: 'Error in getting Virtual Routers.' + } + } + } + }); + gridVirtualRouters = $("#gridVirtualRouters").data('contrailGrid'); + + //initializing add record window + $('#addVirtualRouterWindow').modal({backdrop:'static',keyboard:false,show:false}); + $('#addVirtualRouterWindow').find(".modal-header-title").text('Add Virtual Router'); + + //initializing virtual router type multi select + $('#msType').contrailMultiselect({ + dataTextField:'text', + dataValueField:'value', + }); + + var msType = $('#msType').data('contrailMultiselect'); + var msTypeDS = [{ text : 'Embedded', value : 'embedded'}, + { text : 'TOR Agent', value : 'tor_agent'}, + { text : 'TOR Service Node ', value : 'tsn'}, + { text : 'Hypervisor', value : 'hypervisor'}] + msType.setData(msTypeDS); + + //initializing delete record window + //deleteRecordWindowObj.modal({backdrop:'static',keyboard:false,show:false}); + //deleteRecordWindowObj.find(".modal-header-title").text('Confirm'); + + $('#confirmMainDelete').modal({backdrop:'static',keyboard:false,show:false}); + $('#confirmMainDelete').find(".modal-header-title").text('Confirm'); + } + + function initActions() { + $('#btnCreateVirtualRouter').click(function() { + populateCreateEditWindow('create'); + }); + + $('#btnAddVirtualRouterOk').click(function() { + if(validate()) { + $('#addVirtualRouterWindow').modal('hide'); + createUpdateVirtualRouter(); + } + }); + $('#btnDeleteVirtualRouter').click(function(){ + $('#confirmMainDelete').modal('show'); + }); + $('#btnCnfDelMainPopupOK').click(function(args){ + var selected_rows = gridVirtualRouters.getCheckedRows(); + $('#confirmMainDelete').modal("hide"); + deleteVirtualRouter(selected_rows); + }); + } + + window.showVirtualRouterDelWindow = function(index) { + $.contrailBootstrapModal ( + { + id: 'confirmRemove', + title: 'Remove', + body: '
Confirm Removing record
', + footer: [ + { + title: 'Cancel', + onclick: 'close', + }, + { + id: 'btnRemovePopupOK', + title: 'Confirm', + onclick: function(){ + var selected_row = gridVirtualRouters._dataView.getItem(index); + deleteVirtualRouter([selected_row]); + $('#confirmRemove').modal('hide'); + }, + className: 'btn-primary' + }] + }); + } + + function deleteVirtualRouter(selected_rows) { + $('#btnDeleteVirtualRouter').addClass('disabled-link'); + if(selected_rows && selected_rows.length > 0){ + var deleteAjaxs = []; + for(var i = 0;i < selected_rows.length;i++){ + var sel_row_data = selected_rows[i]; + deleteAjaxs[i] = $.ajax({ + url:'/api/tenants/config/virtual-router/' + sel_row_data['uuid'], + type:'DELETE' + }); + } + $.when.apply($,deleteAjaxs).then( + function(response){ + //all success + fetchData(); + }, + function(){ + //if at least one delete operation fails + var r = arguments; + showInfoWindow(r[0].responseText,r[2]); + fetchData(); + } + ); + } + } + + window.virtualRouterEditWindow = function(index) { + gblSelRow = gridVirtualRouters._dataView.getItem(index); + populateCreateEditWindow('edit'); + } + + function populateCreateEditWindow(m) { + mode = m; + clearCreateEditWindow(); + if(mode === 'edit') { + $('#txtVirtualRouterName').val(gblSelRow.name); + $('#txtVirtualRouterName').attr('disabled','disabled'); + $('#txtIPAddress').val(gblSelRow.ip_address); + } + $('#addVirtualRouterWindow').modal('show'); + } + + function createUpdateVirtualRouter() { + var methodType = 'POST'; + var url = '/api/tenants/config/virtual-routers'; + if(mode === 'edit') { + methodType = 'PUT'; + url = '/api/tenants/config/virtual-router/' + gblSelRow.uuid + } + var name = $("#txtVirtualRouterName").val(); + var ipAddress = $("#txtIPAddress").val(); + var type = $("#msType").data('contrailMultiselect').value(); + var postObject = {}; + + gridVirtualRouters._dataView.setData([]); + gridVirtualRouters.showGridMessage('loading'); + + postObject["virtual-router"] = {}; + postObject["virtual-router"]["fq_name"] = ["default-global-system-config", name]; + postObject["virtual-router"]["parent_type"] = "global-system-config"; + postObject["virtual-router"]["name"] = name; + postObject["virtual-router"]["virtual_router_ip_address"] = ipAddress; + postObject["virtual-router"]["type"] = type; + doAjaxCall(url, methodType, JSON.stringify(postObject), 'successHandlerForVirtualRouters', 'failureHandlerForVirtualRouters', null, null); + } + + function clearCreateEditWindow() { + $('#txtVirtualRouterName').removeAttr('disabled'); + $("#txtVirtualRouterName").val(''); + $("#txtIPAddress").val(''); + var msType = $("#msType").data('contrailMultiselect'); + msType.value(''); + } + + function fetchData() { + gridVirtualRouters._dataView.setData([]); + gridVirtualRouters.showGridMessage('loading'); + doAjaxCall('/api/tenants/config/virtual-routers','GET', null, 'successHandlerForVirtualRouters', 'failureHandlerForVirtualRouters', null, null); + } + + window.successHandlerForVirtualRouters = function(result) { + if(result.length > 0) { + var gridDS = []; + for(var i = 0; i < result.length;i++) { + var rowData = result[i]['virtual-router']; + gridDS.push({ + uuid : rowData.uuid, + name : rowData.name, + ip_address : rowData.virtual_router_ip_address, + type : '-' + }); + } + + } else { + gridVirtualRouters.showGridMessage("empty"); + } + gridVirtualRouters._dataView.setData(gridDS); + } + + window.failureHandlerForVirtualRouters = function(error) { + gridVirtualRouters.showGridMessage("errorGettingData"); + } + + function validate() { + var name = $('#txtVirtualRouterName').val().trim(); + if(name === ""){ + showInfoWindow("Enter a Virtual Router Name","Input required"); + return false; + } + var ipAddress = $('#txtIPAddress').val().trim(); + if(!validateIPAddress(ipAddress)){ + showInfoWindow("Enter a valid IP address in xxx.xxx.xxx.xxx format","Input required"); + return false; + } + return true; + } + + function destroy() { + var configTemplate = $("#virtualrouters-config-template"); + if(isSet(configTemplate)) { + configTemplate.remove(); + configTemplate = $(); + } + var configDetailTemplate = $("#gridVirtualRoutersDetailTemplate"); + if(isSet(configDetailTemplate)) { + configDetailTemplate.remove(); + configDetailTemplate = $(); + } + } + + } + \ No newline at end of file diff --git a/webroot/config/physicaldevices/virtualrouters/ui/views/virtualrouters_config.view b/webroot/config/physicaldevices/virtualrouters/ui/views/virtualrouters_config.view new file mode 100644 index 000000000..3b57e490e --- /dev/null +++ b/webroot/config/physicaldevices/virtualrouters/ui/views/virtualrouters_config.view @@ -0,0 +1,80 @@ + + \ No newline at end of file diff --git a/webroot/config/physicaldevices/virtualrouters/ui/virtualRouters_config.js b/webroot/config/physicaldevices/virtualrouters/ui/virtualRouters_config.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/webroot/config/physicaldevices/virtualrouters/ui/virtualRouters_config.view b/webroot/config/physicaldevices/virtualrouters/ui/virtualRouters_config.view deleted file mode 100644 index e69de29bb..000000000 diff --git a/webroot/menu.xml b/webroot/menu.xml index e4888e5ab..e88f8ac98 100644 --- a/webroot/menu.xml +++ b/webroot/menu.xml @@ -529,9 +529,9 @@ and need to add the iconClass tag wherever we need to show some icons config_pd_virtualRouters - /config/pd/ui - virtualRouters_config.js - virtualRouters_config.view + /config/physicaldevices/virtualrouters/ui + virtualrouters_config.js + virtualrouters_config.view virtualRoutersConfigObj @@ -542,7 +542,7 @@ and need to add the iconClass tag wherever we need to show some icons config_pd_physicalRouters - /config/pd/ui + /config/physicaldevices/virtualrouters/ui physicalRouters_config.js physicalRouters_config.view physicalRoutersConfigObj From 5176d0b39443dde921136f4336c8905c564ca75b Mon Sep 17 00:00:00 2001 From: Manoj Naik Date: Wed, 8 Oct 2014 15:33:49 +0530 Subject: [PATCH 03/25] Initial code for Physical Routers config Change-Id: I026676083a82824d412a849965139cae514b4f77 --- .../physicalrouters/api/parseURL.xml | 46 +++ .../api/physicalroutersconfig.api.js | 186 ++++++++++ .../ui/js/physicalrouters_config.js | 349 ++++++++++++++++++ .../ui/views/physicalrouters_config.view | 120 ++++++ webroot/menu.xml | 12 +- 5 files changed, 707 insertions(+), 6 deletions(-) create mode 100644 webroot/config/physicaldevices/physicalrouters/api/parseURL.xml create mode 100644 webroot/config/physicaldevices/physicalrouters/api/physicalroutersconfig.api.js create mode 100644 webroot/config/physicaldevices/physicalrouters/ui/js/physicalrouters_config.js create mode 100644 webroot/config/physicaldevices/physicalrouters/ui/views/physicalrouters_config.view diff --git a/webroot/config/physicaldevices/physicalrouters/api/parseURL.xml b/webroot/config/physicaldevices/physicalrouters/api/parseURL.xml new file mode 100644 index 000000000..e292d7427 --- /dev/null +++ b/webroot/config/physicaldevices/physicalrouters/api/parseURL.xml @@ -0,0 +1,46 @@ + + + + parseURLReq + process.mainModule.exports["corePath"] + '/src/serverroot/common/parseURLRequire' + + + physicalroutersapi + ./physicalroutersconfig.api + + + + + /api/tenants/config/physical-routers + get + physicalroutersconfig + physicalroutersapi.getPhysicalRouters + + + /api/tenants/config/physical-routers + post + physicalroutersconfig + physicalroutersapi.createPhysicalRouters + + + /api/tenants/config/physical-router/:id + put + physicalroutersconfig + physicalroutersapi.updatePhysicalRouters + + + /api/tenants/config/physical-router/:id + delete + physicalroutersconfig + physicalroutersapi.deletePhysicalRouters + + + diff --git a/webroot/config/physicaldevices/physicalrouters/api/physicalroutersconfig.api.js b/webroot/config/physicaldevices/physicalrouters/api/physicalroutersconfig.api.js new file mode 100644 index 000000000..551054082 --- /dev/null +++ b/webroot/config/physicaldevices/physicalrouters/api/physicalroutersconfig.api.js @@ -0,0 +1,186 @@ +/* + * Copyright (c) 2014 Juniper Networks, Inc. All rights reserved. + */ + + /** + * @physicalroutersconfig.api.js + * - Handlers for physical routers + * - Interfaces with config api server + */ +var rest = require(process.mainModule.exports["corePath"] + + '/src/serverroot/common/rest.api'); +var async = require('async'); +var quotasconfigapi = module.exports; +var logutils = require(process.mainModule.exports["corePath"] + + '/src/serverroot/utils/log.utils'); +var commonUtils = require(process.mainModule.exports["corePath"] + + '/src/serverroot/utils/common.utils'); +var config = require(process.mainModule.exports["corePath"] + + '/config/config.global.js'); +var messages = require(process.mainModule.exports["corePath"] + + '/src/serverroot/common/messages'); +var global = require(process.mainModule.exports["corePath"] + + '/src/serverroot/common/global'); +var appErrors = require(process.mainModule.exports["corePath"] + + '/src/serverroot/errors/app.errors'); +var util = require('util'); +var url = require('url'); +var configApiServer = require(process.mainModule.exports["corePath"] + + '/src/serverroot/common/configServer.api'); +var async = require('async'); + + +/** + * @listPolicysCb + * private function + * 1. Callback for getPhysicalRouters + * 2. Reads the response from config api server + * and sends it back to the client. + */ +function getPhysicalRoutersCb(error, physicalRoutersData, response) +{ + if (error) { + commonUtils.handleJSONResponse(error, response, null); + return; + } + commonUtils.handleJSONResponse(error, response, physicalRoutersData); +} + +/** + * @listPolicys + * public function + * 1. URL /api/tenants/config/physical-routers + * 2. Gets list of physical-routers from config api server + * 3. Calls getPhysicalRoutersCb that process data from config + * api server and sends back the http response. + */ +function getPhysicalRouters (request, response, appData) +{ + configApiServer.apiGet('/physical-routers', appData, + function(error, data) { + getPhysicalRoutersDetails(error, data, response, appData); + }); +} + +function getPhysicalRoutersDetails(error, data, response, appData) +{ + var reqUrl = null; + var dataObjArr = []; + var i = 0, pRoutersLength = 0; + + if (error) { + commonUtils.handleJSONResponse(error, response, null); + return; + } + pRoutersLength = data['physical-routers'].length; + for(i = 0; i < pRoutersLength; i++) { + reqUrl = '/physical-router/' + data['physical-routers'][i]['uuid']; + console.log(i +' : ' + reqUrl); + commonUtils.createReqObj(dataObjArr, reqUrl, global.HTTP_REQUEST_GET, + null, null, null, appData); + } + async.map(dataObjArr, + commonUtils.getAPIServerResponse(configApiServer.apiGet, false), + function(error, results) { + if (error) { + commonUtils.handleJSONResponse(error, response, null); + return; + } + commonUtils.handleJSONResponse(error, response, results); + } + ) +} + +/** + * @setPRouterRead + * private function + * 1. Callback for Fip create / update operations + * 2. Reads the response of Fip get from config api server + * and sends it back to the client. + */ +function setPRouterRead(error, fipConfig, response, appData) +{ + var fipGetURL = '/floating-ip/'; + + if (error) { + commonUtils.handleJSONResponse(error, response, null); + return; + } + + fipGetURL += fipConfig['floating-ip']['uuid']; + configApiServer.apiGet(fipGetURL, appData, + function(error, data) { + fipSendResponse(error, data, response) + }); +} + +/** + * @createPhysicalRouter + * public function + * 1. URL /api/tenants/config/physical-routers - Post + */ +/** + * @createPhysicalRouters + * public function + * 1. URL /api/tenants/config/physical-routers/ + * 2. creats a physical router in config api server + */ +function createPhysicalRouters (request, response, appData) +{ + var postData = request.body; + configApiServer.apiPost('/physical-routers', postData, appData, + function(error, data) { + getPhysicalRouters(request, response, appData); + }); +} + +/** + * @updatePhysicalRouters + * public function + * 1. URL /api/tenants/config/physical-router/:id + * 2. updates a physical router in config api server + */ +function updatePhysicalRouters (request, response, appData) +{ + var pRouterId = validatePhysicalRouterId(request); + var postData = request.body; + configApiServer.apiPut('/physical-router/' + pRouterId, postData, appData, + function(error, data) { + getPhysicalRouters(request, response, appData); + }); +} + +/** + * @deletePhysicalRouters + * public function + * 1. URL /api/tenants/config/physical-router/:id + * 2. deletes a physical router in config api server + */ +function deletePhysicalRouters (request, response, appData) +{ + var pRouterID = validatePhysicalRouterId(request); + var postData = request.body; + configApiServer.apiDelete('/physical-router/' + pRouterID, appData, + function(error, data) { + getPhysicalRouters(request, response, appData); + }); +} + + +function validatePhysicalRouterId (request) +{ + var pRouterId = null; + if (!(pRouterId = request.param('id').toString())) { + error = new appErrors.RESTServerError('Add Physical Router id'); + commonUtils.handleJSONResponse(error, response, null); + return; + } + return pRouterId; +} + + /* List all public function here */ + + exports.getPhysicalRouters = getPhysicalRouters; + exports.createPhysicalRouters = createPhysicalRouters; + exports.updatePhysicalRouters = updatePhysicalRouters; + exports.deletePhysicalRouters = deletePhysicalRouters; \ No newline at end of file diff --git a/webroot/config/physicaldevices/physicalrouters/ui/js/physicalrouters_config.js b/webroot/config/physicaldevices/physicalrouters/ui/js/physicalrouters_config.js new file mode 100644 index 000000000..18dcfbfbb --- /dev/null +++ b/webroot/config/physicaldevices/physicalrouters/ui/js/physicalrouters_config.js @@ -0,0 +1,349 @@ +/* + * Copyright (c) 2014 Juniper Networks, Inc. All rights reserved. + */ + +physicalRoutersConfigObj = new physicalRoutersConfig(); +function physicalRoutersConfig() { + //Variable Definations + var gridPhysicalRouters; + + //Method Definations + this.load = load; + this.destroy = destroy; + + function load() { + var configTemplate = Handlebars.compile($("#physicalrouters-config-template").html()); + $(contentContainer).html(''); + $(contentContainer).html(configTemplate); + init(); + } + + function init() { + initComponents(); + initActions(); + fetchData(); + } + + function initComponents() { + //initializing the physical routers Grid + $("#gridPhysicalRouters").contrailGrid({ + header : { + title: { + text : 'Physical Routers', + //cssClass : 'blue', + //icon : 'icon-list', + //iconCssClass : 'blue' + }, + customControls: ['', + ''] + }, + columnHeader : { + columns : [ + { + id : 'name', + field : 'name', + name : 'Name' + }, + { + id : 'ip_address', + field : 'ip_address', + name : 'IP Address' + }, + { + id : 'uuid', + field : 'uuid', + name : 'UUID' + }, + { + id : 'interfaces', + field : 'interfaces', + name : 'Interfaces' + }] + }, + body : { + options : { + checkboxSelectable: { + onNothingChecked: function(e){ + $('#btnDeletePhysicalRouter').addClass('disabled-link'); + }, + onSomethingChecked: function(e){ + $('#btnDeletePhysicalRouter').removeClass('disabled-link'); + } + }, + forceFitColumns: true, + actionCell: [ + { + title: 'Edit', + iconClass: 'icon-edit', + onClick: function(rowIndex){ + physicalRouterEditWindow(rowIndex); + } + }, + { + title: 'Delete', + iconClass: 'icon-trash', + onClick: function(rowIndex){ + showPhysicalRouterDelWindow(rowIndex); + } + } + ], + detail : { + template : $("#gridPhysicalRoutersDetailTemplate").html() + } + }, + dataSource : { + data : [] + }, + statusMessages: { + loading: { + text: 'Loading Physical Routers..' + }, + empty: { + text: 'No Physical Routers.' + }, + errorGettingData: { + type: 'error', + iconClasses: 'icon-warning', + text: 'Error in getting Physical Routers.' + } + } + } + }); + gridPhysicalRouters = $("#gridPhysicalRouters").data('contrailGrid'); + + //initializing add record window + $('#addPhysicalRouterWindow').modal({backdrop:'static',keyboard:false,show:false}); + $('#addPhysicalRouterWindow').find(".modal-header-title").text('Add Physical Router'); + + //Initializing the bgp router dropdown + $('#ddBgpRouter').contrailDropdown({ + dataTextField:'text', + dataValueField:'value', + }); + var ddBgp = $('#ddBgpRouter').data('contrailDropdown'); + var ddBgpDS = [{ text : 'peer1', value : 'peer1'}, + { text : 'peer2', value : 'peer2'}] + ddBgp.setData(ddBgpDS); + + //initializing physical router type multi select + $('#msVN').contrailMultiselect({ + dataTextField:'text', + dataValueField:'value', + }); + + var msVN = $('#msVN').data('contrailMultiselect'); + var msVNDS = [{ text : 'vn1', value : 'vn1'}, + { text : 'vn2', value : 'vn2'}, + { text : 'vn3', value : 'vn3'}, + { text : 'vn4', value : 'vn4'}] + msVN.setData(msVNDS); + + //initializing physical router type multi select + $('#msVRouters').contrailMultiselect({ + dataTextField:'text', + dataValueField:'value', + }); + + var msVRouters = $('#msVRouters').data('contrailMultiselect'); + var msVRoutersDS = [{ text : 'vn1', value : 'vn1'}, + { text : 'vn2', value : 'vn2'}, + { text : 'vn3', value : 'vn3'}, + { text : 'vn4', value : 'vn4'}] + msVRouters.setData(msVRoutersDS); + + //initializing delete record window + //deleteRecordWindowObj.modal({backdrop:'static',keyboard:false,show:false}); + //deleteRecordWindowObj.find(".modal-header-title").text('Confirm'); + + $('#confirmMainDelete').modal({backdrop:'static',keyboard:false,show:false}); + $('#confirmMainDelete').find(".modal-header-title").text('Confirm'); + } + + function initActions() { + $('#btnCreatePhysicalRouter').click(function() { + populateCreateEditWindow('create'); + }); + + $('#btnAddPhysicalRouterOk').click(function() { + if(validate()) { + $('#addPhysicalRouterWindow').modal('hide'); + createUpdatePhysicalRouter(); + } + }); + $('#btnDeletePhysicalRouter').click(function(){ + $('#confirmMainDelete').modal('show'); + }); + $('#btnCnfDelMainPopupOK').click(function(args){ + var selected_rows = gridPhysicalRouters.getCheckedRows(); + $('#confirmMainDelete').modal("hide"); + deletePhysicalRouter(selected_rows); + }); + } + + window.showPhysicalRouterDelWindow = function(index) { + $.contrailBootstrapModal ( + { + id: 'confirmRemove', + title: 'Remove', + body: '
Confirm Removing record
', + footer: [ + { + title: 'Cancel', + onclick: 'close', + }, + { + id: 'btnRemovePopupOK', + title: 'Confirm', + onclick: function(){ + var selected_row = gridPhysicalRouters._dataView.getItem(index); + deletePhysicalRouter([selected_row]); + $('#confirmRemove').modal('hide'); + }, + className: 'btn-primary' + }] + }); + } + + function deletePhysicalRouter(selected_rows) { + $('#btnDeletePhysicalRouter').addClass('disabled-link'); + if(selected_rows && selected_rows.length > 0){ + var deleteAjaxs = []; + for(var i = 0;i < selected_rows.length;i++){ + var sel_row_data = selected_rows[i]; + deleteAjaxs[i] = $.ajax({ + url:'/api/tenants/config/physical-router/' + sel_row_data['uuid'], + type:'DELETE' + }); + } + $.when.apply($,deleteAjaxs).then( + function(response){ + //all success + fetchData(); + }, + function(){ + //if at least one delete operation fails + var r = arguments; + showInfoWindow(r[0].responseText,r[2]); + fetchData(); + } + ); + } + } + + window.physicalRouterEditWindow = function(index) { + gblSelRow = gridPhysicalRouters._dataView.getItem(index); + populateCreateEditWindow('edit'); + } + + function populateCreateEditWindow(m) { + mode = m; + clearCreateEditWindow(); + if(mode === 'edit') { + $('#txtPhysicalRouterName').val(gblSelRow.name); + $('#txtPhysicalRouterName').attr('disabled','disabled'); + $('#txtIPAddress').val(gblSelRow.ip_address); + } + $('#addPhysicalRouterWindow').modal('show'); + } + + function createUpdatePhysicalRouter() { + var methodType = 'POST'; + var url = '/api/tenants/config/physical-routers'; + if(mode === 'edit') { + methodType = 'PUT'; + url = '/api/tenants/config/physical-router/' + gblSelRow.uuid + } + var name = $("#txtPhysicalRouterName").val(); + var ipAddress = $("#txtIPAddress").val(); + var username = $("#txtUsername").val(); + var password = $("#txtPassword").val(); + var bgpRouter = $("#ddBgpRouter").data('contrailDropdown').value(); + var vn = $("#msVN").data('contrailMultiselect').value(); + var vRouters = $("#msVRouters").data('contrailMultiselect').value(); + var postObject = {}; + + gridPhysicalRouters._dataView.setData([]); + gridPhysicalRouters.showGridMessage('loading'); + + postObject["physical-router"] = {}; + postObject["physical-router"]["fq_name"] = ["default-global-system-config", name]; + postObject["physical-router"]["parent_type"] = "global-system-config"; + postObject["physical-router"]["name"] = name; +// postObject["physical-router"]["physical_router_ip_address"] = ipAddress; + postObject["physical-router"]["username"] = username; + postObject["physical-router"]["password"] = password; + postObject["physical-router"]["vn"] = vn; + postObject["physical-router"]["vRouters"] = vRouters; + doAjaxCall(url, methodType, JSON.stringify(postObject), 'successHandlerForPhysicalRouters', 'failureHandlerForPhysicalRouters', null, null); + } + + function clearCreateEditWindow() { + $('#txtPhysicalRouterName').removeAttr('disabled'); + $("#txtPhysicalRouterName").val(''); + $("#txtIPAddress").val(''); + $("#txtUsername").val(''); + $("#txtPassword").val(''); + $("#ddBgpRouter").data('contrailDropdown').value(''); + $("#msVN").data('contrailMultiselect').value(''); + $("#msVRouters").data('contrailMultiselect').value(''); + } + + function fetchData() { + gridPhysicalRouters._dataView.setData([]); + gridPhysicalRouters.showGridMessage('loading'); + doAjaxCall('/api/tenants/config/physical-routers','GET', null, 'successHandlerForPhysicalRouters', 'failureHandlerForPhysicalRouters', null, null); + } + + window.successHandlerForPhysicalRouters = function(result) { + if(result.length > 0) { + var gridDS = []; + for(var i = 0; i < result.length;i++) { + var rowData = result[i]['physical-router']; + var interfaces = ifNull(rowData['physical_interfaces'],0); + gridDS.push({ + uuid : rowData.uuid, + name : rowData.name, + ip_address : rowData.physical_router_ip_address, + interfaces : interfaces.length + }); + } + + } else { + gridPhysicalRouters.showGridMessage("empty"); + } + gridPhysicalRouters._dataView.setData(gridDS); + } + + window.failureHandlerForPhysicalRouters = function(error) { + gridPhysicalRouters.showGridMessage("errorGettingData"); + } + + function validate() { + var name = $('#txtPhysicalRouterName').val().trim(); + if(name === ""){ + showInfoWindow("Enter a Physical Router Name","Input required"); + return false; + } + var ipAddress = $('#txtIPAddress').val().trim(); + if(!validateIPAddress(ipAddress)){ + showInfoWindow("Enter a valid IP address in xxx.xxx.xxx.xxx format","Input required"); + return false; + } + return true; + } + + function destroy() { + var configTemplate = $("#physicalrouters-config-template"); + if(isSet(configTemplate)) { + configTemplate.remove(); + configTemplate = $(); + } + var configDetailTemplate = $("#gridPhysicalRoutersDetailTemplate"); + if(isSet(configDetailTemplate)) { + configDetailTemplate.remove(); + configDetailTemplate = $(); + } + } + + } + \ No newline at end of file diff --git a/webroot/config/physicaldevices/physicalrouters/ui/views/physicalrouters_config.view b/webroot/config/physicaldevices/physicalrouters/ui/views/physicalrouters_config.view new file mode 100644 index 000000000..40866d13f --- /dev/null +++ b/webroot/config/physicaldevices/physicalrouters/ui/views/physicalrouters_config.view @@ -0,0 +1,120 @@ + + \ No newline at end of file diff --git a/webroot/menu.xml b/webroot/menu.xml index e88f8ac98..0d8c9ffac 100644 --- a/webroot/menu.xml +++ b/webroot/menu.xml @@ -542,9 +542,9 @@ and need to add the iconClass tag wherever we need to show some icons config_pd_physicalRouters - /config/physicaldevices/virtualrouters/ui - physicalRouters_config.js - physicalRouters_config.view + /config/physicaldevices/physicalrouters/ui + physicalrouters_config.js + physicalrouters_config.view physicalRoutersConfigObj @@ -555,7 +555,7 @@ and need to add the iconClass tag wherever we need to show some icons config_pd_physicalInterfaces - /config/pd/ui + /config/physicaldevices/ui physicalInterfaces_config.js physicalInterfaces_config.view physicalInterfacesConfigObj @@ -568,7 +568,7 @@ and need to add the iconClass tag wherever we need to show some icons config_pd_serviceAppliances - /config/pd/ui + /config/physicaldevices/ui serviceAppliances_config.js serviceAppliances_config.view serviceAppliancesConfigObj @@ -581,7 +581,7 @@ and need to add the iconClass tag wherever we need to show some icons config_pd_baremetalServers - /config/pd/ui + /config/physicaldevices/ui baremetalServers_config.js baremetalServers_config.view baremetalServersConfigObj From 4fdefe6b1ed73be5146e7ad5ab1d5dc13b4f0285 Mon Sep 17 00:00:00 2001 From: Siva Bavanasi Date: Wed, 8 Oct 2014 19:43:23 +0530 Subject: [PATCH 04/25] Implemented physical-interfaces page and checked in related files Change-Id: I14baf7647cfcb7f80b98d16c1043964f952c6e46 --- .../physicalinterfaces/api/parseURL.xml | 55 +++ .../api/physicalinterfacesconfig.api.js | 162 +++++++ .../ui/js/physicalinterfaces_config.js | 394 ++++++++++++++++++ .../ui/views/physicalinterfaces_config.view | 128 ++++++ .../ui/js/physicalrouters_config.js | 15 +- webroot/menu.xml | 6 +- 6 files changed, 750 insertions(+), 10 deletions(-) create mode 100644 webroot/config/physicaldevices/physicalinterfaces/api/parseURL.xml create mode 100644 webroot/config/physicaldevices/physicalinterfaces/api/physicalinterfacesconfig.api.js create mode 100644 webroot/config/physicaldevices/physicalinterfaces/ui/js/physicalinterfaces_config.js create mode 100644 webroot/config/physicaldevices/physicalinterfaces/ui/views/physicalinterfaces_config.view diff --git a/webroot/config/physicaldevices/physicalinterfaces/api/parseURL.xml b/webroot/config/physicaldevices/physicalinterfaces/api/parseURL.xml new file mode 100644 index 000000000..f0a83a3a3 --- /dev/null +++ b/webroot/config/physicaldevices/physicalinterfaces/api/parseURL.xml @@ -0,0 +1,55 @@ + + + + parseURLReq + process.mainModule.exports["corePath"] + '/src/serverroot/common/parseURLRequire' + + + physicalinterfacesconfigapi + ./physicalinterfacesconfig.api + + + + + /api/tenants/config/physical-router-details + get + physicalinterfacesconfig + physicalinterfacesconfigapi.getPhysicalRouters + + + /api/tenants/config/physical-interfaces/:pRouterId + get + physicalinterfacesconfig + physicalinterfacesconfigapi.getPhysicalInterfaces + + + /api/tenants/config/physical-interfaces/:pRouterId + post + physicalinterfacesconfig + physicalinterfacesconfigapi.createPhysicalInterfaces + + + /api/tenants/config/physical-interface/:pRouterId/:pInterfaceId + put + physicalinterfacesconfig + physicalinterfacesconfigapi.updatePhysicalInterfaces + + + /api/tenants/config/physical-interface/:pRouterId/:pInterfaceId + delete + physicalinterfacesconfig + physicalinterfacesconfigapi.deletePhysicalInterfaces + + \ No newline at end of file diff --git a/webroot/config/physicaldevices/physicalinterfaces/api/physicalinterfacesconfig.api.js b/webroot/config/physicaldevices/physicalinterfaces/api/physicalinterfacesconfig.api.js new file mode 100644 index 000000000..a2891638f --- /dev/null +++ b/webroot/config/physicaldevices/physicalinterfaces/api/physicalinterfacesconfig.api.js @@ -0,0 +1,162 @@ +/* + * Copyright (c) 2014 Juniper Networks, Inc. All rights reserved. + */ + + /** + * @quotasconfig.api.js + * - Handlers for project quotas + * - Interfaces with config api server + */ +var rest = require(process.mainModule.exports["corePath"] + + '/src/serverroot/common/rest.api'); +var async = require('async'); +var quotasconfigapi = module.exports; +var logutils = require(process.mainModule.exports["corePath"] + + '/src/serverroot/utils/log.utils'); +var commonUtils = require(process.mainModule.exports["corePath"] + + '/src/serverroot/utils/common.utils'); +var config = require(process.mainModule.exports["corePath"] + + '/config/config.global.js'); +var messages = require(process.mainModule.exports["corePath"] + + '/src/serverroot/common/messages'); +var global = require(process.mainModule.exports["corePath"] + + '/src/serverroot/common/global'); +var appErrors = require(process.mainModule.exports["corePath"] + + '/src/serverroot/errors/app.errors'); +var util = require('util'); +var url = require('url'); +var configApiServer = require(process.mainModule.exports["corePath"] + + '/src/serverroot/common/configServer.api'); +var async = require('async'); + +/** + * @getPhysicalRouters + * public function + * 1. URL /api/tenants/config/physical-routers + * 2. Gets physical routers from config api server + */ +function getPhysicalRouters (request, response, appData) +{ + configApiServer.apiGet('/physical-routers', appData, + function(error, data) { + if (error) { + commonUtils.handleJSONResponse(error, response, null); + return; + } + commonUtils.handleJSONResponse(error, response, data); + } + ); +} + +/** + * @getPhysicalInterfaces + * public function + * 1. URL /api/tenants/config/physical-interfaces/:pRouterId + * 2. Gets physical interfaces from config api server + */ +function getPhysicalInterfaces (request, response, appData) +{ + var physicalRouterID = validateQueryParam(request, 'pRouterId'); + configApiServer.apiGet('/physical-router/' + physicalRouterID, appData, + function(error, data) { + getPhysicalInterfacesDetails(error, data, response, appData); + }); +} + +function getPhysicalInterfacesDetails(error, data, response, appData) +{ + var reqUrl = null; + var dataObjArr = []; + var i = 0, pInterfacesLength = 0; + + if (error) { + commonUtils.handleJSONResponse(error, response, null); + return; + } + if(data && data['physical-router'] && data['physical-router']['physical_interfaces'] && data['physical-router']['physical_interfaces'].length > 0) { + pInterfacesLength = data['physical-router']['physical_interfaces'].length; + for(i = 0; i < pInterfacesLength; i++) { + var pInterface = data['physical-router']['physical_interfaces'][i]; + reqUrl = '/physical-interface/' + pInterface['uuid']; + commonUtils.createReqObj(dataObjArr, reqUrl, global.HTTP_REQUEST_GET, + null, null, null, appData); + } + async.map(dataObjArr, + commonUtils.getAPIServerResponse(configApiServer.apiGet, false), + function(error, results) { + if (error) { + commonUtils.handleJSONResponse(error, response, null); + return; + } + commonUtils.handleJSONResponse(error, response, results); + } + ) + } else { + commonUtils.handleJSONResponse(error, response, null); + } +} + +/** + * @createPhysicalInterfaces + * public function + * 1. URL /api/tenants/config/physical-interfaces/:pRouterId + * 2. creats a physical interface in config api server + */ +function createPhysicalInterfaces (request, response, appData) +{ + var postData = request.body; + configApiServer.apiPost('/physical-interfaces', postData, appData, + function(error, data) { + getPhysicalInterfaces(request, response, appData); + }); +} + +/** + * @updatePhysicalInterfaces + * public function + * 1. URL /api/tenants/config/physical-interface/:pRouterId/:pInterfaceId + * 2. updates a physical interface in config api server + */ +function updatePhysicalInterfaces (request, response, appData) +{ + var pInterfaceId = validateQueryParam(request,'pInterfaceId'); + var postData = request.body; + configApiServer.apiPut('/physical-interface/' + pInterfaceId, postData, appData, + function(error, data) { + getPhysicalInterfaces(request, response, appData); + }); +} + +/** + * @deletePhysicalInterfaces + * public function + * 1. URL /api/tenants/config/physical-interface/:pRouterId/:pInterfaceId + * 2. deletes a physical interface in config api server + */ +function deletePhysicalInterfaces (request, response, appData) +{ + var pInterfaceId = validateQueryParam(request,'pInterfaceId'); + var postData = request.body; + configApiServer.apiDelete('/physical-interface/' + pInterfaceId, appData, + function(error, data) { + getPhysicalInterfaces(request, response, appData); + }); +} + +function validateQueryParam (request, key) +{ + var paramValue = null; + if (!(paramValue = request.param(key).toString())) { + error = new appErrors.RESTServerError('Add Virtual Router id'); + commonUtils.handleJSONResponse(error, response, null); + return; + } + return paramValue; +} + + /* List all public function here */ +exports.getPhysicalRouters = getPhysicalRouters; +exports.getPhysicalInterfaces = getPhysicalInterfaces; +exports.createPhysicalInterfaces = createPhysicalInterfaces; +exports.updatePhysicalInterfaces = updatePhysicalInterfaces; +exports.deletePhysicalInterfaces = deletePhysicalInterfaces; \ No newline at end of file diff --git a/webroot/config/physicaldevices/physicalinterfaces/ui/js/physicalinterfaces_config.js b/webroot/config/physicaldevices/physicalinterfaces/ui/js/physicalinterfaces_config.js new file mode 100644 index 000000000..fedf1c8a5 --- /dev/null +++ b/webroot/config/physicaldevices/physicalinterfaces/ui/js/physicalinterfaces_config.js @@ -0,0 +1,394 @@ +/* + * Copyright (c) 2014 Juniper Networks, Inc. All rights reserved. + */ + +physicalInterfacesConfigObj = new physicalInterfacesConfig(); +function physicalInterfacesConfig() { + //Variable Definations + var gridPhysicalInterfaces; + var currentUUID; + //Method Definations + this.load = load; + this.destroy = destroy; + + function load() { + var configTemplate = Handlebars.compile($("#physicalinterfaces-config-template").html()); + $(contentContainer).html(''); + $(contentContainer).html(configTemplate); + init(); + } + + function init() { + initComponents(); + initActions(); + fetchPhysicalRouters(); + } + + function initComponents() { + //initializing the virtual routers Grid + $("#gridPhysicalInterfaces").contrailGrid({ + header : { + title: { + text : 'Physical Interfaces', + //cssClass : 'blue', + //icon : 'icon-list', + //iconCssClass : 'blue' + }, + customControls: ['', + '', + 'Physical Routers:
',] + }, + columnHeader : { + columns : [ + { + id : 'name', + field : 'name', + name : 'Name' + }, + { + id : 'type', + field : 'type', + name : 'Type' + }, + { + id : 'parent', + field : 'parent', + name : 'Parent' + }, + { + id : 'vlan', + field : 'vlan', + name : 'VLAN' + }, + { + id : 'server', + field : 'server', + name : 'Server' + }] + + }, + body : { + options : { + checkboxSelectable: { + onNothingChecked: function(e){ + $('#btnDeletePhysicalInterface').addClass('disabled-link'); + }, + onSomethingChecked: function(e){ + $('#btnDeletePhysicalInterface').removeClass('disabled-link'); + } + }, + forceFitColumns: true, + actionCell: [ + { + title: 'Edit', + iconClass: 'icon-edit', + onClick: function(rowIndex){ + physicalInterfaceEditWindow(rowIndex); + } + }, + { + title: 'Delete', + iconClass: 'icon-trash', + onClick: function(rowIndex){ + showPhysicalInterfaceDelWindow(rowIndex); + } + } + ], + detail : { + template : $("#gridPhysicalInterfacesDetailTemplate").html() + } + }, + dataSource : { + data : [] + }, + statusMessages: { + loading: { + text: 'Loading Physical Interfaces..' + }, + empty: { + text: 'No Physical Interfaces.' + }, + errorGettingData: { + type: 'error', + iconClasses: 'icon-warning', + text: 'Error in getting Physical Interfaces.' + } + } + } + }); + gridPhysicalInterfaces = $("#gridPhysicalInterfaces").data('contrailGrid'); + + $('#ddPhysicalRouters').contrailDropdown({ + dataTextField:'text', + dataValueField:'value', + change:onPhysicalRouterSelChange + }); + + $('#ddType').contrailDropdown({ + dataTextField:'text', + dataValueField:'value', + }); + + var ddType = $('#ddType').data('contrailDropdown'); + ddType.setData([{text : 'Physical Interface', value : 'physical'},{text : 'Logical Interface', value : 'logical'}]); + ddType.value('physical') + + $('#ddParent').contrailDropdown({ + dataTextField:'text', + dataValueField:'value', + }); + + $('#ddVN').contrailDropdown({ + dataTextField:'text', + dataValueField:'value', + }); + + //initializing add record window + $('#addPhysicalInterfaceWindow').modal({backdrop:'static',keyboard:false,show:false}); + $('#addPhysicalInterfaceWindow').find(".modal-header-title").text('Add Physical Interface'); + + //initializing delete record window + $('#confirmMainDelete').modal({backdrop:'static',keyboard:false,show:false}); + $('#confirmMainDelete').find(".modal-header-title").text('Confirm'); + } + + function onPhysicalRouterSelChange(e) { + currentUUID = e.added.value; + fetchData(); + } + + function initActions() { + $('#btnCreatePhysicalInterface').click(function() { + populateCreateEditWindow('create'); + }); + + $('#btnAddPhysicalInterfaceOk').click(function() { + //if(validate()) { + $('#addPhysicalInterfaceWindow').modal('hide'); + createUpdatePhysicalInterface(); + //} + }); + $('#btnDeletePhysicalInterface').click(function(){ + $('#confirmMainDelete').modal('show'); + }); + $('#btnCnfDelMainPopupOK').click(function(args){ + var selected_rows = gridPhysicalInterfaces.getCheckedRows(); + $('#confirmMainDelete').modal("hide"); + deletePhysicalInterface(selected_rows); + }); + } + + window.showPhysicalInterfaceDelWindow = function(index) { + $.contrailBootstrapModal ( + { + id: 'confirmRemove', + title: 'Remove', + body: '
Confirm Removing record
', + footer: [ + { + title: 'Cancel', + onclick: 'close', + }, + { + id: 'btnRemovePopupOK', + title: 'Confirm', + onclick: function(){ + var selected_row = gridPhysicalInterfaces._dataView.getItem(index); + deletePhysicalInterface([selected_row]); + $('#confirmRemove').modal('hide'); + }, + className: 'btn-primary' + }] + }); + } + + function deletePhysicalInterface(selected_rows) { + $('#btnDeletePhysicalInterface').addClass('disabled-link'); + if(selected_rows && selected_rows.length > 0){ + var deleteAjaxs = []; + for(var i = 0;i < selected_rows.length;i++){ + var sel_row_data = selected_rows[i]; + deleteAjaxs[i] = $.ajax({ + url:'/api/tenants/config/physical-interface/' + currentUUID + '/' + sel_row_data['uuid'], + type:'DELETE' + }); + } + $.when.apply($,deleteAjaxs).then( + function(response){ + //all success + fetchData(); + }, + function(){ + //if at least one delete operation fails + var r = arguments; + showInfoWindow(r[0].responseText,r[2]); + fetchData(); + } + ); + } + } + + window.physicalInterfaceEditWindow = function(index) { + gblSelRow = gridPhysicalInterfaces._dataView.getItem(index); + populateCreateEditWindow('edit'); + } + + function populateCreateEditWindow(m) { + mode = m; + clearCreateEditWindow(); + if(mode === 'edit') { + $('#txtPhysicalInterfaceName').val(gblSelRow.name); + $('#txtPhysicalInterfaceName').attr('disabled','disabled'); + } + $('#addPhysicalInterfaceWindow').modal('show'); + } + + function createUpdatePhysicalInterface() { + var methodType = 'POST'; + var url = '/api/tenants/config/physical-interfaces/' + currentUUID; + if(mode === 'edit') { + methodType = 'PUT'; + url = '/api/tenants/config/physical-interface/' + currentUUID + '/' + gblSelRow.uuid + } + var type = $("#ddType").data('contrailDropdown').value(); + var name = $("#txtPhysicalInterfaceName").val(); + var parent = $("#ddParent").data('contrailDropdown').value(); + var pRouterDD = $('#ddPhysicalRouters').data('contrailDropdown') + var postObject = {}; + + gridPhysicalInterfaces._dataView.setData([]); + gridPhysicalInterfaces.showGridMessage('loading'); + + postObject["physical-interface"] = {}; + postObject["physical-interface"]["fq_name"] = ["default-global-system-config", pRouterDD.text(), name]; + postObject["physical-interface"]["parent_type"] = "physical-router"; + postObject["physical-interface"]["name"] = name; + doAjaxCall(url, methodType, JSON.stringify(postObject), 'successHandlerForPhysicalInterfaces', 'failureHandlerForPhysicalInterfaces', null, null); + } + + function clearCreateEditWindow() { + $('#ddType').data('contrailDropdown').value('physical'); + $('#txtPhysicalInterfaceName').removeAttr('disabled'); + $('#txtPhysicalInterfaceName').val(''); + var ddPhysicalRouters = $('#ddPhysicalRouters').data('contrailDropdown'); + $('#ddParent').data('contrailDropdown').value(ddPhysicalRouters.text()); + } + + function fetchPhysicalRouters() { + //reading uuid from query string + var queryParams = window.location.href.split("&"); + if(queryParams != undefined && queryParams.length > 1 && queryParams[1].indexOf('=') != -1) { + currentUUID = queryParams[1].split('=')[1]; + } + doAjaxCall('/api/tenants/config/physical-router-details','GET', null, 'successHandlerForPhysicalRouters', 'failureHandlerForPhysicalRouters', null, null); + } + window.successHandlerForPhysicalRouters = function(result) { + var pRoutersDS = []; + if(result && result['physical-routers'].length > 0) { + var physicalRouters = result['physical-routers']; + for(var i = 0; i < physicalRouters.length;i++) { + var physicalRouter = physicalRouters[i]; + pRoutersDS.push({text : physicalRouter.fq_name[1], value : physicalRouter.uuid}); + } + + } else { + pRoutersDS.push({text : 'No Physical Router found', value: 'Message'}); + } + var pRouterDD = $('#ddPhysicalRouters').data('contrailDropdown'); + pRouterDD.setData(pRoutersDS); + if(currentUUID) { + pRouterDD.value(currentUUID); + } else { + pRouterDD.value(pRoutersDS[0].value) + currentUUID = pRouterDD.value(); + } + fetchData(); + } + window.failureHandlerForPhysicalRouters = function(error) { + gridPhysicalInterfaces.showGridMessage('errorGettingData'); + } + + function fetchData() { + gridPhysicalInterfaces._dataView.setData([]); + gridPhysicalInterfaces.showGridMessage('loading'); + doAjaxCall('/api/tenants/config/physical-interfaces/' + currentUUID,'GET', null, 'successHandlerForPhysicalInterfaces', 'failureHandlerForPhysicalInterfaces', null, null); + } + + window.successHandlerForPhysicalInterfaces = function(result) { + if(result && result.length > 0) { + var gridDS = []; + var pInterfaces = result; + for(var i = 0; i < pInterfaces.length;i++) { + var pInterface = pInterfaces[i]['physical-interface']; + var lInterfaces = pInterfaces[i]['physical-interface'] ? pInterfaces[i]['physical-interface']['logical_interfaces'] : null; + var lInterfaceNames = ''; + if(lInterfaces != null && lInterfaces.length > 0) { + for(var j = 0; j < lInterfaces.length; j++) { + var lInterfaceName = lInterfaces[j].to[3]; + if(lInterfaceNames === ''){ + lInterfaceNames = lInterfaceName; + } else { + lInterfaceNames+= ',' + lInterfaceName; + } + } + } + gridDS.push({ + uuid : pInterface.uuid, + name : pInterface.name, + type : '-', + parent : pInterface.parent_type, + vlan : '-', + server : '-', + lInterfaces :lInterfaceNames + }); + } + var ddParentDS = []; + var pRouterDD = $('#ddPhysicalRouters').data('contrailDropdown'); + ddParentDS.push({text : pRouterDD.text(), value : pRouterDD.text()}); + for(var i = 0; i < gridDS.length; i++) { + ddParentDS.push({text : gridDS[i].name, value : gridDS[i].name}); + } + + //set parent drop down data here + var ddParent = $('#ddParent').data('contrailDropdown'); + ddParent.setData(ddParentDS); + ddParent.value(ddParentDS[0].value); + + } else { + gridPhysicalInterfaces.showGridMessage("empty"); + } + gridPhysicalInterfaces._dataView.setData(gridDS); + } + + window.failureHandlerForPhysicalInterfaces = function(error) { + gridPhysicalInterfaces.showGridMessage("errorGettingData"); + } + + function validate() { + var name = $('#txtPhysicalInterfaceName').val().trim(); + if(name === ""){ + showInfoWindow("Enter a Physical Interface Name","Input required"); + return false; + } + var ipAddress = $('#txtIPAddress').val().trim(); + if(!validateIPAddress(ipAddress)){ + showInfoWindow("Enter a valid IP address in xxx.xxx.xxx.xxx format","Input required"); + return false; + } + return true; + } + + function destroy() { + var configTemplate = $("#physicalinterfaces-config-template"); + if(isSet(configTemplate)) { + configTemplate.remove(); + configTemplate = $(); + } + var configDetailTemplate = $("#gridPhysicalInterfacesDetailTemplate"); + if(isSet(configDetailTemplate)) { + configDetailTemplate.remove(); + configDetailTemplate = $(); + } + } + + } \ No newline at end of file diff --git a/webroot/config/physicaldevices/physicalinterfaces/ui/views/physicalinterfaces_config.view b/webroot/config/physicaldevices/physicalinterfaces/ui/views/physicalinterfaces_config.view new file mode 100644 index 000000000..3cbea52e1 --- /dev/null +++ b/webroot/config/physicaldevices/physicalinterfaces/ui/views/physicalinterfaces_config.view @@ -0,0 +1,128 @@ + + \ No newline at end of file diff --git a/webroot/config/physicaldevices/physicalrouters/ui/js/physicalrouters_config.js b/webroot/config/physicaldevices/physicalrouters/ui/js/physicalrouters_config.js index 18dcfbfbb..d271454f1 100644 --- a/webroot/config/physicaldevices/physicalrouters/ui/js/physicalrouters_config.js +++ b/webroot/config/physicaldevices/physicalrouters/ui/js/physicalrouters_config.js @@ -49,15 +49,16 @@ function physicalRoutersConfig() { field : 'ip_address', name : 'IP Address' }, - { - id : 'uuid', - field : 'uuid', - name : 'UUID' - }, { id : 'interfaces', field : 'interfaces', - name : 'Interfaces' + name : 'Interfaces', + cssClass :'cell-hyperlink-blue', + events : { + onClick : function(e, dc) { + layoutHandler.setURLHashParams({uuid : dc.uuid} ,{p : 'config_pd_physicalInterfaces' ,merge : false ,triggerHashChange : true}); + } + } }] }, body : { @@ -303,7 +304,7 @@ function physicalRoutersConfig() { gridDS.push({ uuid : rowData.uuid, name : rowData.name, - ip_address : rowData.physical_router_ip_address, + ip_address : rowData.physical_router_ip_address ? rowData.physical_router_ip_address : '-', interfaces : interfaces.length }); } diff --git a/webroot/menu.xml b/webroot/menu.xml index 0d8c9ffac..406ecbe8f 100644 --- a/webroot/menu.xml +++ b/webroot/menu.xml @@ -555,9 +555,9 @@ and need to add the iconClass tag wherever we need to show some icons config_pd_physicalInterfaces - /config/physicaldevices/ui - physicalInterfaces_config.js - physicalInterfaces_config.view + /config/physicaldevices/physicalinterfaces/ui + physicalinterfaces_config.js + physicalinterfaces_config.view physicalInterfacesConfigObj From 8f20d621849a74a8a1f22d3605d89ae970740b9f Mon Sep 17 00:00:00 2001 From: Siva Bavanasi Date: Mon, 13 Oct 2014 11:21:16 +0530 Subject: [PATCH 05/25] Added nodejs code for logical interface creation Change-Id: I6bcdaa113c5686949d6ff0491c12f77ffbe13c2e --- .../physicalinterfaces/api/parseURL.xml | 6 +- .../api/physicalinterfacesconfig.api.js | 78 +++++++-- .../ui/js/physicalinterfaces_config.js | 97 ++++++++--- .../ui/views/physicalinterfaces_config.view | 84 +++------ .../ui/js/virtualrouters_config.js | 8 +- webroot/menu.xml | 160 +++++++++--------- 6 files changed, 247 insertions(+), 186 deletions(-) diff --git a/webroot/config/physicaldevices/physicalinterfaces/api/parseURL.xml b/webroot/config/physicaldevices/physicalinterfaces/api/parseURL.xml index f0a83a3a3..0b74af214 100644 --- a/webroot/config/physicaldevices/physicalinterfaces/api/parseURL.xml +++ b/webroot/config/physicaldevices/physicalinterfaces/api/parseURL.xml @@ -35,19 +35,19 @@ physicalinterfacesconfigapi.getPhysicalInterfaces - /api/tenants/config/physical-interfaces/:pRouterId + /api/tenants/config/physical-interfaces/:pRouterId/:infType post physicalinterfacesconfig physicalinterfacesconfigapi.createPhysicalInterfaces - /api/tenants/config/physical-interface/:pRouterId/:pInterfaceId + /api/tenants/config/physical-interface/:pRouterId/:infType/:pInterfaceId put physicalinterfacesconfig physicalinterfacesconfigapi.updatePhysicalInterfaces - /api/tenants/config/physical-interface/:pRouterId/:pInterfaceId + /api/tenants/config/physical-interface/:pRouterId/:infType/:pInterfaceId delete physicalinterfacesconfig physicalinterfacesconfigapi.deletePhysicalInterfaces diff --git a/webroot/config/physicaldevices/physicalinterfaces/api/physicalinterfacesconfig.api.js b/webroot/config/physicaldevices/physicalinterfaces/api/physicalinterfacesconfig.api.js index a2891638f..f5f6ddfa7 100644 --- a/webroot/config/physicaldevices/physicalinterfaces/api/physicalinterfacesconfig.api.js +++ b/webroot/config/physicaldevices/physicalinterfaces/api/physicalinterfacesconfig.api.js @@ -87,8 +87,50 @@ function getPhysicalInterfacesDetails(error, data, response, appData) if (error) { commonUtils.handleJSONResponse(error, response, null); return; - } - commonUtils.handleJSONResponse(error, response, results); + } + if(results.length > 0) { + var lInfDataObjArr = []; + for(var i = 0; i < results.length; i++) { + var pInterface = results[i]['physical-interface']; + console.log("LI-Details:",JSON.stringify(pInterface)); + if(pInterface['logical_interfaces'] && pInterface['logical_interfaces'].length > 0) { + var lInterfaces = pInterface['logical_interfaces'] + for(var j = 0; j < lInterfaces.length; j++) { + var lInfReqUrl = null; + var lInterface = lInterfaces[j]; + lInfReqUrl = '/logical-interface/' + lInterface['uuid']; + commonUtils.createReqObj(lInfDataObjArr, lInfReqUrl, global.HTTP_REQUEST_GET, + null, null, null, appData); + } + + } + } + async.map(lInfDataObjArr, + commonUtils.getAPIServerResponse(configApiServer.apiGet, false), + function(err,lInfDetails){ + if (error) { + commonUtils.handleJSONResponse(error, response, null); + return; + } + //map logical interfaces to corresponding physical interface + if(lInfDetails.length > 0) { + for(var i = 0; i < results.length; i++) { + var pInterface = results[i]['physical-interface']; + pInterface['logical_interfaces'] = []; + for(var j = 0; j < lInfDetails.length; j++) { + var lInterface = lInfDetails[j]['logical-interface']; + if(pInterface['uuid'] === lInterface['parent_uuid']) { + pInterface['logical_interfaces'].push(lInfDetails[j]); + } + } + } + } + commonUtils.handleJSONResponse(error, response, results); + } + ) + } else { + commonUtils.handleJSONResponse(error, response, null); + } } ) } else { @@ -99,13 +141,14 @@ function getPhysicalInterfacesDetails(error, data, response, appData) /** * @createPhysicalInterfaces * public function - * 1. URL /api/tenants/config/physical-interfaces/:pRouterId + * 1. URL /api/tenants/config/physical-interfaces/:pRouterId/:infType * 2. creats a physical interface in config api server */ function createPhysicalInterfaces (request, response, appData) { var postData = request.body; - configApiServer.apiPost('/physical-interfaces', postData, appData, + var url = getInterfaceUrl(request, 'create'); + configApiServer.apiPost(url, postData, appData, function(error, data) { getPhysicalInterfaces(request, response, appData); }); @@ -114,14 +157,15 @@ function createPhysicalInterfaces (request, response, appData) /** * @updatePhysicalInterfaces * public function - * 1. URL /api/tenants/config/physical-interface/:pRouterId/:pInterfaceId + * 1. URL /api/tenants/config/physical-interface/:pRouterId/:infType/:pInterfaceId * 2. updates a physical interface in config api server */ function updatePhysicalInterfaces (request, response, appData) { - var pInterfaceId = validateQueryParam(request,'pInterfaceId'); + var pInterfaceId = validateQueryParam(request,'pInterfaceId'); + var url = getInterfaceUrl(request); var postData = request.body; - configApiServer.apiPut('/physical-interface/' + pInterfaceId, postData, appData, + configApiServer.apiPut(url + pInterfaceId, postData, appData, function(error, data) { getPhysicalInterfaces(request, response, appData); }); @@ -130,14 +174,15 @@ function updatePhysicalInterfaces (request, response, appData) /** * @deletePhysicalInterfaces * public function - * 1. URL /api/tenants/config/physical-interface/:pRouterId/:pInterfaceId + * 1. URL /api/tenants/config/physical-interface/:pRouterId/:infType/:pInterfaceId * 2. deletes a physical interface in config api server */ function deletePhysicalInterfaces (request, response, appData) { - var pInterfaceId = validateQueryParam(request,'pInterfaceId'); + var pInterfaceId = validateQueryParam(request,'pInterfaceId'); + var url = getInterfaceUrl(request); var postData = request.body; - configApiServer.apiDelete('/physical-interface/' + pInterfaceId, appData, + configApiServer.apiDelete(url + pInterfaceId, appData, function(error, data) { getPhysicalInterfaces(request, response, appData); }); @@ -152,6 +197,17 @@ function validateQueryParam (request, key) return; } return paramValue; +} + +function getInterfaceUrl(request, operation) { + var infUrl = ''; + var infType = validateQueryParam(request, 'infType'); + if(infType === 'Physical') { + infUrl = operation === 'create' ? '/physical-interfaces' : '/physical-interface/'; + } else if(infType === 'Logical') { + infUrl = operation === 'create' ? '/logical-interfaces' : '/logical-interface/'; + } + return infUrl; } /* List all public function here */ @@ -159,4 +215,4 @@ exports.getPhysicalRouters = getPhysicalRouters; exports.getPhysicalInterfaces = getPhysicalInterfaces; exports.createPhysicalInterfaces = createPhysicalInterfaces; exports.updatePhysicalInterfaces = updatePhysicalInterfaces; -exports.deletePhysicalInterfaces = deletePhysicalInterfaces; \ No newline at end of file +exports.deletePhysicalInterfaces = deletePhysicalInterfaces; \ No newline at end of file diff --git a/webroot/config/physicaldevices/physicalinterfaces/ui/js/physicalinterfaces_config.js b/webroot/config/physicaldevices/physicalinterfaces/ui/js/physicalinterfaces_config.js index fedf1c8a5..feaa5413e 100644 --- a/webroot/config/physicaldevices/physicalinterfaces/ui/js/physicalinterfaces_config.js +++ b/webroot/config/physicaldevices/physicalinterfaces/ui/js/physicalinterfaces_config.js @@ -127,10 +127,11 @@ function physicalInterfacesConfig() { $('#ddType').contrailDropdown({ dataTextField:'text', dataValueField:'value', + change:onTypeSelChange }); var ddType = $('#ddType').data('contrailDropdown'); - ddType.setData([{text : 'Physical Interface', value : 'physical'},{text : 'Logical Interface', value : 'logical'}]); + ddType.setData([{text : 'Physical', value : 'physical'},{text : 'Logical', value : 'logical'}]); ddType.value('physical') $('#ddParent').contrailDropdown({ @@ -138,7 +139,7 @@ function physicalInterfacesConfig() { dataValueField:'value', }); - $('#ddVN').contrailDropdown({ + $('#ddVMI').contrailDropdown({ dataTextField:'text', dataValueField:'value', }); @@ -157,6 +158,15 @@ function physicalInterfacesConfig() { fetchData(); } + function onTypeSelChange(e) { + var inf = e.added.value; + if(inf === "logical") { + $('#vmSection').removeClass('hide').addClass('show'); + } else { + $('#vmSection').removeClass('show').addClass('hide'); + } + } + function initActions() { $('#btnCreatePhysicalInterface').click(function() { populateCreateEditWindow('create'); @@ -209,7 +219,7 @@ function physicalInterfacesConfig() { for(var i = 0;i < selected_rows.length;i++){ var sel_row_data = selected_rows[i]; deleteAjaxs[i] = $.ajax({ - url:'/api/tenants/config/physical-interface/' + currentUUID + '/' + sel_row_data['uuid'], + url:'/api/tenants/config/physical-interface/' + currentUUID + '/' + sel_row_data['type'] + '/' + sel_row_data['uuid'], type:'DELETE' }); } @@ -245,10 +255,11 @@ function physicalInterfacesConfig() { function createUpdatePhysicalInterface() { var methodType = 'POST'; - var url = '/api/tenants/config/physical-interfaces/' + currentUUID; + var infType = $('#ddType').data('contrailDropdown').text(); + var url = '/api/tenants/config/physical-interfaces/' + currentUUID + '/' + infType; if(mode === 'edit') { methodType = 'PUT'; - url = '/api/tenants/config/physical-interface/' + currentUUID + '/' + gblSelRow.uuid + url = '/api/tenants/config/physical-interface/' + currentUUID + '/' + gblSelRow.type + '/' + gblSelRow.uuid } var type = $("#ddType").data('contrailDropdown').value(); var name = $("#txtPhysicalInterfaceName").val(); @@ -258,11 +269,19 @@ function physicalInterfacesConfig() { gridPhysicalInterfaces._dataView.setData([]); gridPhysicalInterfaces.showGridMessage('loading'); - - postObject["physical-interface"] = {}; - postObject["physical-interface"]["fq_name"] = ["default-global-system-config", pRouterDD.text(), name]; - postObject["physical-interface"]["parent_type"] = "physical-router"; - postObject["physical-interface"]["name"] = name; + if(infType === 'Physical') { + postObject["physical-interface"] = {}; + postObject["physical-interface"]["fq_name"] = ["default-global-system-config", pRouterDD.text(), name]; + postObject["physical-interface"]["parent_type"] = "physical-router"; + postObject["physical-interface"]["name"] = name; + } else { + var parent = $('#ddParent').data('contrailDropdown'); + postObject["logical-interface"] = {}; + postObject["logical-interface"]["fq_name"] = ["default-global-system-config", pRouterDD.text(), parent.text() , name]; + postObject["logical-interface"]["parent_type"] = "physical-interface"; + postObject["logical-interface"]["parent_uuid"] = parent.value(); + postObject["logical-interface"]["name"] = name; + } doAjaxCall(url, methodType, JSON.stringify(postObject), 'successHandlerForPhysicalInterfaces', 'failureHandlerForPhysicalInterfaces', null, null); } @@ -271,7 +290,8 @@ function physicalInterfacesConfig() { $('#txtPhysicalInterfaceName').removeAttr('disabled'); $('#txtPhysicalInterfaceName').val(''); var ddPhysicalRouters = $('#ddPhysicalRouters').data('contrailDropdown'); - $('#ddParent').data('contrailDropdown').value(ddPhysicalRouters.text()); + $('#ddParent').data('contrailDropdown').value(ddPhysicalRouters.value()); + $('#vmSection').removeClass('show').addClass('hide'); } function fetchPhysicalRouters() { @@ -315,38 +335,54 @@ function physicalInterfacesConfig() { } window.successHandlerForPhysicalInterfaces = function(result) { + var gridDS = []; if(result && result.length > 0) { - var gridDS = []; var pInterfaces = result; for(var i = 0; i < pInterfaces.length;i++) { var pInterface = pInterfaces[i]['physical-interface']; + gridDS.push({ + uuid : pInterface.uuid, + name : pInterface.name, + type : "Physical", + parent : pInterface.fq_name[1], + vlan : '-', + server : '-' + }); var lInterfaces = pInterfaces[i]['physical-interface'] ? pInterfaces[i]['physical-interface']['logical_interfaces'] : null; var lInterfaceNames = ''; + var infDS = []; if(lInterfaces != null && lInterfaces.length > 0) { for(var j = 0; j < lInterfaces.length; j++) { - var lInterfaceName = lInterfaces[j].to[3]; + var lInterface = lInterfaces[j]['logical-interface']; + var lInterfaceName = lInterface.fq_name[3]; if(lInterfaceNames === ''){ lInterfaceNames = lInterfaceName; } else { - lInterfaceNames+= ',' + lInterfaceName; + lInterfaceNames += ',' + lInterfaceName; } - } + infDS.push({ + uuid : lInterface.uuid, + name : lInterface.name, + type : "Logical", + parent : lInterface.fq_name[2], + vlan : '-', + server : '-', + }); + } + var currPhysicalInfRow = getCurrentPhysicalInfRow(gridDS, pInterface.uuid); + if(currPhysicalInfRow != '') { + currPhysicalInfRow['lInterfaces'] = lInterfaceNames; + } + gridDS = gridDS.concat(infDS); } - gridDS.push({ - uuid : pInterface.uuid, - name : pInterface.name, - type : '-', - parent : pInterface.parent_type, - vlan : '-', - server : '-', - lInterfaces :lInterfaceNames - }); } var ddParentDS = []; var pRouterDD = $('#ddPhysicalRouters').data('contrailDropdown'); - ddParentDS.push({text : pRouterDD.text(), value : pRouterDD.text()}); + ddParentDS.push({text : pRouterDD.text(), value : pRouterDD.value()}); for(var i = 0; i < gridDS.length; i++) { - ddParentDS.push({text : gridDS[i].name, value : gridDS[i].name}); + if(gridDS[i].type === 'Physical') { + ddParentDS.push({text : gridDS[i].name, value : gridDS[i].uuid}); + } } //set parent drop down data here @@ -360,6 +396,15 @@ function physicalInterfacesConfig() { gridPhysicalInterfaces._dataView.setData(gridDS); } + function getCurrentPhysicalInfRow(dataSrc,id) { + for(var i = 0; i < dataSrc.length; i++) { + if(dataSrc[i].uuid === id) { + return dataSrc[i]; + } + } + return ''; + } + window.failureHandlerForPhysicalInterfaces = function(error) { gridPhysicalInterfaces.showGridMessage("errorGettingData"); } diff --git a/webroot/config/physicaldevices/physicalinterfaces/ui/views/physicalinterfaces_config.view b/webroot/config/physicaldevices/physicalinterfaces/ui/views/physicalinterfaces_config.view index 3cbea52e1..04df5e8f0 100644 --- a/webroot/config/physicaldevices/physicalinterfaces/ui/views/physicalinterfaces_config.view +++ b/webroot/config/physicaldevices/physicalinterfaces/ui/views/physicalinterfaces_config.view @@ -9,7 +9,7 @@
{{parent}}
-
+
{{lInterfaces}}
@@ -29,33 +29,22 @@
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- +
+ + + +
+
+ +
+ +
+ +
+ +
+
+
@@ -63,46 +52,15 @@
- +
- +
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
- +
+
diff --git a/webroot/config/physicaldevices/virtualrouters/ui/js/virtualrouters_config.js b/webroot/config/physicaldevices/virtualrouters/ui/js/virtualrouters_config.js index 2e02aca93..20f02148d 100644 --- a/webroot/config/physicaldevices/virtualrouters/ui/js/virtualrouters_config.js +++ b/webroot/config/physicaldevices/virtualrouters/ui/js/virtualrouters_config.js @@ -118,8 +118,8 @@ function virtualRoutersConfig() { var msType = $('#msType').data('contrailMultiselect'); var msTypeDS = [{ text : 'Embedded', value : 'embedded'}, - { text : 'TOR Agent', value : 'tor_agent'}, - { text : 'TOR Service Node ', value : 'tsn'}, + { text : 'TOR Agent', value : 'tor-agent'}, + { text : 'TOR Service Node ', value : 'tor-service-node'}, { text : 'Hypervisor', value : 'hypervisor'}] msType.setData(msTypeDS); @@ -238,7 +238,7 @@ function virtualRoutersConfig() { postObject["virtual-router"]["parent_type"] = "global-system-config"; postObject["virtual-router"]["name"] = name; postObject["virtual-router"]["virtual_router_ip_address"] = ipAddress; - postObject["virtual-router"]["type"] = type; + postObject["virtual-router"]["virtual_router_type"] = type[0]; doAjaxCall(url, methodType, JSON.stringify(postObject), 'successHandlerForVirtualRouters', 'failureHandlerForVirtualRouters', null, null); } @@ -265,7 +265,7 @@ function virtualRoutersConfig() { uuid : rowData.uuid, name : rowData.name, ip_address : rowData.virtual_router_ip_address, - type : '-' + type : rowData.virtual_router_type ? rowData.virtual_router_type : 'Hypervisor' }); } diff --git a/webroot/menu.xml b/webroot/menu.xml index 406ecbe8f..d351d9105 100644 --- a/webroot/menu.xml +++ b/webroot/menu.xml @@ -320,6 +320,19 @@ and need to add the iconClass tag wherever we need to show some icons Configure Link Local Services + + + config_pd_virtualRouters + + + /config/physicaldevices/virtualrouters/ui + virtualrouters_config.js + virtualrouters_config.view + virtualRoutersConfigObj + + + Configure Virtual Routers + + + + + + member + + + openstack + + + icon-globe + + + + + config_pd_physicalRouters + + + /config/physicaldevices/physicalrouters/ui + physicalrouters_config.js + physicalrouters_config.view + physicalRoutersConfigObj + + + Configure Physical Routers + + + + config_pd_physicalInterfaces + + + /config/physicaldevices/physicalinterfaces/ui + physicalinterfaces_config.js + physicalinterfaces_config.view + physicalInterfacesConfigObj + + + Configure Physical Interfaces + + + + config_pd_serviceAppliances + + + /config/physicaldevices/ui + serviceAppliances_config.js + serviceAppliances_config.view + serviceAppliancesConfigObj + + + Configure Service Appliances + + + + config_pd_baremetalServers + + + /config/physicaldevices/ui + baremetalServers_config.js + baremetalServers_config.view + baremetalServersConfigObj + + + Configure Baremetal Servers + + + @@ -512,85 +592,7 @@ and need to add the iconClass tag wherever we need to show some icons - - - - - member - - - openstack - - - icon-globe - - - - config_pd_virtualRouters - - - /config/physicaldevices/virtualrouters/ui - virtualrouters_config.js - virtualrouters_config.view - virtualRoutersConfigObj - - - Configure Virtual Routers - - - - config_pd_physicalRouters - - - /config/physicaldevices/physicalrouters/ui - physicalrouters_config.js - physicalrouters_config.view - physicalRoutersConfigObj - - - Configure Physical Routers - - - - config_pd_physicalInterfaces - - - /config/physicaldevices/physicalinterfaces/ui - physicalinterfaces_config.js - physicalinterfaces_config.view - physicalInterfacesConfigObj - - - Configure Physical Interfaces - - - - config_pd_serviceAppliances - - - /config/physicaldevices/ui - serviceAppliances_config.js - serviceAppliances_config.view - serviceAppliancesConfigObj - - - Configure Service Appliances - - - - config_pd_baremetalServers - - - /config/physicaldevices/ui - baremetalServers_config.js - baremetalServers_config.view - baremetalServersConfigObj - - - Configure Baremetal Servers - - - + -
-
- -
-
- -
+
+ +
+
+ + +
+
+ + +
--> +
+
+
+
+
+

+ + Logical Interface Options +

+
+ +
+
+
+
+
diff --git a/webroot/config/physicaldevices/virtualrouters/api/virtualroutersconfig.api.js b/webroot/config/physicaldevices/virtualrouters/api/virtualroutersconfig.api.js index 102ae0432..b5eb75dce 100644 --- a/webroot/config/physicaldevices/virtualrouters/api/virtualroutersconfig.api.js +++ b/webroot/config/physicaldevices/virtualrouters/api/virtualroutersconfig.api.js @@ -82,6 +82,10 @@ function createVirtualRouters (request, response, appData) var postData = request.body; configApiServer.apiPost('/virtual-routers', postData, appData, function(error, data) { + if(error) { + commonUtils.handleJSONResponse(error, response, null); + return; + } getVirtualRouters(request, response, appData); }); } @@ -98,6 +102,10 @@ function updateVirtualRouters (request, response, appData) var postData = request.body; configApiServer.apiPut('/virtual-router/' + vRouterID, postData, appData, function(error, data) { + if(error) { + commonUtils.handleJSONResponse(error, response, null); + return; + } getVirtualRouters(request, response, appData); }); } @@ -114,6 +122,10 @@ function deleteVirtualRouters (request, response, appData) var postData = request.body; configApiServer.apiDelete('/virtual-router/' + vRouterID, appData, function(error, data) { + if(error) { + commonUtils.handleJSONResponse(error, response, null); + return; + } getVirtualRouters(request, response, appData); }); } diff --git a/webroot/config/physicaldevices/virtualrouters/ui/js/virtualrouters_config.js b/webroot/config/physicaldevices/virtualrouters/ui/js/virtualrouters_config.js index 20f02148d..9e7a51a28 100644 --- a/webroot/config/physicaldevices/virtualrouters/ui/js/virtualrouters_config.js +++ b/webroot/config/physicaldevices/virtualrouters/ui/js/virtualrouters_config.js @@ -52,7 +52,10 @@ function virtualRoutersConfig() { { id : 'type', field : 'type', - name : 'Type' + name : 'Type', + formatter: function(r, c, v, cd, dc) { + return formatVirtualRouterType(dc.type); + } }] }, body : { @@ -119,13 +122,9 @@ function virtualRoutersConfig() { var msType = $('#msType').data('contrailMultiselect'); var msTypeDS = [{ text : 'Embedded', value : 'embedded'}, { text : 'TOR Agent', value : 'tor-agent'}, - { text : 'TOR Service Node ', value : 'tor-service-node'}, - { text : 'Hypervisor', value : 'hypervisor'}] + { text : 'TOR Service Node', value : 'tor-service-node'}, + ]; msType.setData(msTypeDS); - - //initializing delete record window - //deleteRecordWindowObj.modal({backdrop:'static',keyboard:false,show:false}); - //deleteRecordWindowObj.find(".modal-header-title").text('Confirm'); $('#confirmMainDelete').modal({backdrop:'static',keyboard:false,show:false}); $('#confirmMainDelete').find(".modal-header-title").text('Confirm'); @@ -203,6 +202,7 @@ function virtualRoutersConfig() { } window.virtualRouterEditWindow = function(index) { + $('#addVirtualRouterWindow').find(".modal-header-title").text('Edit Virtual Router'); gblSelRow = gridVirtualRouters._dataView.getItem(index); populateCreateEditWindow('edit'); } @@ -214,6 +214,7 @@ function virtualRoutersConfig() { $('#txtVirtualRouterName').val(gblSelRow.name); $('#txtVirtualRouterName').attr('disabled','disabled'); $('#txtIPAddress').val(gblSelRow.ip_address); + $('#msType').data('contrailMultiselect').value(gblSelRow.actualType); } $('#addVirtualRouterWindow').modal('show'); } @@ -238,7 +239,7 @@ function virtualRoutersConfig() { postObject["virtual-router"]["parent_type"] = "global-system-config"; postObject["virtual-router"]["name"] = name; postObject["virtual-router"]["virtual_router_ip_address"] = ipAddress; - postObject["virtual-router"]["virtual_router_type"] = type[0]; + postObject["virtual-router"]["virtual_router_type"] = type; doAjaxCall(url, methodType, JSON.stringify(postObject), 'successHandlerForVirtualRouters', 'failureHandlerForVirtualRouters', null, null); } @@ -261,11 +262,21 @@ function virtualRoutersConfig() { var gridDS = []; for(var i = 0; i < result.length;i++) { var rowData = result[i]['virtual-router']; + var pRouters = []; + var pRouterBackRefs = rowData['physical_router_back_refs']; + if(pRouterBackRefs != null && pRouterBackRefs.length > 0) { + var pRouterBackRefsLen = pRouterBackRefs.length; + for(var j = 0; j < pRouterBackRefsLen; j++) { + pRouters.push(pRouterBackRefs[j].to[1]); + } + } gridDS.push({ uuid : rowData.uuid, name : rowData.name, ip_address : rowData.virtual_router_ip_address, - type : rowData.virtual_router_type ? rowData.virtual_router_type : 'Hypervisor' + actualType : rowData.virtual_router_type != null ? rowData.virtual_router_type : '', + type : rowData.virtual_router_type != null ? rowData.virtual_router_type : ['embedded'], + physical_routers : pRouters.length > 0 ? pRouters : '-' }); } diff --git a/webroot/config/physicaldevices/virtualrouters/ui/views/virtualrouters_config.view b/webroot/config/physicaldevices/virtualrouters/ui/views/virtualrouters_config.view index 3b57e490e..945b065a9 100644 --- a/webroot/config/physicaldevices/virtualrouters/ui/views/virtualrouters_config.view +++ b/webroot/config/physicaldevices/virtualrouters/ui/views/virtualrouters_config.view @@ -11,8 +11,12 @@
-
{{type}}
+
{{{formatVirtualRouterType type}}}
+
+
+
{{physical_routers}}
+
diff --git a/webroot/menu.xml b/webroot/menu.xml index d351d9105..321fdf6e2 100644 --- a/webroot/menu.xml +++ b/webroot/menu.xml @@ -367,7 +367,7 @@ and need to add the iconClass tag wherever we need to show some icons Configure Physical Routers - + config_pd_physicalInterfaces @@ -377,7 +377,7 @@ and need to add the iconClass tag wherever we need to show some icons physicalInterfacesConfigObj - Configure Physical Interfaces + Configure Interfaces From 1b4c089e288f68eb3b9f017a977ae51a0724ba21 Mon Sep 17 00:00:00 2001 From: Siva Bavanasi Date: Tue, 14 Oct 2014 19:11:25 +0530 Subject: [PATCH 07/25] Added configuration entry for physical/logical interface delimiters and done respective changes Change-Id: Ic5fafb635e225f1e17e374e488606e84f2de743d --- .../physicalinterfaces/api/parseURL.xml | 6 +- .../api/physicalinterfacesconfig.api.js | 94 ++++++++++++++----- .../ui/js/physicalinterfaces_config.js | 73 +++++++++++--- .../ui/views/physicalinterfaces_config.view | 16 +--- .../ui/js/virtualrouters_config.js | 6 ++ .../ui/views/virtualrouters_config.view | 2 +- 6 files changed, 141 insertions(+), 56 deletions(-) diff --git a/webroot/config/physicaldevices/physicalinterfaces/api/parseURL.xml b/webroot/config/physicaldevices/physicalinterfaces/api/parseURL.xml index a052b62ad..ddb6d2924 100644 --- a/webroot/config/physicaldevices/physicalinterfaces/api/parseURL.xml +++ b/webroot/config/physicaldevices/physicalinterfaces/api/parseURL.xml @@ -53,9 +53,9 @@ physicalinterfacesconfigapi.deletePhysicalInterfaces - /api/tenants/config/virtual-machine-interface-details/:id + /api/tenants/config/virtual-network-internals/:id get physicalinterfacesconfig - physicalinterfacesconfigapi.getVirtualMachineInterfaceDetails - + physicalinterfacesconfigapi.getVirtualNetworkInternals + \ No newline at end of file diff --git a/webroot/config/physicaldevices/physicalinterfaces/api/physicalinterfacesconfig.api.js b/webroot/config/physicaldevices/physicalinterfaces/api/physicalinterfacesconfig.api.js index 456ac2eca..ac8104d61 100644 --- a/webroot/config/physicaldevices/physicalinterfaces/api/physicalinterfacesconfig.api.js +++ b/webroot/config/physicaldevices/physicalinterfaces/api/physicalinterfacesconfig.api.js @@ -122,22 +122,68 @@ function getPhysicalInterfacesDetails(error, data, response, appData) commonUtils.handleJSONResponse(error, response, null); return; } - //map logical interfaces to corresponding physical interface if(lInfDetails.length > 0) { - for(var i = 0; i < results.length; i++) { - var pInterface = results[i]['physical-interface']; - if(pInterface != null) { - pInterface['logical_interfaces'] = []; - for(var j = 0; j < lInfDetails.length; j++) { - var lInterface = lInfDetails[j]['logical-interface']; - if(pInterface['uuid'] === lInterface['parent_uuid']) { - pInterface['logical_interfaces'].push(lInfDetails[j]); + var vmiList = []; + for(var j = 0; j < lInfDetails.length; j++) { + var lInterface = lInfDetails[j]['logical-interface']; + if('virtual_machine_interface_refs' in lInterface) { + vmiList.push({li_uuid : lInterface.uuid, uuid : lInterface['virtual_machine_interface_refs'][0].uuid}); + } + } + if(vmiList.length > 0) { + processVirtualMachineInterfaceDetails(response, appData, vmiList, function(vmiData) { + if(vmiData != null && vmiData.length > 0) { + var vmiListLen = vmiList.length; + for(var i = 0; i < vmiListLen; i++) { + vmiList[i]['vmi_details'] = vmiData[i]; } + for(var j = 0; j < lInfDetails.length; j++) { + var lInterface = lInfDetails[j]['logical-interface']; + for(var k = 0; k < vmiList.length; k++) { + if(vmiList[k].li_uuid === lInterface.uuid) { + lInterface['vmi_details'] = vmiList[k]['vmi_details']; + } + } + } + console.log("VMI DATA :", JSON.stringify(lInfDetails)); + //map logical interfaces to corresponding physical interface + if(lInfDetails.length > 0) { + for(var i = 0; i < results.length; i++) { + var pInterface = results[i]['physical-interface']; + if(pInterface != null) { + pInterface['logical_interfaces'] = []; + for(var j = 0; j < lInfDetails.length; j++) { + var lInterface = lInfDetails[j]['logical-interface']; + if(pInterface['uuid'] === lInterface['parent_uuid']) { + pInterface['logical_interfaces'].push(lInfDetails[j]); + } + } + } + } + } + } + //console.log("Final Result:", JSON.stringify(results)); + commonUtils.handleJSONResponse(error, response, results); + }); + } else { + //map logical interfaces to corresponding physical interface + if(lInfDetails.length > 0) { + for(var i = 0; i < results.length; i++) { + var pInterface = results[i]['physical-interface']; + if(pInterface != null) { + pInterface['logical_interfaces'] = []; + for(var j = 0; j < lInfDetails.length; j++) { + var lInterface = lInfDetails[j]['logical-interface']; + if(pInterface['uuid'] === lInterface['parent_uuid']) { + pInterface['logical_interfaces'].push(lInfDetails[j]); + } + } + } } - } - } + } + commonUtils.handleJSONResponse(error, response, results); + } } - commonUtils.handleJSONResponse(error, response, results); } ) } else { @@ -235,12 +281,12 @@ function getInterfaceUrl(request, operation) { } /** - * @getVirtualMachineInterface + * @getVirtualNetworkInternals * public function - * 1. URL /api/tenants/config/virtual-machine-interface-details/:id + * 1. URL /api/tenants/config/virtual-network-internals/:id * 2. Gets physical interfaces from config api server */ -function getVirtualMachineInterfaceDetails (request, response, appData) +function getVirtualNetworkInternals (request, response, appData) { var vnID = validateQueryParam(request, 'id'); configApiServer.apiGet('/virtual-network/' + vnID, appData, @@ -248,16 +294,17 @@ function getVirtualMachineInterfaceDetails (request, response, appData) if(error || data == null || data['virtual-network'] == null || data['virtual-network']['virtual_machine_interface_back_refs'] == null) { commonUtils.handleJSONResponse(error, response, null); } else { - processVirtualMachineInterfaceDetails(request, response, appData, data); + processVirtualMachineInterfaceDetails(response, appData, data['virtual-network']['virtual_machine_interface_back_refs']); } }); } -function processVirtualMachineInterfaceDetails(request, response, appData, result) { +function processVirtualMachineInterfaceDetails(response, appData, result, callback) +{ var dataObjArr = []; var resultJSON = []; var tempVMIResourceObj = []; - var vmiBackRefs = result['virtual-network']['virtual_machine_interface_back_refs']; + var vmiBackRefs = result; var vmiCnt = vmiBackRefs.length; for(var i = 0; i < vmiCnt; i++) { var vmiUrl = '/virtual-machine-interface/' + vmiBackRefs[i].uuid; @@ -308,8 +355,11 @@ function processVirtualMachineInterfaceDetails(request, response, appData, resul "vmi_fq_name": tempVMIResourceObj[i]['fq_name']}); } - console.log("Getting RESULT AS:", JSON.stringify(resultJSON)); - commonUtils.handleJSONResponse(null, response, resultJSON); + if(callback != null) { + callback(resultJSON); + } else { + commonUtils.handleJSONResponse(null, response, resultJSON); + } }); } ); @@ -320,5 +370,5 @@ exports.getPhysicalRouters = getPhysicalRouters; exports.getPhysicalInterfaces = getPhysicalInterfaces; exports.createPhysicalInterfaces = createPhysicalInterfaces; exports.updatePhysicalInterfaces = updatePhysicalInterfaces; -exports.deletePhysicalInterfaces = deletePhysicalInterfaces; -exports.getVirtualMachineInterfaceDetails = getVirtualMachineInterfaceDetails; \ No newline at end of file +exports.deletePhysicalInterfaces = deletePhysicalInterfaces; +exports.getVirtualNetworkInternals = getVirtualNetworkInternals; \ No newline at end of file diff --git a/webroot/config/physicaldevices/physicalinterfaces/ui/js/physicalinterfaces_config.js b/webroot/config/physicaldevices/physicalinterfaces/ui/js/physicalinterfaces_config.js index 537a62650..709b71f53 100644 --- a/webroot/config/physicaldevices/physicalinterfaces/ui/js/physicalinterfaces_config.js +++ b/webroot/config/physicaldevices/physicalinterfaces/ui/js/physicalinterfaces_config.js @@ -9,6 +9,7 @@ function physicalInterfacesConfig() { var currentUUID; var dsSrcDest = []; var doubleCreation = false; + var interfaceDelimiters = []; //Method Definations this.load = load; this.destroy = destroy; @@ -25,6 +26,7 @@ function physicalInterfacesConfig() { initActions(); fetchPhysicalRouters(); fetchVirtualNetworks(); + fetchConfigurations(); } function initComponents() { @@ -150,12 +152,14 @@ function physicalInterfacesConfig() { $('#ddVN').contrailDropdown({ dataTextField:'text', dataValueField:'value', - change:onVNSelChange + change:onVNSelChange, + minimumResultsForSearch : 1 }); $('#ddVMI').contrailDropdown({ dataTextField:'text', dataValueField:'value', + minimumResultsForSearch : 1 }); //initializing add record window @@ -216,7 +220,14 @@ function physicalInterfacesConfig() { $('#txtPhysicalInterfaceName').bind('blur', function(e) { if($('#ddType').data('contrailDropdown').value() === "logical") { var infName = $('#txtPhysicalInterfaceName').val().trim(); - var infNameArry = infName.split('.').length === 2 ? infName.split('.') : infName.split(':'); + var delimiter; + for(var i = 0; i < interfaceDelimiters.length; i++) { + if(infName.indexOf(interfaceDelimiters[i]) !== -1) { + delimiter = interfaceDelimiters[i]; + break; + } + } + var infNameArry = infName.split(delimiter); var physicalInfName = ''; if(infNameArry.length === 2) { physicalInfName = infNameArry[0]; @@ -296,7 +307,8 @@ function physicalInterfacesConfig() { $('#ddType').data('contrailDropdown').text(gblSelRow.type); $('#ddType').data('contrailDropdown').enable(false); if(gblSelRow.type === 'Logical') { - $('#vmSection').removeClass('hide').addClass('show'); + $('#vmSection').removeClass('hide').addClass('show'); + $('#ddVMI').data('contrailDropdown').text(gblSelRow.server); } } $('#addPhysicalInterfaceWindow').modal('show'); @@ -314,7 +326,7 @@ function physicalInterfacesConfig() { var name = $("#txtPhysicalInterfaceName").val(); var pRouterDD = $('#ddPhysicalRouters').data('contrailDropdown') var postObject = {}; - var vmiData = JSON.parse($('#ddVMI').data('contrailDropdown').value()); + var vmiData = $('#ddVMI').data('contrailDropdown').value() != '' ? JSON.parse($('#ddVMI').data('contrailDropdown').value()) : null; gridPhysicalInterfaces._dataView.setData([]); gridPhysicalInterfaces.showGridMessage('loading'); if(infType === 'Physical') { @@ -328,8 +340,10 @@ function physicalInterfacesConfig() { postObject["logical-interface"] = {}; postObject["logical-interface"]["fq_name"] = ["default-global-system-config", pRouterDD.text(), name]; postObject["logical-interface"]["parent_type"] = "physical-router"; - postObject["logical-interface"]["name"] = name; - postObject["logical-interface"]['virtual_machine_interface_refs'] = [{"to" : [vmiData[0],vmiData[1],vmiData[2]]}]; + postObject["logical-interface"]["name"] = name; + if(vmiData != null) { + postObject["logical-interface"]['virtual_machine_interface_refs'] = [{"to" : [vmiData[0], vmiData[1], vmiData[2]]}]; + } } else { if(!isItemExists(parent.text(), dsSrcDest)) { @@ -346,7 +360,9 @@ function physicalInterfacesConfig() { postObject["logical-interface"]["parent_type"] = "physical-interface"; postObject["logical-interface"]["parent_uuid"] = parent.value(); postObject["logical-interface"]["name"] = name; - postObject["logical-interface"]['virtual_machine_interface_refs'] = [{"to" : [vmiData[0],vmiData[1],vmiData[2]]}]; + if(vmiData != null) { + postObject["logical-interface"]['virtual_machine_interface_refs'] = [{"to" : [vmiData[0], vmiData[1], vmiData[2]]}]; + } } } } @@ -363,6 +379,7 @@ function physicalInterfacesConfig() { doubleCreation = false; $('#ddParent').data('contrailDropdown').enable(false); $('#ddType').data('contrailDropdown').enable(true); + $('#ddVMI').data('contrailDropdown').value(''); } function fetchPhysicalRouters() { @@ -417,7 +434,7 @@ function physicalInterfacesConfig() { } var ddVN = $('#ddVN').data('contrailDropdown'); ddVN.setData(vnDataSrc); - fetchVirtualMachineDetails(ddVN.value()); + fetchVirtualNetworkInternals(ddVN.value()); } window.failureHandlerForVN = function(error) { @@ -426,15 +443,15 @@ function physicalInterfacesConfig() { } - function fetchVirtualMachineDetails(id) { + function fetchVirtualNetworkInternals(id) { if(id === 'empty') { $('#ddVMI').data('contrailDropdown').setData([{text : 'No Server found', value : 'empty'}]); } else { - doAjaxCall('/api/tenants/config/virtual-machine-interface-details/' + id,'GET', null, 'successHandlerForVMIDetails', 'failureHandlerForVMIDetails', null, null); + doAjaxCall('/api/tenants/config/virtual-network-internals/' + id,'GET', null, 'successHandlerForVNInternals', 'failureHandlerForVNInternals', null, null); } } - window.successHandlerForVMIDetails = function(result) { + window.successHandlerForVNInternals = function(result) { if(result != null && result.length > 0) { var vmiDataSrc = []; for(var i = 0; i < result.length; i++) { @@ -442,15 +459,30 @@ function physicalInterfacesConfig() { vmiDataSrc.push({text : vmi.mac[0] + ' (' + vmi.ip[0] + ')', value : JSON.stringify(vmi.vmi_fq_name)}); } $('#ddVMI').data('contrailDropdown').setData(vmiDataSrc); + $('#ddVMI').data('contrailDropdown').value(''); } else { $('#ddVMI').data('contrailDropdown').setData([{text : 'No Server found', value : 'empty'}]); } } - window.failureHandlerForVMIDetails = function(error){ + window.failureHandlerForVNInternals = function(error){ var r = arguments; showInfoWindow(r[0].responseText,r[2]) } + + function fetchConfigurations() { + doAjaxCall('/api/admin/webconfig/physicaldevices/interface_delimiters' ,'GET', null, 'successHandlerForConfigurations', 'failureHandlerForForConfigurations', null, null); + } + + window.successHandlerForConfigurations = function(result) { + if(result != null && result['interface_delimiters'] != null && result['interface_delimiters'].length > 0) { + interfaceDelimiters = result['interface_delimiters']; + } + } + + window.failureHandlerForForConfigurations = function(error) { + + } function fetchData() { gridPhysicalInterfaces._dataView.setData([]); @@ -497,7 +529,7 @@ function physicalInterfacesConfig() { type : "Logical", parent : lInterface.fq_name[2], vlan : '-', - server : '-', + server : lInterface['vmi_details'] ? lInterface['vmi_details'].mac[0] +' ('+ lInterface['vmi_details'].ip[0] + ')' : '-' }); } var currPhysicalInfRow = getCurrentPhysicalInfRow(gridDS, pInterface.uuid); @@ -531,8 +563,19 @@ function physicalInterfacesConfig() { } else { gridPhysicalInterfaces.showGridMessage("empty"); } - gridPhysicalInterfaces._dataView.setData(gridDS); - + gridPhysicalInterfaces._dataView.setData(gridDS); + } + + + function fetchVMIDetails(id) { + doAjaxCall('/api/tenants/config/virtual-machine-interface-details/' + id,'GET', null, 'successHandlerForVMIDetails', 'failureHandlerForVMIDetails', null, null); + } + + window.successHandlerForVMIDetails = function(result) { + + } + + window.failureHandlerForVMIDetails = function(error) { } function getCurrentPhysicalInfRow(dataSrc,id) { diff --git a/webroot/config/physicaldevices/physicalinterfaces/ui/views/physicalinterfaces_config.view b/webroot/config/physicaldevices/physicalinterfaces/ui/views/physicalinterfaces_config.view index a306d7880..a818d2dca 100644 --- a/webroot/config/physicaldevices/physicalinterfaces/ui/views/physicalinterfaces_config.view +++ b/webroot/config/physicaldevices/physicalinterfaces/ui/views/physicalinterfaces_config.view @@ -41,21 +41,7 @@
-
- +
diff --git a/webroot/config/physicaldevices/virtualrouters/ui/js/virtualrouters_config.js b/webroot/config/physicaldevices/virtualrouters/ui/js/virtualrouters_config.js index 9e7a51a28..aff5e3414 100644 --- a/webroot/config/physicaldevices/virtualrouters/ui/js/virtualrouters_config.js +++ b/webroot/config/physicaldevices/virtualrouters/ui/js/virtualrouters_config.js @@ -301,6 +301,12 @@ function virtualRoutersConfig() { showInfoWindow("Enter a valid IP address in xxx.xxx.xxx.xxx format","Input required"); return false; } + + var typeValues = $('#msType').data('contrailMultiselect').value(); + if(typeValues != null && typeValues != '' && typeValues.length > 1) { + showInfoWindow("Select a single Virtual Router Type","Input required"); + return false; + } return true; } diff --git a/webroot/config/physicaldevices/virtualrouters/ui/views/virtualrouters_config.view b/webroot/config/physicaldevices/virtualrouters/ui/views/virtualrouters_config.view index 945b065a9..26a490f56 100644 --- a/webroot/config/physicaldevices/virtualrouters/ui/views/virtualrouters_config.view +++ b/webroot/config/physicaldevices/virtualrouters/ui/views/virtualrouters_config.view @@ -35,7 +35,7 @@
- +
From 3b2ffdf6ef84ab47fd8d6a73b6600220bd948a0d Mon Sep 17 00:00:00 2001 From: Siva Bavanasi Date: Wed, 15 Oct 2014 13:58:55 +0530 Subject: [PATCH 08/25] Fixed the bugs in logical interface creation Change-Id: If7dea2646341500d36b5dce09680bc54b5d42092 --- .../api/physicalinterfacesconfig.api.js | 132 +++++++++--------- .../ui/js/physicalinterfaces_config.js | 25 ++-- .../ui/js/physicalrouters_config.js | 2 +- webroot/menu.xml | 6 +- 4 files changed, 86 insertions(+), 79 deletions(-) diff --git a/webroot/config/physicaldevices/physicalinterfaces/api/physicalinterfacesconfig.api.js b/webroot/config/physicaldevices/physicalinterfaces/api/physicalinterfacesconfig.api.js index ac8104d61..ee6daa372 100644 --- a/webroot/config/physicaldevices/physicalinterfaces/api/physicalinterfacesconfig.api.js +++ b/webroot/config/physicaldevices/physicalinterfaces/api/physicalinterfacesconfig.api.js @@ -93,7 +93,7 @@ function getPhysicalInterfacesDetails(error, data, response, appData) } async.map(dataObjArr, - commonUtils.getAPIServerResponse(configApiServer.apiGet, false), + commonUtils.getAPIServerResponse(configApiServer.apiGet, true), function(error, results) { if (error) { commonUtils.handleJSONResponse(error, response, null); @@ -115,77 +115,79 @@ function getPhysicalInterfacesDetails(error, data, response, appData) } } - async.map(lInfDataObjArr, - commonUtils.getAPIServerResponse(configApiServer.apiGet, false), - function(err,lInfDetails){ - if (error) { - commonUtils.handleJSONResponse(error, response, null); - return; - } - if(lInfDetails.length > 0) { - var vmiList = []; - for(var j = 0; j < lInfDetails.length; j++) { - var lInterface = lInfDetails[j]['logical-interface']; - if('virtual_machine_interface_refs' in lInterface) { - vmiList.push({li_uuid : lInterface.uuid, uuid : lInterface['virtual_machine_interface_refs'][0].uuid}); - } + if(lInfDataObjArr.length > 0) { + async.map(lInfDataObjArr, + commonUtils.getAPIServerResponse(configApiServer.apiGet, true), + function(err,lInfDetails){ + if (error) { + commonUtils.handleJSONResponse(error, response, null); + return; } - if(vmiList.length > 0) { - processVirtualMachineInterfaceDetails(response, appData, vmiList, function(vmiData) { - if(vmiData != null && vmiData.length > 0) { - var vmiListLen = vmiList.length; - for(var i = 0; i < vmiListLen; i++) { - vmiList[i]['vmi_details'] = vmiData[i]; - } - for(var j = 0; j < lInfDetails.length; j++) { - var lInterface = lInfDetails[j]['logical-interface']; - for(var k = 0; k < vmiList.length; k++) { - if(vmiList[k].li_uuid === lInterface.uuid) { - lInterface['vmi_details'] = vmiList[k]['vmi_details']; - } - } - } - console.log("VMI DATA :", JSON.stringify(lInfDetails)); - //map logical interfaces to corresponding physical interface - if(lInfDetails.length > 0) { - for(var i = 0; i < results.length; i++) { - var pInterface = results[i]['physical-interface']; - if(pInterface != null) { - pInterface['logical_interfaces'] = []; - for(var j = 0; j < lInfDetails.length; j++) { - var lInterface = lInfDetails[j]['logical-interface']; - if(pInterface['uuid'] === lInterface['parent_uuid']) { - pInterface['logical_interfaces'].push(lInfDetails[j]); - } - } - } - } - } + if(lInfDetails.length > 0) { + var vmiList = []; + for(var j = 0; j < lInfDetails.length; j++) { + var lInterface = lInfDetails[j]['logical-interface']; + if('virtual_machine_interface_refs' in lInterface) { + vmiList.push({li_uuid : lInterface.uuid, uuid : lInterface['virtual_machine_interface_refs'][0].uuid}); } - //console.log("Final Result:", JSON.stringify(results)); - commonUtils.handleJSONResponse(error, response, results); - }); - } else { - //map logical interfaces to corresponding physical interface - if(lInfDetails.length > 0) { - for(var i = 0; i < results.length; i++) { - var pInterface = results[i]['physical-interface']; - if(pInterface != null) { - pInterface['logical_interfaces'] = []; + } + if(vmiList.length > 0) { + processVirtualMachineInterfaceDetails(response, appData, vmiList, function(vmiData) { + if(vmiData != null && vmiData.length > 0) { + var vmiListLen = vmiList.length; + for(var i = 0; i < vmiListLen; i++) { + vmiList[i]['vmi_details'] = vmiData[i]; + } for(var j = 0; j < lInfDetails.length; j++) { var lInterface = lInfDetails[j]['logical-interface']; - if(pInterface['uuid'] === lInterface['parent_uuid']) { - pInterface['logical_interfaces'].push(lInfDetails[j]); - } - } - } - } + for(var k = 0; k < vmiList.length; k++) { + if(vmiList[k].li_uuid === lInterface.uuid) { + lInterface['vmi_details'] = vmiList[k]['vmi_details']; + } + } + } + //map logical interfaces to corresponding physical interface + if(lInfDetails.length > 0) { + for(var i = 0; i < results.length; i++) { + var pInterface = results[i]['physical-interface']; + if(pInterface != null) { + pInterface['logical_interfaces'] = []; + for(var j = 0; j < lInfDetails.length; j++) { + var lInterface = lInfDetails[j]['logical-interface']; + if(pInterface['uuid'] === lInterface['parent_uuid']) { + pInterface['logical_interfaces'].push(lInfDetails[j]); + } + } + } + } + } + } + commonUtils.handleJSONResponse(error, response, results); + }); + } else { + //map logical interfaces to corresponding physical interface + if(lInfDetails.length > 0) { + for(var i = 0; i < results.length; i++) { + var pInterface = results[i]['physical-interface']; + if(pInterface != null) { + pInterface['logical_interfaces'] = []; + for(var j = 0; j < lInfDetails.length; j++) { + var lInterface = lInfDetails[j]['logical-interface']; + if(pInterface['uuid'] === lInterface['parent_uuid']) { + pInterface['logical_interfaces'].push(lInfDetails[j]); + } + } + } + } + } + commonUtils.handleJSONResponse(error, response, results); } - commonUtils.handleJSONResponse(error, response, results); } } - } - ) + ) + } else { + commonUtils.handleJSONResponse(error, response, results); + } } else { commonUtils.handleJSONResponse(error, response, null); } diff --git a/webroot/config/physicaldevices/physicalinterfaces/ui/js/physicalinterfaces_config.js b/webroot/config/physicaldevices/physicalinterfaces/ui/js/physicalinterfaces_config.js index 709b71f53..6ad7f66db 100644 --- a/webroot/config/physicaldevices/physicalinterfaces/ui/js/physicalinterfaces_config.js +++ b/webroot/config/physicaldevices/physicalinterfaces/ui/js/physicalinterfaces_config.js @@ -108,15 +108,15 @@ function physicalInterfacesConfig() { }, statusMessages: { loading: { - text: 'Loading Physical Interfaces..' + text: 'Loading Interfaces..' }, empty: { - text: 'No Physical Interfaces.' + text: 'No Interfaces.' }, errorGettingData: { type: 'error', iconClasses: 'icon-warning', - text: 'Error in getting Physical Interfaces.' + text: 'Error in getting Interfaces.' } } } @@ -492,6 +492,12 @@ function physicalInterfacesConfig() { window.successHandlerForPhysicalInterfaces = function(result) { var gridDS = []; + var mainDS = []; + var pRouterDS = []; + var pRouterDD = $('#ddPhysicalRouters').data('contrailDropdown'); + var ddParent = $('#ddParent').data('contrailDropdown'); + var pInterfaceDS = [{text : 'Enter or Select a Interface', value : 'dummy', disabled : true}]; + pRouterDS.push({text : pRouterDD.text(), value : pRouterDD.value(), parent : 'physical_router',disabled : true}); if(result && result.length > 0) { var pInterfaces = result; for(var i = 0; i < pInterfaces.length;i++) { @@ -539,17 +545,12 @@ function physicalInterfacesConfig() { gridDS = gridDS.concat(infDS); } } - var mainDS = []; - var pInterfaceDS = [{text : 'Enter or Select a Interface', value : 'dummy', disabled : true}]; - var pRouterDS = []; - var pRouterDD = $('#ddPhysicalRouters').data('contrailDropdown'); - pRouterDS.push({text : pRouterDD.text(), value : pRouterDD.value(), parent : 'physical_router',disabled : true}); + for(var i = 0; i < gridDS.length; i++) { if(gridDS[i].type === 'Physical') { pInterfaceDS.push({text : gridDS[i].name, value : gridDS[i].uuid, parent : 'physical_interface'}); } } - mainDS.push({text : 'Physical Router', id : 'physical_router', children : pRouterDS}, {text : 'Physical Interface', id : 'physical_interface', children : pInterfaceDS}); dsSrcDest = mainDS; @@ -557,10 +558,14 @@ function physicalInterfacesConfig() { createUpdatePhysicalInterface(); } else { //set parent drop down data here - var ddParent = $('#ddParent').data('contrailDropdown'); ddParent.setData(mainDS); } } else { + mainDS.push({text : 'Physical Router', id : 'physical_router', children : pRouterDS}, + {text : 'Physical Interface', id : 'physical_interface', children : pInterfaceDS}); + dsSrcDest = mainDS; + ddParent.setData(mainDS); + ddParent.value(mainDS[0].children[0].value); gridPhysicalInterfaces.showGridMessage("empty"); } gridPhysicalInterfaces._dataView.setData(gridDS); diff --git a/webroot/config/physicaldevices/physicalrouters/ui/js/physicalrouters_config.js b/webroot/config/physicaldevices/physicalrouters/ui/js/physicalrouters_config.js index d271454f1..24d3eca54 100644 --- a/webroot/config/physicaldevices/physicalrouters/ui/js/physicalrouters_config.js +++ b/webroot/config/physicaldevices/physicalrouters/ui/js/physicalrouters_config.js @@ -56,7 +56,7 @@ function physicalRoutersConfig() { cssClass :'cell-hyperlink-blue', events : { onClick : function(e, dc) { - layoutHandler.setURLHashParams({uuid : dc.uuid} ,{p : 'config_pd_physicalInterfaces' ,merge : false ,triggerHashChange : true}); + layoutHandler.setURLHashParams({uuid : dc.uuid} ,{p : 'config_pd_interfaces' ,merge : false ,triggerHashChange : true}); } } }] diff --git a/webroot/menu.xml b/webroot/menu.xml index 321fdf6e2..51fc6d17d 100644 --- a/webroot/menu.xml +++ b/webroot/menu.xml @@ -368,7 +368,7 @@ and need to add the iconClass tag wherever we need to show some icons - config_pd_physicalInterfaces + config_pd_interfaces /config/physicaldevices/physicalinterfaces/ui @@ -379,7 +379,7 @@ and need to add the iconClass tag wherever we need to show some icons Configure Interfaces - + From b08b087d0be421686ebe6fe3c157f054a73c4c9e Mon Sep 17 00:00:00 2001 From: Manoj Naik Date: Wed, 15 Oct 2014 18:37:54 +0530 Subject: [PATCH 09/25] Baremetal Changes- More changes to physical routers and added new api in virtual routers. Change-Id: I59f34121bcf75da4755b0c706649138dfcef9129 --- .../physicalinterfaces/api/parseURL.xml | 19 +- .../api/physicalinterfacesconfig.api.js | 24 +- .../ui/js/physicalinterfaces_config.js | 2 +- .../physicalrouters/api/parseURL.xml | 6 + .../api/physicalroutersconfig.api.js | 82 ++++++- .../ui/js/physicalrouters_config.js | 208 +++++++++++++++--- .../ui/views/physicalrouters_config.view | 121 +++++++--- .../virtualrouters/api/parseURL.xml | 6 + .../api/virtualroutersconfig.api.js | 24 +- 9 files changed, 378 insertions(+), 114 deletions(-) diff --git a/webroot/config/physicaldevices/physicalinterfaces/api/parseURL.xml b/webroot/config/physicaldevices/physicalinterfaces/api/parseURL.xml index ddb6d2924..c9dc0b644 100644 --- a/webroot/config/physicaldevices/physicalinterfaces/api/parseURL.xml +++ b/webroot/config/physicaldevices/physicalinterfaces/api/parseURL.xml @@ -11,23 +11,16 @@ ./physicalinterfacesconfig.api - - - /api/tenants/config/physical-router-details - get - physicalinterfacesconfig - physicalinterfacesconfigapi.getPhysicalRouters - + --> /api/tenants/config/physical-interfaces/:pRouterId get diff --git a/webroot/config/physicaldevices/physicalinterfaces/api/physicalinterfacesconfig.api.js b/webroot/config/physicaldevices/physicalinterfaces/api/physicalinterfacesconfig.api.js index ee6daa372..91481839e 100644 --- a/webroot/config/physicaldevices/physicalinterfaces/api/physicalinterfacesconfig.api.js +++ b/webroot/config/physicaldevices/physicalinterfaces/api/physicalinterfacesconfig.api.js @@ -28,26 +28,7 @@ var url = require('url'); var jsonPath = require('JSONPath').eval; var configApiServer = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/configServer.api'); -var async = require('async'); - -/** - * @getPhysicalRouters - * public function - * 1. URL /api/tenants/config/physical-routers - * 2. Gets physical routers from config api server - */ -function getPhysicalRouters (request, response, appData) -{ - configApiServer.apiGet('/physical-routers', appData, - function(error, data) { - if (error) { - commonUtils.handleJSONResponse(error, response, null); - return; - } - commonUtils.handleJSONResponse(error, response, data); - } - ); -} +var async = require('async'); /** * @getPhysicalInterfaces @@ -368,9 +349,8 @@ function processVirtualMachineInterfaceDetails(response, appData, result, callba } /* List all public function here */ -exports.getPhysicalRouters = getPhysicalRouters; exports.getPhysicalInterfaces = getPhysicalInterfaces; exports.createPhysicalInterfaces = createPhysicalInterfaces; exports.updatePhysicalInterfaces = updatePhysicalInterfaces; exports.deletePhysicalInterfaces = deletePhysicalInterfaces; -exports.getVirtualNetworkInternals = getVirtualNetworkInternals; \ No newline at end of file +exports.getVirtualNetworkInternals = getVirtualNetworkInternals; diff --git a/webroot/config/physicaldevices/physicalinterfaces/ui/js/physicalinterfaces_config.js b/webroot/config/physicaldevices/physicalinterfaces/ui/js/physicalinterfaces_config.js index 6ad7f66db..e3638fdf6 100644 --- a/webroot/config/physicaldevices/physicalinterfaces/ui/js/physicalinterfaces_config.js +++ b/webroot/config/physicaldevices/physicalinterfaces/ui/js/physicalinterfaces_config.js @@ -388,7 +388,7 @@ function physicalInterfacesConfig() { if(queryParams != undefined && queryParams.length > 1 && queryParams[1].indexOf('=') != -1) { currentUUID = queryParams[1].split('=')[1]; } - doAjaxCall('/api/tenants/config/physical-router-details','GET', null, 'successHandlerForPhysicalRouters', 'failureHandlerForPhysicalRouters', null, null); + doAjaxCall('/api/tenants/config/physical-routers-list','GET', null, 'successHandlerForPhysicalRouters', 'failureHandlerForPhysicalRouters', null, null); } window.successHandlerForPhysicalRouters = function(result) { var pRoutersDS = []; diff --git a/webroot/config/physicaldevices/physicalrouters/api/parseURL.xml b/webroot/config/physicaldevices/physicalrouters/api/parseURL.xml index e292d7427..538a44be4 100644 --- a/webroot/config/physicaldevices/physicalrouters/api/parseURL.xml +++ b/webroot/config/physicaldevices/physicalrouters/api/parseURL.xml @@ -18,6 +18,12 @@ 3. physicalrouters used - /api/tenants/config/physicalrouter-used/:id, getProjectphysicalrouterUsedInfo --> + + /api/tenants/config/physical-routers-list + get + physicalroutersconfig + physicalroutersapi.getPhysicalRoutersList + /api/tenants/config/physical-routers get diff --git a/webroot/config/physicaldevices/physicalrouters/api/physicalroutersconfig.api.js b/webroot/config/physicaldevices/physicalrouters/api/physicalroutersconfig.api.js index 551054082..b27831d8d 100644 --- a/webroot/config/physicaldevices/physicalrouters/api/physicalroutersconfig.api.js +++ b/webroot/config/physicaldevices/physicalrouters/api/physicalroutersconfig.api.js @@ -47,9 +47,28 @@ function getPhysicalRoutersCb(error, physicalRoutersData, response) } /** - * @listPolicys + * @getPhysicalRoutersList * public function * 1. URL /api/tenants/config/physical-routers + * 2. Gets physical routers from config api server + */ +function getPhysicalRoutersList (request, response, appData) +{ + configApiServer.apiGet('/physical-routers', appData, + function(error, data) { + if (error) { + commonUtils.handleJSONResponse(error, response, null); + return; + } + commonUtils.handleJSONResponse(error, response, data); + } + ); +} + +/** + * @getPhysicalRouters + * public function + * 1. URL /api/tenants/config/physical-routers-details * 2. Gets list of physical-routers from config api server * 3. Calls getPhysicalRoutersCb that process data from config * api server and sends back the http response. @@ -75,22 +94,62 @@ function getPhysicalRoutersDetails(error, data, response, appData) pRoutersLength = data['physical-routers'].length; for(i = 0; i < pRoutersLength; i++) { reqUrl = '/physical-router/' + data['physical-routers'][i]['uuid']; - console.log(i +' : ' + reqUrl); - commonUtils.createReqObj(dataObjArr, reqUrl, global.HTTP_REQUEST_GET, + commonUtils.createReqObj(dataObjArr, reqUrl, global.HTTP_REQUEST_GET, null, null, null, appData); } async.map(dataObjArr, commonUtils.getAPIServerResponse(configApiServer.apiGet, false), - function(error, results) { - if (error) { - commonUtils.handleJSONResponse(error, response, null); - return; - } - commonUtils.handleJSONResponse(error, response, results); + function(error, results) { + if (error) { + commonUtils.handleJSONResponse(error, response, null); + return; } - ) + getPhysicalInterfaceDetails(error, results, response, appData); + } + ); } +function getPhysicalInterfaceDetails(error, pRouters, response, appData){ + var pInterfacesLength = 0; + var result = []; + var dataObjArr = []; + + for(var k = 0; k < pRouters.length; k++){ + var prouter = pRouters[k]; + if(prouter['physical-router'] != null && prouter['physical-router']['physical_interfaces'] != null && prouter['physical-router']['physical_interfaces'].length > 0){ + pInterfacesLength = prouter['physical-router']['physical_interfaces'].length; + for(i = 0; i < pInterfacesLength; i++) { + var pInterface = prouter['physical-router']['physical_interfaces'][i]; + reqUrl = '/physical-interface/' + pInterface['uuid']; + commonUtils.createReqObj(dataObjArr, reqUrl, global.HTTP_REQUEST_GET, + null, null, null, appData); + } + } + } + async.map(dataObjArr, + commonUtils.getAPIServerResponse(configApiServer.apiGet, false), + function(error, pInterfaces) { + if (error) { + commonUtils.handleJSONResponse(error, response, null); + return; + } + if(pInterfaces.length > 0){ + + for(var j=0 ;j < pRouters.length; j++){ + pRouters[j]['physical-router']['physical_interfaces'] = []; + for(var l=0 ; l < pInterfaces.length; l++){ + if(pRouters[j]['physical-router']['uuid'] == pInterfaces[l]['physical-interface']['parent_uuid']){ + pRouters[j]['physical-router']['physical_interfaces'].push(pInterfaces[l]['physical-interface']); + } + } + } + commonUtils.handleJSONResponse(error, response, pRouters); + } + } + ); +} + + /** * @setPRouterRead * private function @@ -180,7 +239,8 @@ function validatePhysicalRouterId (request) /* List all public function here */ - exports.getPhysicalRouters = getPhysicalRouters; + exports.getPhysicalRoutersList= getPhysicalRoutersList; + exports.getPhysicalRouters = getPhysicalRouters; exports.createPhysicalRouters = createPhysicalRouters; exports.updatePhysicalRouters = updatePhysicalRouters; exports.deletePhysicalRouters = deletePhysicalRouters; \ No newline at end of file diff --git a/webroot/config/physicaldevices/physicalrouters/ui/js/physicalrouters_config.js b/webroot/config/physicaldevices/physicalrouters/ui/js/physicalrouters_config.js index 24d3eca54..4bc374d75 100644 --- a/webroot/config/physicaldevices/physicalrouters/ui/js/physicalrouters_config.js +++ b/webroot/config/physicaldevices/physicalrouters/ui/js/physicalrouters_config.js @@ -4,10 +4,10 @@ physicalRoutersConfigObj = new physicalRoutersConfig(); function physicalRoutersConfig() { - //Variable Definations + //Variable Definitions var gridPhysicalRouters; - //Method Definations + //Method Definitions this.load = load; this.destroy = destroy; @@ -42,7 +42,13 @@ function physicalRoutersConfig() { { id : 'name', field : 'name', - name : 'Name' + name : 'Name' , + cssClass :'cell-hyperlink-blue', + events : { + onClick : function(e, dc) { + layoutHandler.setURLHashParams({uuid : dc.uuid} ,{p : 'config_pd_interfaces' ,merge : false ,triggerHashChange : true}); + } + } }, { id : 'ip_address', @@ -122,36 +128,18 @@ function physicalRoutersConfig() { dataValueField:'value', }); var ddBgp = $('#ddBgpRouter').data('contrailDropdown'); - var ddBgpDS = [{ text : 'peer1', value : 'peer1'}, - { text : 'peer2', value : 'peer2'}] - ddBgp.setData(ddBgpDS); //initializing physical router type multi select $('#msVN').contrailMultiselect({ dataTextField:'text', dataValueField:'value', }); - - var msVN = $('#msVN').data('contrailMultiselect'); - var msVNDS = [{ text : 'vn1', value : 'vn1'}, - { text : 'vn2', value : 'vn2'}, - { text : 'vn3', value : 'vn3'}, - { text : 'vn4', value : 'vn4'}] - msVN.setData(msVNDS); //initializing physical router type multi select - $('#msVRouters').contrailMultiselect({ + $('#ddVirtualRouters').contrailDropdown({ dataTextField:'text', dataValueField:'value', }); - - var msVRouters = $('#msVRouters').data('contrailMultiselect'); - var msVRoutersDS = [{ text : 'vn1', value : 'vn1'}, - { text : 'vn2', value : 'vn2'}, - { text : 'vn3', value : 'vn3'}, - { text : 'vn4', value : 'vn4'}] - msVRouters.setData(msVRoutersDS); - //initializing delete record window //deleteRecordWindowObj.modal({backdrop:'static',keyboard:false,show:false}); //deleteRecordWindowObj.find(".modal-header-title").text('Confirm'); @@ -239,10 +227,21 @@ function physicalRoutersConfig() { function populateCreateEditWindow(m) { mode = m; clearCreateEditWindow(); + + fetchBGPRouters(); + fetchVNs(); + fetchVirtualRouters(); if(mode === 'edit') { $('#txtPhysicalRouterName').val(gblSelRow.name); $('#txtPhysicalRouterName').attr('disabled','disabled'); - $('#txtIPAddress').val(gblSelRow.ip_address); + $('#txtIPAddress').val(gblSelRow.username); + $('#txtUsername').val(gblSelRow.ip_address); + $('#txtPassword').val(gblSelRow.password); + if(gblSelRow.bgp_routers != '-') + $('#ddBgpRouter').data('contrailDropdown').text(gblSelRow.bgp_routers); + $('#msVN').val((gblSelRow.virtual_networks == '-') ? '' : gblSelRow.virtual_networks); + if(gblSelRow.virtual_router != '-') + $('#ddVirtualRouters').data('contrailDropdown').text(gblSelRow.virtual_router); } $('#addPhysicalRouterWindow').modal('show'); } @@ -258,11 +257,16 @@ function physicalRoutersConfig() { var ipAddress = $("#txtIPAddress").val(); var username = $("#txtUsername").val(); var password = $("#txtPassword").val(); - var bgpRouter = $("#ddBgpRouter").data('contrailDropdown').value(); - var vn = $("#msVN").data('contrailMultiselect').value(); - var vRouters = $("#msVRouters").data('contrailMultiselect').value(); + var bgpRouter = $("#ddBgpRouter").data('contrailDropdown').text(); + var vns = $("#msVN").data('contrailMultiselect').value(); + var vRouters = $("#ddVirtualRouters").data('contrailDropdown').text(); var postObject = {}; - + var vn = []; + for(var i= 0;i < vns.length; i++){ + var v = vns[i]; + var parts = v.split('|'); + vn.push(parts); + } gridPhysicalRouters._dataView.setData([]); gridPhysicalRouters.showGridMessage('loading'); @@ -270,11 +274,23 @@ function physicalRoutersConfig() { postObject["physical-router"]["fq_name"] = ["default-global-system-config", name]; postObject["physical-router"]["parent_type"] = "global-system-config"; postObject["physical-router"]["name"] = name; -// postObject["physical-router"]["physical_router_ip_address"] = ipAddress; - postObject["physical-router"]["username"] = username; - postObject["physical-router"]["password"] = password; - postObject["physical-router"]["vn"] = vn; - postObject["physical-router"]["vRouters"] = vRouters; + postObject["physical-router"]["physical_router_management_ip"] = ipAddress; + postObject["physical-router"]['physical_router_user_credentials'] = {}; + postObject["physical-router"]['physical_router_user_credentials']["username"] = username; + postObject["physical-router"]['physical_router_user_credentials']["password"] = password; + if(bgpRouter != null && bgpRouter != ''){ + var bgpRouterRefs = [{"to":["default-domain", "default-project" , "ip-fabric", "__default__", bgpRouter]}]; + postObject["physical-router"]["bgp_router_refs"] = bgpRouterRefs; + } + var vnRefs = []; + for(var i = 0 ;i < vn.length ; i++){ + vnRefs.push({"to":vn[i]}); + } + postObject["physical-router"]["virtual_network_refs"] = vnRefs; + if(vRouters != null && vRouters != ''){ + var virtualRouterRefs = [{"to":["default-global-system-config",vRouters]}]; + postObject["physical-router"]["virtual_router_refs"] = virtualRouterRefs; + } doAjaxCall(url, methodType, JSON.stringify(postObject), 'successHandlerForPhysicalRouters', 'failureHandlerForPhysicalRouters', null, null); } @@ -286,7 +302,7 @@ function physicalRoutersConfig() { $("#txtPassword").val(''); $("#ddBgpRouter").data('contrailDropdown').value(''); $("#msVN").data('contrailMultiselect').value(''); - $("#msVRouters").data('contrailMultiselect').value(''); + $("#ddVirtualRouters").data('contrailDropdown').value(''); } function fetchData() { @@ -300,12 +316,55 @@ function physicalRoutersConfig() { var gridDS = []; for(var i = 0; i < result.length;i++) { var rowData = result[i]['physical-router']; - var interfaces = ifNull(rowData['physical_interfaces'],0); + var pinterfaces = ifNull(rowData['physical_interfaces'],[]); + var linterfaces = ifNull(rowData['logical_interfaces'],[]); + var linpinterfaces = []; + $.each(pinterfaces,function(i,pInterface){ + var lInterfaces = ifNull(pInterface['logical_interfaces'],[]); + linpinterfaces = linpinterfaces.concat(lInterfaces); + }); + var interfaces = pinterfaces.concat(linterfaces,linpinterfaces); + var virtualRouters = ifNull(rowData['virtual_router_refs'],[]); + var virtualRouterString = ''; + $.each(virtualRouters, function(i,d){ + if(i != 0) + virtualRouterString = virtualRouterString + ', ' + d.to[1] + else + virtualRouterString = d.to[1]; + }); + var bgpRouters = ifNull(rowData['bgp_router_refs'],[]); + var bgpRoutersString = ''; + $.each(bgpRouters, function(i,d){ + if(i != 0) + bgpRoutersString = bgpRoutersString + ', ' + d.to[4] + else + bgpRoutersString = d.to[4]; + }); + var vns = ifNull(rowData['virtual_network_refs'],[]); + var vnsString = ''; + $.each(vns, function(i,d){ + if(i != 0) + vnsString = vnsString + ', ' + d.to[2] + else + vnsString = d.to[2]; + }); + + var credentials = rowData['physical-router-user-credentials']; + var username = '-',password = '-'; + if(credentials != null){ + username = credentials['username']; + password = credentials['password']; + } gridDS.push({ uuid : rowData.uuid, name : rowData.name, ip_address : rowData.physical_router_ip_address ? rowData.physical_router_ip_address : '-', - interfaces : interfaces.length + username : username, + password : password, + interfaces : interfaces.length, + bgp_routers : (bgpRoutersString == '')? '-' : bgpRoutersString, + virtual_networks : vnsString, + virtual_router : (virtualRouterString == '')? '-' : virtualRouterString }); } @@ -319,6 +378,85 @@ function physicalRoutersConfig() { gridPhysicalRouters.showGridMessage("errorGettingData"); } + function fetchVirtualRouters() { + //reading uuid from query string +// var queryParams = window.location.href.split("&"); +// if(queryParams != undefined && queryParams.length > 1 && queryParams[1].indexOf('=') != -1) { +// currentUUID = queryParams[1].split('=')[1]; +// } + doAjaxCall('/api/tenants/config/virtual-routers-list','GET', null, 'successHandlerForVirtualRouters', 'failureHandlerForVirtualRouters', null, null); + } + + window.successHandlerForVirtualRouters = function(result) { + var vRoutersDS = []; + if(result && result['virtual-routers'].length > 0) { + var virtualRouters = result['virtual-routers']; + for(var i = 0; i < virtualRouters.length;i++) { + var virtualRouter = virtualRouters[i]; + vRoutersDS.push({text : virtualRouter.fq_name[1], value : virtualRouter.uuid}); + } + + } else { + vRoutersDS.push({text : 'No Virtual Router found', value: 'Message'}); + } + var vRouterDD = $('#ddVirtualRouters').data('contrailDropdown'); + vRouterDD.setData(vRoutersDS); + } + + window.failureHandlerForVirtualRouters = function(error) { + gridPhysicalRouters.showGridMessage('errorGettingData'); + } + + function fetchBGPRouters() { + doAjaxCall('api/admin/nodes/bgp','GET', null, 'successHandlerForBGPRouters', 'failureHandlerForBGPRouters', null, null); + } + + window.successHandlerForBGPRouters = function(result) { + var bgpDS = [{text : "", value : ""}]; + if(result && result.length > 0) { + for(var i = 0; i < result.length;i++) { + var bgpRouter = result[i]; + bgpDS.push({text : bgpRouter.name, value : bgpRouter.uuid}); + } + + } else { + bgpDS.push({text : 'No BGP Router found', value: 'Message'}); + } + var bgpDD = $('#ddBgpRouter').data('contrailDropdown'); + bgpDD.setData(bgpDS); + } + + window.failureHandlerForBGPRouters = function(error) { + gridPhysicalRouters.showGridMessage('errorGettingData'); + } + + function fetchVNs() { + doAjaxCall('api/tenants/config/virtual-networks','GET', null, 'successHandlerForVNs', 'failureHandlerForVNs', null, null); + } + + window.successHandlerForVNs = function(result) { + var vnDS = []; + + if(result && result['virtual-networks'].length > 0) { + var vns = result['virtual-networks']; + for(var i = 0; i < vns.length;i++) { + var vn = vns[i]; + var fqname = vn.fq_name; + var val = fqname[0] + '|' + fqname[1] + '|' +fqname[2]; + vnDS.push({text : fqname[2], value : val}); + } + + } else { + vnDS.push({text : 'No VN found', value: 'Message'}); + } + var msVN = $('#msVN').data('contrailMultiselect'); + msVN.setData(vnDS); + } + + window.failureHandlerForVNs = function(error) { + gridPhysicalRouters.showGridMessage('errorGettingData'); + } + function validate() { var name = $('#txtPhysicalRouterName').val().trim(); if(name === ""){ diff --git a/webroot/config/physicaldevices/physicalrouters/ui/views/physicalrouters_config.view b/webroot/config/physicaldevices/physicalrouters/ui/views/physicalrouters_config.view index 40866d13f..e4bbd1c1a 100644 --- a/webroot/config/physicaldevices/physicalrouters/ui/views/physicalrouters_config.view +++ b/webroot/config/physicaldevices/physicalrouters/ui/views/physicalrouters_config.view @@ -9,10 +9,10 @@
{{ip_address}}
-
+
{{interfaces}}
@@ -21,6 +21,18 @@
{{username}}
+
+
+
{{bgp_routers}}
+
+
+
+
{{virtual_networks}}
+
+
+
+
{{virtual_router}}
+
@@ -31,7 +43,7 @@
-
+
@@ -39,7 +51,7 @@
- +
@@ -54,46 +66,95 @@
-
- -
-
- -
+ -
- -
-
- +
+
+
+
+ +
+
+
+ +
+ +
+ + +
+
+
+
-
+
+
-
- -
-
- + -
- -
-
- +
+ -
- +
- +
+
diff --git a/webroot/config/physicaldevices/virtualrouters/api/parseURL.xml b/webroot/config/physicaldevices/virtualrouters/api/parseURL.xml index 66542b607..7a93f4131 100644 --- a/webroot/config/physicaldevices/virtualrouters/api/parseURL.xml +++ b/webroot/config/physicaldevices/virtualrouters/api/parseURL.xml @@ -14,6 +14,12 @@ + + /api/tenants/config/virtual-routers-list + get + virtualroutersconfig + virtualroutersconfigapi.getVirtualRoutersList + /api/tenants/config/virtual-routers get diff --git a/webroot/config/physicaldevices/virtualrouters/api/virtualroutersconfig.api.js b/webroot/config/physicaldevices/virtualrouters/api/virtualroutersconfig.api.js index b5eb75dce..4e484fd76 100644 --- a/webroot/config/physicaldevices/virtualrouters/api/virtualroutersconfig.api.js +++ b/webroot/config/physicaldevices/virtualrouters/api/virtualroutersconfig.api.js @@ -29,6 +29,25 @@ var configApiServer = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/configServer.api'); var async = require('async'); +/** + * @getVirtualRoutersList + * public function + * 1. URL /api/tenants/config/virtual-routers-list + * 2. Gets virtual routers from config api server + */ +function getVirtualRoutersList (request, response, appData) +{ + configApiServer.apiGet('/virtual-routers', appData, + function(error, data) { + if (error) { + commonUtils.handleJSONResponse(error, response, null); + return; + } + commonUtils.handleJSONResponse(error, response, data); + } + ); +} + /** * @getVirtualRouters * public function @@ -142,8 +161,9 @@ function validateVirtualRouterId (request) } /* List all public function here */ - -exports.getVirtualRouters = getVirtualRouters; + +exports.getVirtualRoutersList= getVirtualRoutersList; +exports.getVirtualRouters = getVirtualRouters; exports.createVirtualRouters = createVirtualRouters; exports.updateVirtualRouters = updateVirtualRouters; exports.deleteVirtualRouters = deleteVirtualRouters; From 91e4f88b356b2bad63123db0e7ddbf46cb569a2c Mon Sep 17 00:00:00 2001 From: Siva Bavanasi Date: Thu, 16 Oct 2014 11:15:53 +0530 Subject: [PATCH 10/25] Removed default selections Change-Id: I8d39ea4665b098d0a632f1caa179f547cf4d0c2b --- .../ui/js/physicalinterfaces_config.js | 8 +++-- .../ui/views/physicalinterfaces_config.view | 2 +- .../ui/js/physicalrouters_config.js | 3 +- .../ui/views/physicalrouters_config.view | 29 +++++++++---------- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/webroot/config/physicaldevices/physicalinterfaces/ui/js/physicalinterfaces_config.js b/webroot/config/physicaldevices/physicalinterfaces/ui/js/physicalinterfaces_config.js index e3638fdf6..7d4ea741a 100644 --- a/webroot/config/physicaldevices/physicalinterfaces/ui/js/physicalinterfaces_config.js +++ b/webroot/config/physicaldevices/physicalinterfaces/ui/js/physicalinterfaces_config.js @@ -195,7 +195,7 @@ function physicalInterfacesConfig() { function onVNSelChange(e) { var id = e.added.value; - fetchVirtualMachineDetails(id) + fetchVirtualNetworkInternals(id) } function initActions() { @@ -379,6 +379,7 @@ function physicalInterfacesConfig() { doubleCreation = false; $('#ddParent').data('contrailDropdown').enable(false); $('#ddType').data('contrailDropdown').enable(true); + $('#ddVN').data('contrailDropdown').value(''); $('#ddVMI').data('contrailDropdown').value(''); } @@ -433,8 +434,9 @@ function physicalInterfacesConfig() { vnDataSrc.push({text : 'No Virtual Network found', value : 'empty'}); } var ddVN = $('#ddVN').data('contrailDropdown'); - ddVN.setData(vnDataSrc); - fetchVirtualNetworkInternals(ddVN.value()); + ddVN.setData(vnDataSrc); + ddVN.value(''); + //fetchVirtualNetworkInternals(ddVN.value()); } window.failureHandlerForVN = function(error) { diff --git a/webroot/config/physicaldevices/physicalinterfaces/ui/views/physicalinterfaces_config.view b/webroot/config/physicaldevices/physicalinterfaces/ui/views/physicalinterfaces_config.view index a818d2dca..86f430eb3 100644 --- a/webroot/config/physicaldevices/physicalinterfaces/ui/views/physicalinterfaces_config.view +++ b/webroot/config/physicaldevices/physicalinterfaces/ui/views/physicalinterfaces_config.view @@ -49,7 +49,7 @@

- Logical Interface Options + Logical Interface Properties

-
+
@@ -116,7 +116,7 @@
- +
@@ -124,7 +124,7 @@
- +
From 91f175938484c9d0b672c6f060fb3ec2e6fcee9c Mon Sep 17 00:00:00 2001 From: Manoj Naik Date: Wed, 22 Oct 2014 14:45:05 +0530 Subject: [PATCH 21/25] Baremetal changes : Added the creation of vrouters while creating physical router. Change-Id: I0f49bff7474843ef6bb31d2e5f180268cddccb81 --- .../api/physicalroutersconfig.api.js | 125 ++++++++++- .../ui/js/physicalrouters_config.js | 195 +++++++++++++++--- .../ui/views/physicalrouters_config.view | 48 ++++- 3 files changed, 336 insertions(+), 32 deletions(-) diff --git a/webroot/config/physicaldevices/physicalrouters/api/physicalroutersconfig.api.js b/webroot/config/physicaldevices/physicalrouters/api/physicalroutersconfig.api.js index 98da0ce24..187bf0458 100644 --- a/webroot/config/physicaldevices/physicalrouters/api/physicalroutersconfig.api.js +++ b/webroot/config/physicaldevices/physicalrouters/api/physicalroutersconfig.api.js @@ -97,6 +97,7 @@ function getPhysicalRoutersDetails(error, data, response, appData) commonUtils.createReqObj(dataObjArr, reqUrl, global.HTTP_REQUEST_GET, null, null, null, appData); } + async.map(dataObjArr, commonUtils.getAPIServerResponse(configApiServer.apiGet, false), function(error, results) { @@ -187,14 +188,124 @@ function setPRouterRead(error, fipConfig, response, appData) function createPhysicalRouters (request, response, appData) { var postData = request.body; - configApiServer.apiPost('/physical-routers', postData, appData, - function(error, data) { - if(error){ - commonUtils.handleJSONResponse(error, response, null); - return; + console.log('postData : ' + JSON.stringify(postData)); + console.log('type' + postData['physical-router']['virtual_router_type']); + console.log('virtualrouters' + JSON.stringify(postData['physical-router']['virtual-routers'])); + //Read the virtual router type to be created + //if embedded use the details to create a virtual router. If it fails dont create physical router as well. + if(postData['physical-router']['virtual_router_type'] != null){ + if(postData['physical-router']['virtual_router_type'] == 'Embedded'){ + var vrouterPostData = postData['physical-router']['virtual-routers'][0]; + console.log("vrouter post data :"+ JSON.stringify(vrouterPostData)); + if(vrouterPostData){ + configApiServer.apiPost('/virtual-routers', vrouterPostData, appData, + function(error, data) { + console.log('response for vrouters create'); + if(error) { + console.log('error creating vrouter'); + commonUtils.handleJSONResponse(error, response, null); + return; + } else { + delete postData['physical-router']['virtual-routers']; + delete postData['physical-router']['virtual_router_type']; + //create physical router + console.log('creating prouter'); + configApiServer.apiPost('/physical-routers', postData, appData, + function(error, data) { + if(error){ + console.log('error creating prtouer'); + commonUtils.handleJSONResponse(error, response, null); + return; + } + console.log('created prouter'); + getPhysicalRouters(request, response, appData); + }); + } + }); + } else { + delete postData['physical-router']['virtual-routers']; + delete postData['physical-router']['virtual_router_type']; + //create physical router + console.log('creating prouter'); + configApiServer.apiPost('/physical-routers', postData, appData, + function(error, data) { + if(error){ + console.log('error creating prtouer'); + commonUtils.handleJSONResponse(error, response, null); + return; + } + console.log('created prouter'); + getPhysicalRouters(request, response, appData); + }); } - getPhysicalRouters(request, response, appData); - }); + } + //If Tor Agent + //Try to create the TOR Agent and TSN. Even if they fail go ahead and create physical router + else if(postData['physical-router']['virtual_router_type'] == 'TOR Agent'){ + var vrouterPostData = postData['physical-router']['virtual-routers']; + if(vrouterPostData.length > 0){ + console.log('trying to create tor agent'); + var reqUrl = null; + var dataObjArr = []; + for(i = 0; i < vrouterPostData.length; i++) { + reqUrl = '/virtual-routers'; + commonUtils.createReqObj(dataObjArr, reqUrl, global.HTTP_REQUEST_POST, + vrouterPostData[i], null, null, appData); + } + async.map(dataObjArr, + commonUtils.getAPIServerResponse(configApiServer.apiPost, false), + function(error, results) { + if (error) { + console.log('error creating vrouters'); + commonUtils.handleJSONResponse(error, response, null); + return; + } + console.log('creating prouter'); + delete postData['virtual-routers']; + delete postData['virtual_router_type']; + //create physical router + configApiServer.apiPost('/physical-routers', postData, appData, + function(error, data) { + if(error){ + console.log('error creating prouter'); + console.log(error); + commonUtils.handleJSONResponse(error, response, null); + return; + } + getPhysicalRouters(request, response, appData); + }); + } + ); + } else { + delete postData['virtual-routers']; + delete postData['virtual_router_type']; + //create physical router + configApiServer.apiPost('/physical-routers', postData, appData, + function(error, data) { + if(error){ + console.log('error creating prouter'); + console.log(error); + commonUtils.handleJSONResponse(error, response, null); + return; + } + getPhysicalRouters(request, response, appData); + }); + } + } + } else { + //create physical router + console.log('no vrouters just creating the prouter'); + configApiServer.apiPost('/physical-routers', postData, appData, + function(error, data) { + if(error){ + console.log('error creating prouter'); + console.log(error); + commonUtils.handleJSONResponse(error, response, null); + return; + } + getPhysicalRouters(request, response, appData); + }); + } } /** diff --git a/webroot/config/physicaldevices/physicalrouters/ui/js/physicalrouters_config.js b/webroot/config/physicaldevices/physicalrouters/ui/js/physicalrouters_config.js index 4ba7c7ec7..939cbb145 100644 --- a/webroot/config/physicaldevices/physicalrouters/ui/js/physicalrouters_config.js +++ b/webroot/config/physicaldevices/physicalrouters/ui/js/physicalrouters_config.js @@ -144,10 +144,33 @@ function physicalRoutersConfig() { }); //initializing physical router type multi select - $('#ddVirtualRouters').contrailDropdown({ + $('#ddVirtualRoutersType').contrailDropdown({ dataTextField:'text', dataValueField:'value', + change:onVrouterTypeChange, }); + + var vrType = $('#ddVirtualRoutersType').data('contrailDropdown'); + var vrTypeDS = [{ text : 'None', value : 'none'}, + { text : 'Embedded', value : 'embedded'}, + { text : 'TOR Agent', value : 'tor-agent'} + ]; + vrType.setData(vrTypeDS); + + $('#ddTorAgentName').contrailCombobox({ + dataTextField:'text', + dataValueField:'value', + minimumResultsForSearch : 1, + change:onTorAgentChange + }); + + $('#ddTsnName').contrailCombobox({ + dataTextField:'text', + dataValueField:'value', + minimumResultsForSearch : 1, + change:onTsnChange + }); + //initializing delete record window //deleteRecordWindowObj.modal({backdrop:'static',keyboard:false,show:false}); //deleteRecordWindowObj.find(".modal-header-title").text('Confirm'); @@ -156,6 +179,55 @@ function physicalRoutersConfig() { $('#confirmMainDelete').find(".modal-header-title").text('Confirm'); } + function onVrouterTypeChange(e){ + var inf = e.added.value; + if(inf === "tor-agent") { + $('#vRouterTorAgentFields').removeClass('hide').addClass('show'); + } else { + $('#vRouterTorAgentFields').removeClass('show').addClass('hide'); + } + } + + function onTorAgentChange(e){ +// var inf = e.added.value; + var torcb = $('#ddTorAgentName').data('contrailCombobox'); + var inf = torcb.value(); + var allData = torcb.getAllData(); + var isSelectedFromList = false; + $.each(allData,function(i,d){ + if(d.id == inf){ + isSelectedFromList = true; + } + }); + if(inf != null && isSelectedFromList){ + $('#txtTorAgentIp').val(inf); + $('#txtTorAgentIp').attr("disabled", "disabled"); + } else { + $('#txtTorAgentIp').val(''); + $('#txtTorAgentIp').removeAttr("disabled"); + } + } + + function onTsnChange(e){ +// var inf = e.added.value; + var tsncb = $('#ddTsnName').data('contrailCombobox'); + var inf = tsncb.value(); + var allData = tsncb.getAllData(); + var isSelectedFromList = false; + $.each(allData,function(i,d){ + if(d.id == inf){ + isSelectedFromList = true; + } + }); + if(inf != null && inf != '' && isSelectedFromList){ + $('#txtTsnIp').val(inf); + $('#txtTsnIp').attr("disabled", "disabled"); + } else { + $('#txtTsnIp').val(''); + $('#txtTsnIp').removeAttr("disabled"); + } + } + function initActions() { $('#btnCreatePhysicalRouter').click(function() { $('#addPhysicalRouterWindow').find(".modal-header-title").text('Add Physical Router'); @@ -264,9 +336,12 @@ function physicalRoutersConfig() { $('#msVN').data('contrailMultiselect').value(valueArr); if(gblSelRow.virtual_router != '-') $('#ddVirtualRouters').data('contrailDropdown').text(gblSelRow.virtual_router); + if(!(gblSelRow.virtualRouterType === 'Embedded')) { + $('#vRouterTorAgentFields').removeClass('hide').addClass('show'); + } } else { $('#ddBgpRouter').data('contrailDropdown').value('None'); - $('#ddVirtualRouters').data('contrailDropdown').value('None'); + $('#ddVirtualRoutersType').data('contrailDropdown').value('None'); } $('#addPhysicalRouterWindow').modal('show'); } @@ -286,7 +361,7 @@ function physicalRoutersConfig() { var password = $("#txtPassword").val(); var bgpRouter = $("#ddBgpRouter").data('contrailDropdown').text(); - var vRouters = $("#ddVirtualRouters").data('contrailDropdown').text(); + var vRoutersType = $("#ddVirtualRoutersType").data('contrailDropdown').text(); var postObject = {}; gridPhysicalRouters._dataView.setData([]); @@ -308,14 +383,8 @@ function physicalRoutersConfig() { } else { postObject["physical-router"]["bgp_router_refs"] = []; } - -// var vn = []; + var vns = $("#msVN").data('contrailMultiselect').getSelectedData(); -// for(var i= 0;i < vns.length; i++){ -// var v = vns[i]; -// var parts = v.split('*'); -// vn.push(parts); -// } if(vns.length > 0){ var vnRefs = []; for(var i = 0 ;i < vns.length ; i++){ @@ -326,8 +395,70 @@ function physicalRoutersConfig() { postObject["physical-router"]["virtual_network_refs"] = []; } - if(vRouters != 'None'){ - var virtualRouterRefs = [{"to":["default-global-system-config",vRouters]}]; + if(vRoutersType != 'None'){ + var virtualRouterRefs = []; + if(vRoutersType == 'Embedded'){ + postObject["physical-router"]['virtual_router_type'] = vRoutersType; + var virtualRouters = []; + postObject["physical-router"]["virtual-routers"] = []; + + virtualRouters.push({"virtual-router" : {"fq_name":["default-global-system-config", name], + "parent_type":"global-system-config", + "name": name, + "virtual_router_ip_address" : mgmtIpAddress, + "virtual_router_type" : ['embedded']}}); + virtualRouterRefs.push({"to":["default-global-system-config",name]}); + + } else {//ToR Agent case + var torcb = $('#ddTorAgentName').data('contrailCombobox'); + var tor = torcb.value(); + var allData = torcb.getAllData(); + var isTorSelectedFromList = false; + $.each(allData,function(i,d){ + if(d.id == tor){ + isTorSelectedFromList = true; + } + }); + + var tsncb = $('#ddTsnName').data('contrailCombobox'); + var tsn = tsncb.value(); + var tsnAllData = tsncb.getAllData(); + var isTsnSelectedFromList = false; + $.each(tsnAllData,function(i,d){ + if(d.id == tsn){ + isTsnSelectedFromList = true; + } + }); + + postObject["physical-router"]['virtual_router_type'] = vRoutersType; + var virtualRouters = []; + postObject["physical-router"]["virtual-routers"] = []; + + var torAgentName = $("#ddTorAgentName").data('contrailCombobox').text(); + var torAgentIp = $("#txtTorAgentIp").val(); + var tsnName = $("#ddTsnName").data('contrailCombobox').text(); + var tsnIp = $("#txtTsnIp").val(); + //TOR Agent + if(!isTorSelectedFromList){ + virtualRouters.push({"virtual-router" : {"fq_name":["default-global-system-config", torAgentName], + "parent_type":"global-system-config", + "name": torAgentName, + "virtual_router_ip_address" : torAgentIp, + "virtual_router_type" : ['tor-agent']}}); + } + virtualRouterRefs.push({"to":["default-global-system-config",torAgentName]}); + //TSN + if(!isTsnSelectedFromList){ + virtualRouters.push({"virtual-router" : {"fq_name":["default-global-system-config", tsnName], + "parent_type":"global-system-config", + "name": tsnName, + "virtual_router_ip_address" : tsnIp, + "virtual_router_type" : ['tor-service-node']}}); + } + virtualRouterRefs.push({"to":["default-global-system-config",tsnName]}); + } + + postObject["physical-router"]["virtual-routers"] = virtualRouters; postObject["physical-router"]["virtual_router_refs"] = virtualRouterRefs; } else { postObject["physical-router"]["virtual_router_refs"] = []; @@ -349,7 +480,7 @@ function physicalRoutersConfig() { $("#txtPassword").val(''); $("#ddBgpRouter").data('contrailDropdown').value('None'); $("#msVN").data('contrailMultiselect').value(''); - $("#ddVirtualRouters").data('contrailDropdown').value('None'); + $("#ddVirtualRoutersType").data('contrailDropdown').value('None'); } function fetchData() { @@ -426,23 +557,39 @@ function physicalRoutersConfig() { } function fetchVirtualRouters() { - doAjaxCall('/api/tenants/config/virtual-routers-list','GET', null, 'successHandlerForVirtualRouters', 'failureHandlerForVirtualRouters', null, null); + doAjaxCall('/api/tenants/config/virtual-routers','GET', null, 'successHandlerForVirtualRouters', 'failureHandlerForVirtualRouters', null, null); } window.successHandlerForVirtualRouters = function(result) { - var vRoutersDS = [{text : "None", value : "None"}]; - if(result && result['virtual-routers'].length > 0) { - var virtualRouters = result['virtual-routers']; - for(var i = 0; i < virtualRouters.length;i++) { - var virtualRouter = virtualRouters[i]; - vRoutersDS.push({text : virtualRouter.fq_name[1], value : virtualRouter.uuid}); + var torAgentVrouterDS = []; + var tsnVrouterDS = []; + if(result && result.length > 0) { + for(var i = 0; i < result.length;i++) { + var virtualRouter = result[i]['virtual-router']; + var vRouterType = (virtualRouter['virtual_router_type'])? virtualRouter['virtual_router_type'][0] : ''; + if(vRouterType == 'tor-agent'){ + //Tor agent can be assigned to only one prouter so dont include them in the list + if(!virtualRouter['physical_router_back_refs'] || virtualRouter['physical_router_back_refs'].length < 1) { + torAgentVrouterDS.push({text : virtualRouter.fq_name[1], value : virtualRouter.virtual_router_ip_address}); + } + } else if(vRouterType == 'tor-service-node'){ + tsnVrouterDS.push({text : virtualRouter.fq_name[1], value : virtualRouter.virtual_router_ip_address}); + } } - + if(torAgentVrouterDS.length < 1) { + torAgentVrouterDS.push({text : 'No ToR Agent found', value: 'Message'}); + } + if(tsnVrouterDS.length < 1) { + tsnVrouterDS.push({text : 'No TSN Agent found', value: 'Message'}); + } } else { - vRoutersDS.push({text : 'No Virtual Router found', value: 'Message'}); + torAgentVrouterDS.push({text : 'No ToR Agent found', value: 'Message'}); + tsnVrouterDS.push({text : 'No TSN found', value: 'Message'}); } - var vRouterDD = $('#ddVirtualRouters').data('contrailDropdown'); - vRouterDD.setData(vRoutersDS); + var torAgentDD = $('#ddTorAgentName').data('contrailCombobox'); + torAgentDD.setData(torAgentVrouterDS); + var tsnAgentDD = $('#ddTsnName').data('contrailCombobox'); + tsnAgentDD.setData(tsnVrouterDS); } window.failureHandlerForVirtualRouters = function(error) { diff --git a/webroot/config/physicaldevices/physicalrouters/ui/views/physicalrouters_config.view b/webroot/config/physicaldevices/physicalrouters/ui/views/physicalrouters_config.view index eeb48510b..fe6921c12 100644 --- a/webroot/config/physicaldevices/physicalrouters/ui/views/physicalrouters_config.view +++ b/webroot/config/physicaldevices/physicalrouters/ui/views/physicalrouters_config.view @@ -134,7 +134,53 @@
- + +
+
+
+
+
+
+
+ +
+
+
+ +
+ +
+ + +
+
+
+
+
+
+ +
+
+
+ +
+ +
+ + +
+
+
From 1ed638b2b52190e316b850a6b83ef5425d07c0d9 Mon Sep 17 00:00:00 2001 From: Siva Bavanasi Date: Wed, 22 Oct 2014 15:20:03 +0530 Subject: [PATCH 22/25] fixed setting proper values to virtual network and vmi dropdown in edit case Change-Id: I5cc2b87767695d59ac758e9ddbfbe31a2641c9b8 --- .../ui/js/physicalinterfaces_config.js | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/webroot/config/physicaldevices/physicalinterfaces/ui/js/physicalinterfaces_config.js b/webroot/config/physicaldevices/physicalinterfaces/ui/js/physicalinterfaces_config.js index bd26118d9..db4fc1dcc 100644 --- a/webroot/config/physicaldevices/physicalinterfaces/ui/js/physicalinterfaces_config.js +++ b/webroot/config/physicaldevices/physicalinterfaces/ui/js/physicalinterfaces_config.js @@ -11,6 +11,7 @@ function physicalInterfacesConfig() { var doubleCreation = false; var interfaceDelimiters = []; var vmiDetails = null; + var flow = null; //Method Definations this.load = load; this.destroy = destroy; @@ -213,6 +214,7 @@ function physicalInterfacesConfig() { function onVNSelChange(e) { var id = e.added.value; + flow = null; fetchVirtualNetworkInternals(id); } @@ -379,13 +381,14 @@ function physicalInterfacesConfig() { $('#ddType').data('contrailDropdown').text(gblSelRow.type); $('#ddType').data('contrailDropdown').enable(false); if(gblSelRow.type === 'Logical') { + flow = 'edit'; $('#vmSection').removeClass('hide').addClass('show'); if(gblSelRow.vlan != "-") { $('#txtVlan').val(gblSelRow.vlan); } if(gblSelRow.vn != '-') { var ddVN = $('#ddVN').data('contrailDropdown'); - ddVN.text(gblSelRow.vn); + ddVN.value(getCurrentVirtualNetworkId(gblSelRow.vn)); fetchVirtualNetworkInternals(ddVN.value()); } if(gblSelRow.li_type != '-') { @@ -397,6 +400,16 @@ function physicalInterfacesConfig() { } $('#addPhysicalInterfaceWindow').modal('show'); } + + function getCurrentVirtualNetworkId(name) { + var data = $('#ddVN').data('contrailDropdown').getAllData(); + for(var i = 0; i < data.length; i++) { + if(data[i].text.indexOf(name) !== -1) { + return data[i].value; + } + } + return ''; + } function createUpdatePhysicalInterface() { var methodType = 'POST'; @@ -478,20 +491,22 @@ function physicalInterfacesConfig() { $('#ddParent').data('contrailDropdown').value(ddPhysicalRouters.value()); $('#vmSection').removeClass('hide').addClass('show'); doubleCreation = false; - $('#ddParent').data('contrailDropdown').enable(false); + $('#ddParent').data('contrailDropdown').enable(true); $('#ddType').data('contrailDropdown').enable(true); $('#ddVN').data('contrailDropdown').value('none'); // $('#ddVMI').data('contrailDropdown').value('none'); $('#ddVMI').data('contrailCombobox').value('none'); $('#ddLIType').data('contrailDropdown').value('l2'); vmiDetails = null; + flow = null; $('#txtVMI').val(''); $('#txtVMI').attr('disabled', 'disabled'); $('#l2Server').attr('checked','checked'); $('#lblServer').text('Server'); $('#l3SubnetPanel').removeClass('show').addClass('hide'); $('#l2TypePanel').removeClass('hide').addClass('show'); - $('#l2ServerPanel').removeClass('hide').addClass('show'); + $('#l2ServerPanel').removeClass('hide').addClass('show'); + fetchVirtualNetworkInternals('none'); } function fetchPhysicalRouters() { @@ -576,10 +591,12 @@ function physicalInterfacesConfig() { if(id === 'empty' || id === '') { //$('#ddVMI').data('contrailDropdown').setData([{text : 'No Server found', value : 'empty'}]); $('#ddVMI').data('contrailCombobox').setData([{text : 'No Server found', value : 'empty'}]); + $('#ddVMI').data('contrailCombobox').value('empty'); } else if(id === 'none') { var vmiDataSrc = [{text : 'None', value : 'none'}]; //$('#ddVMI').data('contrailDropdown').setData(vmiDataSrc); $('#ddVMI').data('contrailCombobox').setData(vmiDataSrc); + $('#ddVMI').data('contrailCombobox').value('none'); }else { doAjaxCall('/api/tenants/config/virtual-network-internals/' + id,'GET', null, 'successHandlerForVNInternals', 'failureHandlerForVNInternals', null, null); } @@ -594,7 +611,7 @@ function physicalInterfacesConfig() { vmiDataSrc.push({text : txt, value : JSON.stringify(vmi.vmi_fq_name), ip : vmi.ip[0]}); } $('#ddVMI').data('contrailCombobox').setData(vmiDataSrc); - if(mode === 'edit' && gblSelRow.server != '-') { + if(flow === 'edit' && gblSelRow.server != '-') { // $('#ddVMI').data('contrailDropdown').text(gblSelRow.server); var vmiMac = gblSelRow.server.split('(')[0]; $('#ddVMI').data('contrailCombobox').text(vmiMac); From 0be135365025b5532a6075fdf313d1d6522efaad Mon Sep 17 00:00:00 2001 From: Manoj Naik Date: Wed, 22 Oct 2014 16:19:47 +0530 Subject: [PATCH 23/25] Baremetal : Some fixes Change-Id: Ie721aa36dfea72804f71c14fe5eda52c173817d3 --- .../ui/js/physicalrouters_config.js | 2 +- .../ui/views/physicalrouters_config.view | 52 +++++++++---------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/webroot/config/physicaldevices/physicalrouters/ui/js/physicalrouters_config.js b/webroot/config/physicaldevices/physicalrouters/ui/js/physicalrouters_config.js index 939cbb145..0f8b5bda8 100644 --- a/webroot/config/physicaldevices/physicalrouters/ui/js/physicalrouters_config.js +++ b/webroot/config/physicaldevices/physicalrouters/ui/js/physicalrouters_config.js @@ -335,7 +335,7 @@ function physicalRoutersConfig() { } $('#msVN').data('contrailMultiselect').value(valueArr); if(gblSelRow.virtual_router != '-') - $('#ddVirtualRouters').data('contrailDropdown').text(gblSelRow.virtual_router); + $('#ddVirtualRoutersType').data('contrailDropdown').text(gblSelRow.virtual_router); if(!(gblSelRow.virtualRouterType === 'Embedded')) { $('#vRouterTorAgentFields').removeClass('hide').addClass('show'); } diff --git a/webroot/config/physicaldevices/physicalrouters/ui/views/physicalrouters_config.view b/webroot/config/physicaldevices/physicalrouters/ui/views/physicalrouters_config.view index fe6921c12..87324d4a9 100644 --- a/webroot/config/physicaldevices/physicalrouters/ui/views/physicalrouters_config.view +++ b/webroot/config/physicaldevices/physicalrouters/ui/views/physicalrouters_config.view @@ -181,6 +181,7 @@
+
@@ -188,37 +189,36 @@
-
-