Skip to content

Commit

Permalink
Added configuration to show/hide features and other bug fixes
Browse files Browse the repository at this point in the history 
Change-Id: Ibbc44aa073c3767a5f4e0d613f6c8a4fa0010cd0
  • Loading branch information
@sbavanasi
sbavanasi committed Oct 20, 2014
1 parent a20ffc2 commit 4693fda
Show file tree
Hide file tree
Showing 5 changed files with 108 additions and 113 deletions.
47 changes: 31 additions & 16 deletions webroot/config/physicaldevices/physicalinterfaces/api/physicalinterfacesconfig.api.js
View file
Expand Up @@ -55,13 +55,15 @@ function getPhysicalInterfacesDetails(error, data, response, appData)
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);
if(data && data['physical-router'] != null) {
if(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);
}
}
var lRootInterfaces = data['physical-router']['logical_interfaces'];
if(lRootInterfaces != null && lRootInterfaces.length > 0) {
Expand All @@ -82,19 +84,25 @@ function getPhysicalInterfacesDetails(error, data, response, appData)
}
if(results.length > 0) {
var lInfDataObjArr = [];
var lInfReqUrl = null;
for(var i = 0; i < results.length; i++) {
var pInterface = results[i]['physical-interface'];
if(pInterface != null && 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);
}

}
var lInf = results[i]['logical-interface'];
if(lInf != null) {
lInfReqUrl = '/logical-interface/' + lInf['uuid'];
commonUtils.createReqObj(lInfDataObjArr, lInfReqUrl, global.HTTP_REQUEST_GET,
null, null, null, appData);
}
}
if(lInfDataObjArr.length > 0) {
async.map(lInfDataObjArr,
Expand Down Expand Up @@ -128,22 +136,29 @@ function getPhysicalInterfacesDetails(error, data, response, appData)
}
}
}

