Merge pull request #2 from HenilMistry/v2.0

V2.0

Author: HenilMistry

Asset/Examples/LabRequests/Simplest.txt

@@ -0,0 +1,40 @@
+Hi Lab team,
+Need the below mentioned connections for Provide ACL summary for all security ACLs
+
+Reserved in labtracker
+=================
+DUT(s)                      Yes
+Ixia Ports                  Yes
+
+DUTS
+=====
+bim260 - dm1-rack119-tb42
+
+Ixia Ports to be used
+=================================  
+dm1-rack107-ixia1          ---        slot 3/port 4
+dm1-rack107-ixia1          ---        slot 3/port 6
+dm1-rack107-ixia1          ---        slot 3/port 7
+dm1-rack107-ixia1          ---        slot 3/port 8
+
+DUTs to be moved
+===============
+1. Move bim260 to rack106-tb44 (1RU)
+(If the above location is already used, please rack it wherever the below connections can be made)
+
+Older connections to be removed
+=================================
+bim260 ---        Remove all existing connections, if any
+dm1-rack107-ixia1          ---         Remove all existing connections, if any 
+dm1-rack107-ixia1          ---         Remove all existing connections, if any
+dm1-rack107-ixia1          ---        Remove all existing connections, if any
+dm1-rack107-ixia1          ---        Remove all existing connections, if any
+
+IXIA-DUT CONNECTIONS
+=====================
+1G
+====
+dm1-rack107-ixia1  Port 3/4 (1G) -------------------- bim260 Et1 (1G)
+dm1-rack107-ixia1  Port 3/6 (1G) -------------------- bim260 Et2 (1G)
+dm1-rack107-ixia1  Port 3/7 (1G) -------------------- bim260 Et3 (1G)
+dm1-rack107-ixia1  Port 3/8 (1G) -------------------- bim260 Et4 (1G)

Asset/ReleaseNotes/v1-2.txt

@@ -0,0 +1,14 @@
+LabRequestor 1.2
+========================================
+
+: Points addressed by DEV. :
+----------------------------------------
+- Closable and Cancellable Node Configuration Dialog Box
+- Alerts when necessary
+- Add Modern Alerts
+- When node tool is selected and clicked on Generate Script button
+- When there are no nodes, Connection tool is selected and clicked on Generate Script button
+
+: Points addressed by Users :
+----------------------------------------
+- New Connection Configuration Dialog Box

Asset/Scripts/GuiHelpers/ConnectionHelper.js

