mkrieger/patchcablemgr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.3.14

Browse Source
This commit is contained in:
Garrett K 2021-02-16 03:37:08 +00:00
parent 5334bead17
commit 573cb074e7
2 changed files with 189 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

239
assets/pages/jquery.drawConnections.js
View File

@ -23,9 +23,16 @@ function crawlCabinet(){
$.each(pathSourceArray, function(pathSourceType, pathSource){ $.each(pathSourceArray, function(pathSourceType, pathSource){
var connectionArray = []; var connectionArray = [];
var trunkArray = []; var trunkArray = [];
var visitedPartitionArray = [];
if(pathSource !== undefined && pathSource !== false) { if(pathSource !== undefined && pathSource !== false) {
var selectedPort = $(pathSource); //var selectedPort = $(pathSource);
var selectedPortArray = [];
selectedPortArray.push($(pathSource));
// -=# TESTING #=-
var testConnectionArray = crawlCabinetConnections($(pathSource));
var testTrunkArray = crawlCabinetTrunks($(pathSource));
for(x=0; x<2; x++) { for(x=0; x<2; x++) {
if(x == 1) { if(x == 1) {
@ -44,78 +51,206 @@ function crawlCabinet(){
var peerPort = $(pathSource).data('portIndex'); var peerPort = $(pathSource).data('portIndex');
var selectedPort = $('#port-4-'+peerID+'-'+peerFace+'-'+peerDepth+'-'+peerPort); var selectedPort = $('#port-4-'+peerID+'-'+peerFace+'-'+peerDepth+'-'+peerPort);
//
selectedPortArray = [selectedPort];
} else { } else {
if(selectedPartitionPeerID != 'none') { if(selectedPartitionPeerID != 'none') {
trunkArray.push([selectedPartition, selectedPartitionPeerID]); trunkArray.push([selectedPartition, selectedPartitionPeerID]);
} }
var selectedPort = false; //var selectedPort = false;
selectedPortArray = [];
} }
} }
while($(selectedPort).length) { //while($(selectedPort).length) {
while($(selectedPortArray).length) {
// Crawl connection peer var workingSelectedPortArray = selectedPortArray;
var connectedPortIDString = $(selectedPort).data('connectedGlobalId'); $.each(workingSelectedPortArray, function(selectedPortIndex, selectedPort){
var connectedPortIDArray = JSON.parse(atob(connectedPortIDString));
// Crawl connection peer
if(connectedPortIDArray.length) { var connectedPortIDString = $(selectedPort).data('connectedGlobalId');
var peerPortFound = false; var connectedPortIDArray = JSON.parse(atob(connectedPortIDString));
var sourceSelectedPort = selectedPort;
var tempTrunkArray = []; if(connectedPortIDArray.length) {
$.each(connectedPortIDArray, function(index, connectedPortID){ var peerPortFound = false;
var connectedPort = $('#'+connectedPortID); var sourceSelectedPort = selectedPort;
if($(connectedPort).length) { var tempTrunkArray = [];
connectionArray.push([sourceSelectedPort, connectedPort]); $.each(connectedPortIDArray, function(index, connectedPortID){
var connectedPort = $('#'+connectedPortID);
var connectedPartition = $(connectedPort).closest('.partition'); if($(connectedPort).length) {
var connectedPartitionPeerID = $(connectedPartition).data('peerGlobalId');
if($('#'+connectedPartitionPeerID).length) {
var connectedPartitionPeer = $('#'+connectedPartitionPeerID); connectionArray.push([sourceSelectedPort, connectedPort]);
tempTrunkArray = [connectedPartition, connectedPartitionPeer];
//trunkArray.push([connectedPartition, connectedPartitionPeer]);
var connectedPartitionPeerIDArray = connectedPartitionPeerID.split('-'); var connectedPartition = $(connectedPort).closest('.partition');
var peerID = connectedPartitionPeerIDArray[2]; var connectedPartitionID = $(connectedPartition).attr('id');
var peerFace = connectedPartitionPeerIDArray[3]; var connectedPartitionPeerID = $(connectedPartition).data('peerGlobalId');
var peerDepth = connectedPartitionPeerIDArray[4];
var connectedPortIDArray = connectedPortID.split('-'); if($('#'+connectedPartitionPeerID).length) {
var peerPort = connectedPortIDArray[5];
selectedPort = $('#port-4-'+peerID+'-'+peerFace+'-'+peerDepth+'-'+peerPort); var connectedPartitionPeer = $('#'+connectedPartitionPeerID);
peerPortFound = true; if(!visitedPartitionArray.includes(connectedPartitionID)) {
} else { tempTrunkArray = [connectedPartition, connectedPartitionPeer];
if(connectedPartitionPeerID != 'none') { visitedPartitionArray.push(connectedPartitionID);
tempTrunkArray = [connectedPartition, connectedPartitionPeerID]; }
//trunkArray.push([connectedPartition, connectedPartitionPeerID]);
var connectedPartitionPeerIDArray = connectedPartitionPeerID.split('-');
var peerID = connectedPartitionPeerIDArray[2];
var peerFace = connectedPartitionPeerIDArray[3];
var peerDepth = connectedPartitionPeerIDArray[4];
var connectedPortIDArray = connectedPortID.split('-');
var peerPort = connectedPortIDArray[5];
selectedPort = $('#port-4-'+peerID+'-'+peerFace+'-'+peerDepth+'-'+peerPort);
//
selectedPortArray.push(selectedPort);
peerPortFound = true;
} else {
if(connectedPartitionPeerID != 'none') {
// Do not add duplicate trunk pairs
if(!visitedPartitionArray.includes(connectedPartitionID)) {
tempTrunkArray = [connectedPartition, connectedPartitionPeerID];
visitedPartitionArray.push(connectedPartitionID);
}
}
} }
} else {
connectionArray.push([selectedPort, connectedPortID]);
} }
});
} else { if(tempTrunkArray.length) {
connectionArray.push([selectedPort, connectedPortID]); trunkArray.push(tempTrunkArray);
} }
}); if(peerPortFound == false) {
if(tempTrunkArray.length) { //selectedPort = false;
trunkArray.push(tempTrunkArray); selectedPortArray = [];
}
} else {
connectionArray.push([selectedPort]);
//selectedPort = false;
selectedPortArray = [];
} }
if(peerPortFound == false) { });
selectedPort = false;
}
} else {
connectionArray.push([selectedPort]);
selectedPort = false;
}
} }
} }
} }
$(document).data(sourceTypeMap[pathSourceType][0], connectionArray); //$(document).data(sourceTypeMap[pathSourceType][0], connectionArray);
$(document).data(sourceTypeMap[pathSourceType][1], trunkArray); $(document).data(sourceTypeMap[pathSourceType][0], testConnectionArray);
$(document).data(sourceTypeMap[pathSourceType][1], testTrunkArray);
}); });
} }
function crawlCabinetConnections(localPort, connectionArray = [], visitedPortArray = []){
// Prevent loops
if(!visitedPortArray.includes($(localPort).attr('id'))) {
visitedPortArray.push($(localPort).attr('id'));
// Gather local peer ports
var localRemotePortString = $(localPort).data('connectedGlobalId');
var localRemotePortArray = JSON.parse(atob(localRemotePortString));
// Loop over each local peer port
$.each(localRemotePortArray, function(localRemotePortIndex, localRemotePort){
// Does peer port exist?
var remotePort = $('#'+localRemotePort);
if($(remotePort).length) {
// Add connection peers to connectionArray
connectionArray.push([localPort, remotePort]);
// Gather remote peer ports
var remoteRemotePortString = $(remotePort).data('connectedGlobalId');
var remoteRemoteConnectedArray = JSON.parse(atob(remoteRemotePortString));
// Loop over each remote peer port
$.each(remoteRemoteConnectedArray, function(remoteRemotePortIndex, remoteRemotePort){
if(remoteRemotePort !== localRemotePort) {
console.log(remoteRemotePort+' - '+localRemotePort);
crawlCabinetConnections($('#'+remoteRemotePort), connectionArray, visitedPortArray);
}
});
// Store remote partition trunk peer ID
var remotePartition = $(remotePort).closest('.partition');
var remotePartitionTrunkPeerID = $(remotePartition).data('peerGlobalId');
// Does remote partition trunk peer exist?
if($('#'+remotePartitionTrunkPeerID).length) {
// Extract remote partition trunk peer ID, Face, & Depth
var remotePartitionTrunkPeerIDArray = remotePartitionTrunkPeerID.split('-');
var peerID = remotePartitionTrunkPeerIDArray[2];
var peerFace = remotePartitionTrunkPeerIDArray[3];
var peerDepth = remotePartitionTrunkPeerIDArray[4];
// Extract localRemote
var localRemotePortIDArray = localRemotePort.split('-');
var peerPort = localRemotePortIDArray[5];
var trunkPeerPort = 'port-4-'+peerID+'-'+peerFace+'-'+peerDepth+'-'+peerPort;
crawlCabinetConnections($('#'+trunkPeerPort), connectionArray, visitedPortArray);
}
}
});
}
return connectionArray;
}
function crawlCabinetTrunks(localPort, trunkArray = [], visitedPartitionArray = []){
// Store partition
var localPortID = $(localPort).attr('id');
var localPartition = $(localPort).closest('.partition');
var localPartitionID = $(localPartition).attr('id');
// Prevent loops
if(!visitedPartitionArray.includes(localPartitionID)) {
// Append local partition ID to visitedPartitionArray
visitedPartitionArray.push(localPartitionID);
// Gather local trunk peer
var localRemotePartitionID = $(localPartition).data('peerGlobalId');
// Does trunk peer exist?
var remotePartition = $('#'+localRemotePartitionID);
if($(remotePartition).length) {
// Add trunk pair to trunkArray
trunkArray.push([localPartition, remotePartition]);
// Append remote partition ID to visitedPartitionArray
visitedPartitionArray.push(localRemotePartitionID);
// Extract remote partition ID, Face, & Depth
var localRemotePartitionIDArray = localRemotePartitionID.split('-');
var peerID = localRemotePartitionIDArray[2];
var peerFace = localRemotePartitionIDArray[3];
var peerDepth = localRemotePartitionIDArray[4];
// Extract local port ID
var localPortIDArray = localPortID.split('-');
var peerPort = localPortIDArray[5];
// Store trunk peer port
var remotePartitionPortID = 'port-4-'+peerID+'-'+peerFace+'-'+peerDepth+'-'+peerPort;
// Does remote partition port exist?
var remotePartitionPort = $('#'+remotePartitionPortID);
if($(remotePartitionPort).length) {
}
}
}
return trunkArray;
}
function drawCabinetConnections(){ function drawCabinetConnections(){
pathDataTypeArray = [ pathDataTypeArray = [

3
backend/process_cable.php
View File

@ -480,7 +480,8 @@ function validate($data, &$validate, &$qls){
$remoteTemplate = $qls->App->templateArray[$remoteTemplateID]; $remoteTemplate = $qls->App->templateArray[$remoteTemplateID];
$remoteTemplateFunction = $remoteTemplate['templateFunction']; $remoteTemplateFunction = $remoteTemplate['templateFunction'];
if($remoteTemplateFunction != 'Endpoint') { if($remoteTemplateFunction != 'Endpoint') {
$breakoutCableValid = false; //$breakoutCableValid = false;
$breakoutCableValid = true;
} }
} }