diff options
author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2014-01-17 14:47:54 +0200 |
---|---|---|
committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2014-01-17 15:34:53 +0200 |
commit | c0be1f26ec77439770ded5482142f1e3237eb4e6 (patch) | |
tree | 50d021ee38e980e4e9fbcb05177ca99b665029ed /acf2/modules/net.lua | |
parent | 1ea210d97969bc8da465c0f35b2abd3678af08e3 (diff) | |
download | aconf-c0be1f26ec77439770ded5482142f1e3237eb4e6.tar.bz2 aconf-c0be1f26ec77439770ded5482142f1e3237eb4e6.tar.xz |
model: make '_' and '-' interchangeable in model field namesv0.2.1
Diffstat (limited to 'acf2/modules/net.lua')
-rw-r--r-- | acf2/modules/net.lua | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/acf2/modules/net.lua b/acf2/modules/net.lua index f3a9fc0..32b9d20 100644 --- a/acf2/modules/net.lua +++ b/acf2/modules/net.lua @@ -19,7 +19,7 @@ local Resolv = M.new() Resolv.servers = M.List{ type=M.net.IPAddress, addr='nameserver/#', widget='inline' } -Resolv['search-domains'] = M.List{ +Resolv.search_domains = M.List{ type=M.String, addr='search/domain/#', widget='inline' } @@ -131,7 +131,7 @@ Interface.type = M.String{ compute=function(self, iface) if #iface.slaves > 0 then return 'bond' end if #iface.ports > 0 then return 'bridge' end - if iface['vlan-tag'] then return 'vlan' end + if iface.vlan_tag then return 'vlan' end end, editable=function(self, iface) return not iface:auto_vlan_tag() end, required=true, @@ -192,7 +192,7 @@ Interface.trunk = M.Reference{ addr='@family/link/@method/none/vlan-raw-device' } -- TODO ensure that (trunk, tag) is unique -Interface['vlan-tag'] = M.Integer{ +Interface.vlan_tag = M.Integer{ condition={type='vlan'}, compute='auto_vlan_tag', required=true, @@ -234,13 +234,13 @@ Interface.stats = M.Collection{ local Net = M.new() -Net['host-name'] = M.String{addr='/augeas/etc/hostname/hostname'} +Net.host_name = M.String{addr='/augeas/etc/hostname/hostname'} Net.hosts = M.List{type=Host, addr='/augeas/etc/hosts', layout='tabular'} Net.resolver = M.Model{ model=Resolv, addr='/augeas/etc/resolv.conf', ui_name='DNS resolver' } -Net['enabled-ifaces'] = M.List{ +Net.enabled_ifaces = M.List{ type=M.Set{type=M.Reference{scope='../../interfaces', on_delete='set-null'}}, visible=false, addr=iface_aug_addr..'/auto/#' |