NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pool view: Interface panel and network creation

Browse Source
This commit is contained in:
Pierre
2016-03-04 12:44:03 +01:00
parent b67a99af3d
commit 959ea86d85
3 changed files with 134 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/modules/host/view.jade
View File

@@ -352,6 +352,7 @@
| Interfaces
.panel-body
table.table.table-hover
th.col-md-1 Network
th.col-md-1 Device
th.col-md-1 VLAN
th.col-md-1 Address
@@ -359,6 +360,7 @@
th.col-md-1 MTU
th.col-md-1 Link status
tr(ng-repeat="PIF in host.$PIFs | resolve | orderBy:natural('name_label') track by PIF.id")
td {{(PIF.$network | resolve).name_label}}
td
| {{PIF.device}} 
span.label.label-primary(ng-if="PIF.management") XAPI
@@ -414,7 +416,7 @@
.form-group
button.btn.btn-primary(type = 'submit')
i.fa.fa-plus-square
| Create
| Create
span(ng-if = 'createNetworkWaiting')
|  
i.xo-icon-loading-sm

56
app/modules/pool/index.js
View File

@@ -19,7 +19,7 @@ export default angular.module('xoWebApp.pool', [
template: view
})
})
.controller('PoolCtrl', function ($scope, $stateParams, xoApi, xo, modal) {
.controller('PoolCtrl', function ($scope, $stateParams, xoApi, xo, modal, notify) {
{
const {id} = $stateParams
const hostsByPool = xoApi.getIndex('hostsByPool')
@@ -133,6 +133,60 @@ export default angular.module('xoWebApp.pool', [
})
}
$scope.canAdmin = function (id = undefined) {
if (id === undefined) {
id = $scope.pool && $scope.pool.id
}
return id && xoApi.canInteract(id, 'administrate') || false
}
$scope.connectPIF = function (id) {
console.log(`Connect PIF ${id}`)
xoApi.call('pif.connect', {id: id})
}
$scope.disconnectPIF = function (id) {
console.log(`Disconnect PIF ${id}`)
xoApi.call('pif.disconnect', {id: id})
}
$scope.removePIF = function (id) {
console.log(`Remove PIF ${id}`)
xoApi.call('pif.delete', {id: id})
}
$scope.createNetwork = function (name, description, pif, mtu, vlan) {
$scope.createNetworkWaiting = true
notify.info({
title: 'Network creation...',
message: 'Creating the network'
})
const params = {
pool: $scope.pool.id,
name: name
}
if (mtu) {
params.mtu = mtu
}
if (pif) {
params.pif = pif
}
if (vlan) {
params.vlan = vlan
}
if (description) {
params.description = description
}
return xoApi.call('pool.createNetwork', params).then(function () {
$scope.creatingNetwork = false
$scope.createNetworkWaiting = false
})
}
// $scope.patchPool = ($files, id) ->
// file = $files[0]
// xo.pool.patch id

76
app/modules/pool/view.jade
View File

@@ -139,6 +139,82 @@
span.pull-right.btn-group.quick-buttons
a(ng-if="SR.id !== pool.default_SR", xo-click="setDefaultSr(SR.id)")
i.fa.fa-hdd-o.fa-lg(tooltip="Set as default SR")
//- Networks/Interfaces panel
.grid-sm
.panel.panel-default
.panel-heading.panel-title
i.xo-icon-network
| Interfaces
.panel-body
table.table.table-hover
th.col-md-1 Network
th.col-md-1 Device
th.col-md-1 VLAN
th.col-md-1 Address
th.col-md-2 MAC
th.col-md-1 MTU
th.col-md-1 Link status
tr(ng-repeat="PIF in (pool.master | resolve).$PIFs | resolve | orderBy:natural('name_label') track by PIF.id")
td {{(PIF.$network | resolve).name_label}}
td
| {{PIF.device}} 
span.label.label-primary(ng-if="PIF.management") XAPI
td
span(ng-if="PIF.vlan > -1")
| {{PIF.vlan}}
span(ng-if="PIF.vlan == -1")
| -
td.oneliner {{PIF.IP}} ({{PIF.mode}})
td.oneliner {{PIF.MAC}}
td {{PIF.MTU}}
td(ng-if="PIF.attached")
span.label.label-success Connected
span.pull-right.btn-group.quick-buttons
a(tooltip="Disconnect this interface", xo-click="disconnectPIF(PIF.id)", ng-if = 'canAdmin()')
i.fa.fa-unlink.fa-lg
td(ng-if="!PIF.attached")
span.label.label-default Disconnected
span.pull-right.btn-group.quick-buttons
a(tooltip="Connect this interface", xo-click="connectPIF(PIF.id)", ng-if = 'canAdmin()')
i.fa.fa-link.fa-lg
a(tooltip="Remove this interface", xo-click="removePIF(PIF.id)", ng-if = 'canAdmin()')
i.fa.fa-trash-o.fa-lg
.text-right
button.btn(type="button", ng-class = '{"btn-success": creatingNetwork, "btn-primary": !creatingNetwork}', ng-click="creatingNetwork = !creatingNetwork", ng-hide = '!canAdmin()', ng-disabled = '!canAdmin()')
i.fa.fa-plus(ng-if = '!creatingNetwork')
i.fa.fa-minus(ng-if = 'creatingNetwork')
| Create Network
br
form.form-inline.text-right#createNetworkForm(ng-if = 'creatingNetwork', name = 'createNetworkForm', ng-submit = 'createNetwork(newNetworkName, newNetworkDescription, newNetworkPIF, newNetworkMTU, newNetworkVlan)')
fieldset(ng-disabled = 'createNetworkWaiting || !canAdmin()')
.form-group
label(for = 'newNetworkPIF') Interface 
select.form-control(ng-model = 'newNetworkPIF', ng-change = 'updateMTU(newNetworkPIF)', ng-options='(PIF | resolve).device for PIF in (pool.master | resolve).$PIFs')
option(value = '', disabled) None
|  
.form-group
label.control-label(for = 'newNetworkName') Name 
input#newNetworkName.form-control(type = 'text', ng-model = 'newNetworkName', required)
|  
.form-group
label.control-label(for = 'newNetworkDescription') Description 
input#newNetworkDescription.form-control(type = 'text', ng-model = 'newNetworkDescription', placeholder= 'Network created with Xen Orchestra')
|  
.form-group
label.control-label(for = 'newNetworkVlan') VLAN 
input#newNetworkVlan.form-control(type = 'text', ng-model = 'newNetworkVlan', placeholder = 'Defaut: no VLAN')
|  
.form-group
label(for = 'newNetworkMTU') MTU 
input#newNetworkMTU.form-control(type = 'text', ng-model = 'newNetworkMTU', placeholder = 'Default: 1500')
|  
.form-group
button.btn.btn-primary(type = 'submit')
i.fa.fa-plus-square
| Create
span(ng-if = 'createNetworkWaiting')
|  
i.xo-icon-loading-sm
.grid-sm
.grid-cell
.panel.panel-default