@@ -1,20 +1,17 @@
 class ConnectionHelper {
-    constructor(nodeA, nodeB, context) {
-        this.a = nodeA;
-        this.b = nodeB;
+    constructor(nodeA, nodeB, context, portsList) {
         this.c = context;
         this.strokeColor = "Black";
-        this.DutPorts = [];
-        this.IxiaPort;
+        this.connectionProperties = new Connection(nodeA, nodeB, portsList);
     }
 
     draw() {
         this.c.beginPath();
         this.c.setLineDash([]);
         this.c.strokeStyle = this.strokeColor;
         this.c.lineWidth = 5;
-        this.c.moveTo(this.a.x,this.a.y);
-        this.c.lineTo(this.b.x,this.b.y);
+        this.c.moveTo(this.connectionProperties.nodeA.x,this.connectionProperties.nodeA.y);
+        this.c.lineTo(this.connectionProperties.nodeB.x,this.connectionProperties.nodeB.y);
         this.c.stroke();
         this.c.closePath();
     }
@@ -28,12 +25,9 @@ class ConnectionHelper {
         // example : lyd592-Et24/1---------100G---------------dm1-rack107-ixia1 - Port 5/5
         let finalString = "";
         Connections.forEach((connection) => {
-            if(connection.IxiaPort != null) { // DUT - TO - DUT 
-                if(connection.a.NodeProperties instanceof Dut) {
-                    finalString += connection.a.NodeProperties.alias+"-"+connection.DutPorts[0].identifier+"----------"+connection.DutPorts[0].speed+"----------"+connection.b.NodeProperties.location+"-"+connection.IxiaPort.identifier+"\n";
-                } else {
-                    finalString += connection.b.NodeProperties.alias+"-"+connection.DutPorts[0].identifier+"----------"+connection.DutPorts[0].speed+"----------"+connection.a.NodeProperties.location+"-"+connection.IxiaPort.identifier+"\n";
-                }
+            if(connection.connectionProperties.nodeA.NodeProperties instanceof Ixia || connection.connectionProperties.nodeB.NodeProperties instanceof Ixia) {
+                // either one of a node is ixia ...
+                finalString += connection.connectionProperties.getConnections();
             }
         });
         return finalString;
@@ -45,8 +39,8 @@ class ConnectionHelper {
         // example : smd420-Et33/1-------------400G------------Et3/1/1-cmp338
         let finalString = "";
         Connections.forEach((connection) => {
-            if(connection.IxiaPort == null) { // DUT - TO - DUT 
-                finalString += connection.a.NodeProperties.alias+"-"+connection.DutPorts[0].identifier+"----------"+connection.DutPorts[0].speed+"----------"+connection.DutPorts[1].identifier+"-"+connection.b.NodeProperties.alias+"\n";
+            if(connection.connectionProperties.nodeA.NodeProperties instanceof Dut && connection.connectionProperties.nodeB.NodeProperties instanceof Dut) {
+                finalString += connection.connectionProperties.getConnections();
             }
         });
         return finalString;

Asset/Scripts/GuiHelpers/NodeHelper.js

@@ -45,28 +45,12 @@ class Node {
         // example : gla358 - DO NOT MOVE
         if (this.NodeProperties instanceof Dut) {
             if (this.NodeProperties.movement == Dut.NO_MOVETO) {
-                return this.NodeProperties.alias + " - " + this.NodeProperties.movement;
+                return this.NodeProperties.alias + " - " + this.NodeProperties.movement+"\n";
             } else {
-                return this.NodeProperties.alias + " - MOVE TO " + this.NodeProperties.movement;
+                return this.NodeProperties.alias + " - MOVE TO " + this.NodeProperties.movement+"\n";
             }
         } else {
             return "";
         }
     }
-
-    getIxiaPorts() {
-        // example : dm1-rack107-ixia1 - Port 5/5 (100G)
-        if (this.NodeProperties instanceof Ixia) {
-            let finalString = "";
-            // for(let port in this.NodeProperties.ports) {
-                
-            // }
-            this.NodeProperties.ports.forEach((port) => {
-                finalString += this.NodeProperties.location + " - " + port.identifier + " (" + port.speed + ")\n";
-            });
-            return finalString;
-        } else {
-            return "";
-        }
-    }
 }

Asset/Scripts/Messages/alertModal.js

@@ -0,0 +1,28 @@
+const alertModal = new bootstrap.Modal('#alertModal');
+const alertModalLbl = document.getElementById('alertModalLbl');
+const alertModalBody = document.getElementById('alertModalBody');
+
+const defaultAlertLbl = "Alert!";
+const defaultAlertBody = "There is some alert!";
+
+function openAlertModal() {
+    openAlertModal(defaultAlertLbl, defaultAlertBody);
+}
+
+function openAlertModal(newLbl, newBody) {
+    changeAlertModalLbl(newLbl);
+    changeAlertModalBody(newBody);
+    alertModal.show();
+}
+
+function closeAlertModal() {
+    alertModal.hide();
+}
+
+function changeAlertModalLbl(newLbl) {
+    alertModalLbl.innerText = newLbl;
+}
+
+function changeAlertModalBody(newBody) {
+    alertModalBody.innerText = newBody;
+}

Asset/Scripts/Messages/confirmationModal.js

@@ -0,0 +1,47 @@
+const confirmationModal = new bootstrap.Modal('#confirmationModal');
+const confirmationModalLbl = document.getElementById('confirmationModalLbl');
+const confirmationModalBody = document.getElementById('confirmationModalBody');
+
+const defaultConfirmationLbl = "Are you sure ?";
+const defaultConfirmationBody = "Are you sure you want to proceed with the changes ?";
+
+function openConfirmationModal() {
+    openConfirmationModal(defaultConfirmationLbl, defaultConfirmationBody);
+}
+
+function openConfirmationModal(newLbl, newBody) {
+    changeConfirmationModalLbl(newLbl);
+    changeConfirmationModalBody(newBody);
+    confirmationModal.show();
+
+    return new Promise((resolve) => {
+        const confirmPositiveBtn = document.getElementById('confirmPositiveBtn');
+        const confirmNegativeBtn = document.getElementById('confirmNegativeBtn');
+        
+        confirmPositiveBtn.onclick = () => {
+            // Just for debugging ...
+            console.log("Clicked on Yes");
+            closeConfirmationModal();
+            resolve(true);
+        };
+
+        confirmNegativeBtn.onclick = () => {
+             // Just for debugging ...
+            console.log("Clicked on No");
+            closeConfirmationModal();
+            resolve(false);
+        };
+    });
+}
+
+function closeConfirmationModal() {
+    confirmationModal.hide();
+}
+
+function changeConfirmationModalLbl(newLbl) {
+    confirmationModalLbl.innerText = newLbl;
+}
+
+function changeConfirmationModalBody(newBody) {
+    confirmationModalBody.innerText = newBody;
+}

Asset/Scripts/ToolHelper/nodeToolManager.js

@@ -26,37 +26,30 @@ function closeNodeConfig() {
 function configureNode() {
     let newAlias = field_nodeAlias.value;
     let newLocation = field_location.value;
+    let newIxiaNode, newDutNode, newNode;
+    let isTypeIxia = false;
 
     // Check if type is ixia and no ports are configured ?...
     if(select_nodeType.value == "ixia") {
-        if(select_nodePorts.options.length == 0) {
-            alert("Configure at least one ixia port!");
-            return;
-        }
-        // collect the data and store ixia node...
-        let newPorts = ports; // defined in main.js ...
-        let newIxiaNode = new Ixia(newAlias, newLocation, newPorts);
+        newIxiaNode = new Ixia(newAlias, newLocation);
         NodeIxia.push(newIxiaNode);
-        ports = [];
-
-        let newNode = new Node(newAlias, lastX, lastY, 20, "Red", c);
-        newNode.NodeProperties = newIxiaNode;
-        Nodes.push(newNode);
-
+        isTypeIxia = true;
     } else { // collect the data and store DUT Node...
-        let newDutNode;
         if(chk_enableMoveTo.checked) {
             newDutNode = new Dut(newAlias, newLocation, field_moveTo.value);
         } else {
             newDutNode = new Dut(newAlias, newLocation, Dut.NO_MOVETO);
         }
         NodeDut.push(newDutNode);
-        ports = [];
+    }
 
-        let newNode = new Node(newAlias, lastX, lastY, 20, "Red", c);
+    newNode = new Node(newAlias, lastX, lastY, 20, "Red", c);
+    if (isTypeIxia) {
+        newNode.NodeProperties = newIxiaNode;
+    } else {
         newNode.NodeProperties = newDutNode;
-        Nodes.push(newNode);
     }
+    Nodes.push(newNode);
     closeNodeConfig();
 }