lab generator update (#30)

* conversion to frr

* Fixed bug for frr conversion

Fixed bug when a router was running both ospf and rip, the former would overwrite the latter. Now every frr.conf line is appended one after another.

* Fix makeBgpConf

appending "router bgp" to frr.conf instead of reassigning the string

* test

* updated electron (?)

* Added routing software option

* electron update (don't know)

* Update generateZip function to include
daemonOption parameter

* changed place drop down menu for routing software

* removed unused variable

* added routing software choice for single router

* custom commands for frr.conf can now be put in the appropriate text box

* corretto mispelling

* Solved bug where in model.js where frr.free was not initialised and didn't allow the lab to generate correctly

* Capitalised Frr

* selected frr as standard choice

* specified base image for terminal, ws, ns

* Corrected error where frr would be thrown out of bgp "mode" when adding bgp debug commands not allowing custom frr.conf commands to fall in the bgp section

* Update package-lock.json

* Update package.json

* Update package.json

* Delete package.json

* Create package.json

* removed daemonOption param

* removed code block that would have never run

* Updated DNS to new name daemon.
Fixed bug in DNS configuration (legacy bug?)

* Update index.html

* introduced text boxes to allow custom commands in frr.conf

* added paragraph level break in index.html between text boxes

Author: giovanni-grieco

index.html

@@ -401,7 +401,14 @@ <h4>
 								</div>
 
 								<div data-ng-show="machine.type=='router'">
-									<label>Dynamic routing: </label>
+									<label>Dynamic routing </label><br>
+									<span>Routing software:</span>
+									<select id="daemonDropDown" data-ng-model="machine.routingSoftware">
+										<option value="frr">FRR</option>
+										<option value="quagga">Quagga</option>
+									</select>
+									<br><br>
+									<span>Routing protocols:</span>
 									<p>
 										<input title="en" type="checkbox" value="router"
 											data-ng-model="machine.routing.rip.en" /> rip
@@ -443,10 +450,13 @@ <h4>
 											<input title="redistributec" type="checkbox" value="1"
 												data-ng-model="machine.routing.rip.connected" /> redistribute connected
 										</div>
-										<label>Directly in ripd.conf:</label>
+										<div>
+										<label data-ng-show="machine.routingSoftware == 'quagga'">Directly in ripd.conf:</label>
+										<label data-ng-show="machine.routingSoftware == 'frr'">Directly after rip config in frr.conf:</label>
 										<textarea title="free" rows="3" class="form-control"
 											data-ng-model="machine.routing.rip.free"></textarea>
 										<hr>
+										</div>
 									</div>
 									<p>
 										<input title="en" type="checkbox" value="ns"
@@ -457,7 +467,7 @@ <h4>
 											Network</span>
 										<span class="btn btn-danger" data-ng-click="removeOspfNetwork(machine)"
 											data-ng-disabled="machine.routing.ospf.network.length<=1">Remove
-											Newtork</span>
+											Network</span>
 										<div data-ng-repeat="onet in machine.routing.ospf.network track by $index">
 											<div>
 												<label>Network: </label>
@@ -502,10 +512,13 @@ <h4>
 													value="{{i.eth.number}}">eth{{i.eth.number}}</option>
 											</select>
 										</div>
-										<label>Directly in ospfd.conf:</label>
+										<div>
+										<label data-ng-show="machine.routingSoftware == 'quagga'">Directly in ospfd.conf:</label>
+										<label data-ng-show="machine.routingSoftware == 'frr'">Directly after ospf config in frr.conf:</label>
 										<textarea title="free" rows="3" class="form-control"
 											data-ng-model="machine.routing.ospf.free"></textarea>
 										<hr>
+										</div>
 									</div>
 									<p>
 										<input title="en" type="checkbox" value="router"
@@ -546,11 +559,18 @@ <h4>
 												data-ng-model="machine.routing.bgp.remote[$index].description" />
 										</div>
 										<div>
-											<label>Directly in bgpd.conf:</label>
+											<label data-ng-show="machine.routingSoftware == 'quagga'">Directly in bgpd.conf:</label>
+											<label data-ng-show="machine.routingSoftware == 'frr'">Directly after bgp config in frr.conf:</label>
 											<textarea title="free" rows="3" class="form-control"
 												data-ng-model="machine.routing.bgp.free"></textarea>
+											<hr>
 										</div>
 									</div>
+									<div data-ng-show="machine.routingSoftware == 'frr'">
+										<label>Directly in frr.conf:</label>
+										<textarea title="free" rows="3" class="form-control"
+											data-ng-model="machine.routing.frr.free"></textarea>
+									</div>
 								</div>
 							</td>
 						</tr>
@@ -723,4 +743,4 @@ <h4 class="modal-title">Running Commands</h4>
 	</div>
 </body>
 
-</html>
+</html>

src/lab-generator/controller.js

@@ -11,7 +11,6 @@ app.config(["$compileProvider",
 app.controller("nc", function ($location, $anchorScroll, $scope) {
 
 	$scope.app = "include/app.html";
-
 	$scope.labInfo = JSON.clone(labInfo);
 	$scope.netkit = [];
 	$scope.counter = 0;