//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'];
var lInf = results[i]['logical-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]);
}
}
for(var j = 0; j < lInfDetails.length; j++) {
var lInterface = lInfDetails[j]['logical-interface'];
if(pInterface != null && (pInterface['uuid'] === lInterface['parent_uuid'])) {
pInterface['logical_interfaces'].push(lInfDetails[j]);
}
if(lInf != null) {
if(lInf['uuid'] == lInterface['uuid']) {
results[i]['logical-interface'] = lInterface;
}
}
}
}
}
commonUtils.handleJSONResponse(error, response, results)
commonUtils.handleJSONResponse(error, response, results);
});
} else {
//map logical interfaces to corresponding physical interface
Expand Down Expand Up @@ -338,10 +353,10 @@ function processVirtualMachineInterfaceDetails(response, appData, result, callba
var tempInstIPData = data.slice(total, total + instIpCnt);
total += instIpCnt;
var ipAddrs = jsonPath(tempInstIPData, "$..instance_ip_address");
//if(tempVMIResourceObj[i]['owner'] == null) {
if(tempVMIResourceObj[i]['owner'] == null || tempVMIResourceObj[i]['owner'] == "") {
resultJSON.push({"mac": tempVMIResourceObj[i]['mac'], "ip": ipAddrs,
"vmi_fq_name": tempVMIResourceObj[i]['fq_name'], "vn_refs" : tempVMIResourceObj[i]["vn_refs"]});
//}
}

}
if(callback != null) {
Expand Down
84 changes: 43 additions & 41 deletions webroot/config/physicaldevices/physicalinterfaces/ui/js/physicalinterfaces_config.js
View file
Expand Up @@ -10,8 +10,7 @@ function physicalInterfacesConfig() {
var dsSrcDest = [];
var doubleCreation = false;
var interfaceDelimiters = [];
var associatedVMIList = [];
//Method Definations
//Method Definations
this.load = load;
this.destroy = destroy;

Expand Down Expand Up @@ -42,7 +41,7 @@ function physicalInterfacesConfig() {
},
customControls: ['<a id="btnDeletePhysicalInterface" class="disabled-link" title="Delete Interface(s)"><i class="icon-trash"></i></a>',
'<a id="btnCreatePhysicalInterface" title="Create Interface"><i class="icon-plus"></i></a>',
'Routers: <div id="ddPhysicalRouters"/>',]
'Router: <div id="ddPhysicalRouters"/>',]
},
columnHeader : {
columns : [
Expand Down Expand Up @@ -244,7 +243,7 @@ function physicalInterfacesConfig() {
physicalInfName = infNameArry[0];
verifySetSelectedItem(physicalInfName, $('#ddParent').data('contrailDropdown'));
} else {
$('#ddParent').data('contrailDropdown').value(dsSrcDest[0].children[0].value);
$('#ddParent').data('contrailDropdown').value(dsSrcDest[0].children[1].value);
}
}
});
Expand Down Expand Up @@ -359,7 +358,7 @@ function physicalInterfacesConfig() {
var liType = $('#ddLIType').data('contrailDropdown').value();
var parent = $('#ddParent').data('contrailDropdown');
var ddVMIValue = $('#ddVMI').data('contrailDropdown').value();
var vmiData = ddVMIValue === 'none' ? ddVMIValue : JSON.parse(ddVMIValue);
var vmiData = ddVMIValue === 'none' || ddVMIValue == 'empty' || ddVMIValue == '' ? 'none' : JSON.parse(ddVMIValue);
if(pRouterDD.value() === parent.value()) {
postObject["logical-interface"] = {};
postObject["logical-interface"]["fq_name"] = ["default-global-system-config", pRouterDD.text(), name];
Expand Down Expand Up @@ -498,13 +497,7 @@ function physicalInterfacesConfig() {
for(var i = 0; i < result.length; i++) {
var vmi = result[i];
var txt = vmi.mac[0] + ' (' + vmi.ip[0] + ')';
// if(associatedVMIList.length > 0) {
// if(associatedVMIList.indexOf(txt) === -1) {
// vmiDataSrc.push({text : txt, value : JSON.stringify(vmi.vmi_fq_name)});
// }
// } else {
vmiDataSrc.push({text : txt, value : JSON.stringify(vmi.vmi_fq_name)});
// }
vmiDataSrc.push({text : txt, value : JSON.stringify(vmi.vmi_fq_name)});
}
$('#ddVMI').data('contrailDropdown').setData(vmiDataSrc);
if(mode === 'edit' && gblSelRow.server != '-') {
Expand Down Expand Up @@ -549,7 +542,9 @@ function physicalInterfacesConfig() {
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});
pRouterDS.push({text : 'Select the Router', value : 'dummy', disabled : true},
{text : pRouterDD.text(), value : pRouterDD.value(), parent : 'physical_router'});
var liDetails = {};
if(result && result.length > 0) {
var pInterfaces = result;
for(var i = 0; i < pInterfaces.length;i++) {
Expand All @@ -560,16 +555,17 @@ function physicalInterfacesConfig() {
} else {
pInterface = pInterfaces[i]['logical-interface'];
infType = "Logical";
liDetails = getLogicalInterfaceDetails(pInterface);
}
gridDS.push({
uuid : pInterface.uuid,
name : pInterface.name,
type : infType,
parent : pInterface.fq_name[1],
vlan : '-',
server : '-',
vn : '-',
li_type : '-'
vlan : liDetails.vlanTag,
server : liDetails.vmiDetails,
vn : liDetails.vnRefs,
li_type : liDetails.liType
});
var lInterfaces = pInterfaces[i]['physical-interface'] ? pInterfaces[i]['physical-interface']['logical_interfaces'] : null;
var lInterfaceNames = '';
Expand All @@ -578,35 +574,21 @@ function physicalInterfacesConfig() {
for(var j = 0; j < lInterfaces.length; j++) {
var lInterface = lInterfaces[j]['logical-interface'];
var lInterfaceName = lInterface.fq_name[3];
var vnRefs = '-';
var vlanTag = lInterface['logical_interface_vlan_tag'] ? lInterface['logical_interface_vlan_tag'] : '-' ;
var liType = lInterface['logical_interface_type'] ? lInterface['logical_interface_type'] : '-' ;
if(liType != '-') {
liType = liType === 'l2' ? 'L2' : 'L3';
}
if(lInterfaceNames === ''){
lInterfaceNames = lInterfaceName;
} else {
lInterfaceNames += ',' + lInterfaceName;
}
var vmiDetails = lInterface['vmi_details'] ? lInterface['vmi_details'].mac[0] +' ('+ lInterface['vmi_details'].ip[0] + ')' : '-';
if(vmiDetails != '-') {
vnRefs = lInterface['vmi_details']['vn_refs'] ? lInterface['vmi_details']['vn_refs'][0].to : '-';
if(vnRefs != '-') {
vnRefs = vnRefs[2] + ' (' + vnRefs[0] + ':' + vnRefs[1] + ')';
}
//associatedVMIList.push(vmiDetails);

}
liDetails = getLogicalInterfaceDetails(lInterface);
infDS.push({
uuid : lInterface.uuid,
name : lInterface.name,
type : "Logical",
parent : lInterface.fq_name[2],
vlan : vlanTag,
server : vmiDetails,
vn : vnRefs,
li_type : liType
vlan : liDetails.vlanTag,
server : liDetails.vmiDetails,
vn : liDetails.vnRefs,
li_type : liDetails.liType
});
}
var currPhysicalInfRow = getCurrentPhysicalInfRow(gridDS, pInterface.uuid);
Expand Down Expand Up @@ -663,8 +645,26 @@ function physicalInterfacesConfig() {
return '';
}

function getLogicalInterfaceDetails(inf) {
var vnRefs = '-';
var vlanTag = inf['logical_interface_vlan_tag'] ? inf['logical_interface_vlan_tag'] : '-' ;
var liType = inf['logical_interface_type'] ? inf['logical_interface_type'] : '-' ;
if(liType != '-') {
liType = liType === 'l2' ? 'L2' : 'L3';
}
var vmiDetails = inf['vmi_details'] ? inf['vmi_details'].mac[0] +' ('+ inf['vmi_details'].ip[0] + ')' : '-';
if(vmiDetails != '-') {
vnRefs = inf['vmi_details']['vn_refs'] ? inf['vmi_details']['vn_refs'][0].to : '-';
if(vnRefs != '-') {
vnRefs = vnRefs[2] + ' (' + vnRefs[0] + ':' + vnRefs[1] + ')';
}
}
return { vlanTag : vlanTag, liType : liType, vmiDetails : vmiDetails, vnRefs : vnRefs};
}

window.failureHandlerForPhysicalInterfaces = function(error) {
gridPhysicalInterfaces.showGridMessage("errorGettingData");
//gridPhysicalInterfaces.showGridMessage("errorGettingData");
fetchData();
}

function validate() {
Expand All @@ -673,10 +673,12 @@ function physicalInterfacesConfig() {
showInfoWindow("Enter a Interface Name","Input required");
return false;
}
var vlan = parseInt($('#txtVlan').val().trim());
if(isNaN(vlan) || vlan < 1 || vlan > 4095) {
showInfoWindow('Vlan ID should be in "1 - 4095" range', "Input required");
return false;
if($('#txtVlan').val() != '') {
var vlan = parseInt($('#txtVlan').val().trim());
if(isNaN(vlan) || vlan < 1 || vlan > 4094) {
showInfoWindow('Vlan ID should be in "1 - 4094" range', "Input required");
return false;
}
}
return true;
}
Expand Down

0 comments on commit 4693fda

Please sign in to comment.