Skip to content

Commit

Permalink
20150826
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrea Dainese committed Aug 26, 2015
1 parent c36e1ba commit b4fd433
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 2 deletions.
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.9.0-68
0.9.0-70
20 changes: 20 additions & 0 deletions html/includes/__node.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1306,6 +1306,26 @@ public function setEthernets() {
}
}
break;
case 'acs':
for ($i = 0; $i < $this -> ethernet; $i++) {
if (isset($old_ethernets[$i])) {
// Previous interface found, copy from old one
$this -> ethernets[$i] = $old_ethernets[$i];
} else {
$n = 'Gi0/'.$i; // Interface name
try {
$this -> ethernets[$i] = new Interfc(Array('name' => $n, 'type' => 'ethernet'), $i);
} catch (Exception $e) {
error_log('ERROR: '.$GLOBALS['messages'][40020]);
error_log((string) $e);
return 40020;
}
}
// Setting CMD flags (virtual device and map to TAP device)
$this -> flags_eth .= ' -device %NICDRIVER%,netdev=net'.$i.',mac=50:'.sprintf('%02x', $this -> tenant).':'.sprintf('%02x', $this -> id / 512).':'.sprintf('%02x', $this -> id % 512).':00:'.sprintf('%02x', $i);
$this -> flags_eth .= ' -netdev tap,id=net'.$i.',ifname=vunl'.$this -> tenant.'_'.$this -> id.'_'.$i.',script=no';
}
break;
case 'asa':
for ($i = 0; $i < $this -> ethernet; $i++) {
if (isset($old_ethernets[$i])) {
Expand Down
2 changes: 1 addition & 1 deletion html/themes/default/js/new-functions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ function printPageLabList(folder) {
success: function(data) {
if (data['status'] == 'success') {
logger(1, 'DEBUG: folder "' + folder + '" found.');
html += '<div id="main-navbar" class="navbar" role="navigation"><div class="container-fluid"><div class="col-md-3 col-lg-3 navbar-header"><img height=100" src="/themes/default/images/logo-rr.png"/></div><div class="collapse navbar-collapse navbar-menubuilder"><ul class="nav navbar-nav navbar-right"><li class="navbar-item"><a class="item lab-list" href="#">Home</a></li><li><img src="/themes/default/images/vertical_dots.gif"></li><li class="dropdown navbar-item"><a class="dropdown-toggle item" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">Actions <span class="caret"></span></a><ul id="actions-menu" class="dropdown-menu"><li><a class="folder-add" href="#"><i class="glyphicon glyphicon-folder-close"></i> Add a new folder</a></li><li><a class="lab-add" href="#"><i class="glyphicon glyphicon-file"></i> Add a new lab</a></li><li><a class="selected-clone" href="#"><i class="glyphicon glyphicon-copy"></i> Clone selected labs</a></li><li><a class="selected-delete" href="#"><i class="glyphicon glyphicon-trash"></i> Delete selected objects</a></li><li><a class="selected-export" href="#"><i class="glyphicon glyphicon-export"></i> Export selected objects</a></li><li><a class="import" href="#"><i class="glyphicon glyphicon-import"></i> Import external objects</a></li><li><a class="folder-rename" href="#"><i class="glyphicon glyphicon-pencil"></i> Rename current folder</a></li></ul></li><li><img src="/themes/default/images/vertical_dots.gif"></li><li class="navbar-item"><a class="sysstatus item" href="#">System&nbsp;Status</a></li><li><img src="/themes/default/images/vertical_dots.gif"></li><li class="navbar-item"><a class="item" href="http://www.unetlab.com/" target="_blank">Help</a></li><li><img src="/themes/default/images/vertical_dots.gif"></li><li class="navbar-item"><a class="button-logout item" href="#">Logout</a></li></ul></div></div></div><div id="main-body" class="full-height"><div id="list-title"><div id="list-title-folders" class="col-md-3 col-lg-3">Folders in <span>' + folder + '</span></div><div id="list-title-labs" class="col-md-3 col-lg-3" style="margin-left: 10px; margin-right: 10px;">Labs</div><div id="list-title-info" class="col-md-6 col-lg-6" style="margin-right: -20px; padding-right: 20px;"></div></div><div id="list-body" class="full-height"><div class="col-md-3 col-lg-3 full-height" id="list-folders" data-path="' + folder + '"><ul>';
html += '<div id="main-navbar" class="navbar" role="navigation"><div class="container-fluid"><div class="col-md-3 col-lg-3 navbar-header"><img height=100" src="/themes/default/images/logo-rr.png"/></div><div class="collapse navbar-collapse navbar-menubuilder"><ul class="nav navbar-nav navbar-right"><li class="navbar-item"><a class="item lab-list" href="#">Home</a></li><li><img src="/themes/default/images/vertical_dots.gif"></li><li class="dropdown navbar-item"><a class="dropdown-toggle item" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">Actions <span class="caret"></span></a><ul id="actions-menu" class="dropdown-menu"><li><a class="folder-add" href="#"><i class="glyphicon glyphicon-folder-close"></i> Add a new folder</a></li><li><a class="lab-add" href="#"><i class="glyphicon glyphicon-file"></i> Add a new lab</a></li><li><a class="selected-clone" href="#"><i class="glyphicon glyphicon-copy"></i> Clone selected labs</a></li><li><a class="selected-delete" href="#"><i class="glyphicon glyphicon-trash"></i> Delete selected objects</a></li><li><a class="selected-export" href="#"><i class="glyphicon glyphicon-export"></i> Export selected objects</a></li><li><a class="import" href="#"><i class="glyphicon glyphicon-import"></i> Import external objects</a></li><!--<li><a class="folder-rename" href="#"><i class="glyphicon glyphicon-pencil"></i> Rename current folder</a></li>--></ul></li><li><img src="/themes/default/images/vertical_dots.gif"></li><li class="navbar-item"><a class="sysstatus item" href="#">System&nbsp;Status</a></li><li><img src="/themes/default/images/vertical_dots.gif"></li><li class="navbar-item"><a class="item" href="http://www.unetlab.com/" target="_blank">Help</a></li><li><img src="/themes/default/images/vertical_dots.gif"></li><li class="navbar-item"><a class="button-logout item" href="#">Logout</a></li></ul></div></div></div><div id="main-body" class="full-height"><div id="list-title"><div id="list-title-folders" class="col-md-3 col-lg-3">Folders in <span>' + folder + '</span></div><div id="list-title-labs" class="col-md-3 col-lg-3" style="margin-left: 10px; margin-right: 10px;">Labs</div><div id="list-title-info" class="col-md-6 col-lg-6" style="margin-right: -20px; padding-right: 20px;"></div></div><div id="list-body" class="full-height"><div class="col-md-3 col-lg-3 full-height" id="list-folders" data-path="' + folder + '"><ul>';

$.each(data['data']['folders'], function(id, object) {
// Adding all folders
Expand Down

0 comments on commit b4fd433

Please sign in to comment.