diff options
| -rw-r--r-- | API.txt | 24 | ||||
| -rw-r--r-- | ipalib/plugins/dns.py | 8 |
2 files changed, 8 insertions, 24 deletions
@@ -486,7 +486,7 @@ output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly output: Output('result', <type 'bool'>, 'True means the operation was successful') output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user") command: dnsrecord_add -args: 2,46,3 +args: 2,42,3 arg: Str('dnszoneidnsname', cli_name='dnszone', label=Gettext('Zone name', domain='ipa', localedir=None), query=True, required=True) arg: Str('idnsname', attribute=True, cli_name='name', label=Gettext('Record name', domain='ipa', localedir=None), multivalue=False, primary_key=True, required=True) option: Int('dnsttl', attribute=True, cli_name='ttl', label=Gettext('Time to live', domain='ipa', localedir=None), multivalue=False, required=False) @@ -509,21 +509,17 @@ option: List('dlvrecord?', attribute=True, cli_name='dlv_rec',ist('dlvrecord?', option: List('dnamerecord?', attribute=True, cli_name='dname_rec',ist('dnamerecord?', attribute=True, cli_name='dname_rec', doc='comma-separated list of DNAME records', label='DNAME record', multivalue=True) option: List('dnskeyrecord?', attribute=True, cli_name='dnskey_rec',ist('dnskeyrecord?', attribute=True, cli_name='dnskey_rec', doc='comma-separated list of DNSKEY records', label='DNSKEY record', multivalue=True) option: List('dsrecord?', attribute=True, cli_name='ds_rec',ist('dsrecord?', attribute=True, cli_name='ds_rec', doc='comma-separated list of DS records', label='DS record', multivalue=True) -option: List('hinforecord?', attribute=True, cli_name='hinfo_rec',ist('hinforecord?', attribute=True, cli_name='hinfo_rec', doc='comma-separated list of HINFO records', label='HINFO record', multivalue=True) option: List('hiprecord?', attribute=True, cli_name='hip_rec',ist('hiprecord?', attribute=True, cli_name='hip_rec', doc='comma-separated list of HIP records', label='HIP record', multivalue=True) option: List('ipseckeyrecord?', attribute=True, cli_name='ipseckey_rec',ist('ipseckeyrecord?', attribute=True, cli_name='ipseckey_rec', doc='comma-separated list of IPSECKEY records', label='IPSECKEY record', multivalue=True) option: List('keyrecord?', attribute=True, cli_name='key_rec',ist('keyrecord?', attribute=True, cli_name='key_rec', doc='comma-separated list of KEY records', label='KEY record', multivalue=True) option: List('kxrecord?', attribute=True, cli_name='kx_rec',ist('kxrecord?', attribute=True, cli_name='kx_rec', doc='comma-separated list of KX records', label='KX record', multivalue=True) option: List('locrecord?', attribute=True, cli_name='loc_rec',ist('locrecord?', attribute=True, cli_name='loc_rec', doc='comma-separated list of LOC records', label='LOC record', multivalue=True) -option: List('mdrecord?', attribute=True, cli_name='md_rec',ist('mdrecord?', attribute=True, cli_name='md_rec', doc='comma-separated list of MD records', label='MD record', multivalue=True) -option: List('minforecord?', attribute=True, cli_name='minfo_rec',ist('minforecord?', attribute=True, cli_name='minfo_rec', doc='comma-separated list of MINFO records', label='MINFO record', multivalue=True) option: List('mxrecord?', attribute=True, cli_name='mx_rec',ist('mxrecord?', attribute=True, cli_name='mx_rec', doc='comma-separated list of MX records', label='MX record', multivalue=True) option: List('naptrrecord?', attribute=True, cli_name='naptr_rec',ist('naptrrecord?', attribute=True, cli_name='naptr_rec', doc='comma-separated list of NAPTR records', label='NAPTR record', multivalue=True) option: List('nsrecord?', attribute=True, cli_name='ns_rec',ist('nsrecord?', attribute=True, cli_name='ns_rec', doc='comma-separated list of NS records', label='NS record', multivalue=True) option: List('nsecrecord?', attribute=True, cli_name='nsec_rec',ist('nsecrecord?', attribute=True, cli_name='nsec_rec', doc='comma-separated list of NSEC records', label='NSEC record', multivalue=True) option: List('nsec3record?', attribute=True, cli_name='nsec3_rec',ist('nsec3record?', attribute=True, cli_name='nsec3_rec', doc='comma-separated list of NSEC3 records', label='NSEC3 record', multivalue=True) option: List('nsec3paramrecord?', attribute=True, cli_name='nsec3param_rec',ist('nsec3paramrecord?', attribute=True, cli_name='nsec3param_rec', doc='comma-separated list of NSEC3PARAM records', label='NSEC3PARAM record', multivalue=True) -option: List('nxtrecord?', attribute=True, cli_name='nxt_rec',ist('nxtrecord?', attribute=True, cli_name='nxt_rec', doc='comma-separated list of NXT records', label='NXT record', multivalue=True) option: List('ptrrecord?', attribute=True, cli_name='ptr_rec',ist('ptrrecord?', attribute=True, cli_name='ptr_rec', doc='comma-separated list of PTR records', label='PTR record', multivalue=True) option: List('rrsigrecord?', attribute=True, cli_name='rrsig_rec',ist('rrsigrecord?', attribute=True, cli_name='rrsig_rec', doc='comma-separated list of RRSIG records', label='RRSIG record', multivalue=True) option: List('rprecord?', attribute=True, cli_name='rp_rec',ist('rprecord?', attribute=True, cli_name='rp_rec', doc='comma-separated list of RP records', label='RP record', multivalue=True) @@ -539,7 +535,7 @@ output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None)) output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user") command: dnsrecord_add_record -args: 2,41,3 +args: 2,37,3 arg: Str('dnszoneidnsname', cli_name='dnszone', label=Gettext('Zone name', domain='ipa', localedir=None), query=True, required=True) arg: Str('idnsname', attribute=True, cli_name='name', label=Gettext('Record name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True) option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output']) @@ -557,21 +553,17 @@ option: List('dlvrecord?', attribute=True, cli_name='dlv_rec',ist('dlvrecord?', option: List('dnamerecord?', attribute=True, cli_name='dname_rec',ist('dnamerecord?', attribute=True, cli_name='dname_rec', doc='comma-separated list of DNAME records', label='DNAME record', multivalue=True) option: List('dnskeyrecord?', attribute=True, cli_name='dnskey_rec',ist('dnskeyrecord?', attribute=True, cli_name='dnskey_rec', doc='comma-separated list of DNSKEY records', label='DNSKEY record', multivalue=True) option: List('dsrecord?', attribute=True, cli_name='ds_rec',ist('dsrecord?', attribute=True, cli_name='ds_rec', doc='comma-separated list of DS records', label='DS record', multivalue=True) -option: List('hinforecord?', attribute=True, cli_name='hinfo_rec',ist('hinforecord?', attribute=True, cli_name='hinfo_rec', doc='comma-separated list of HINFO records', label='HINFO record', multivalue=True) option: List('hiprecord?', attribute=True, cli_name='hip_rec',ist('hiprecord?', attribute=True, cli_name='hip_rec', doc='comma-separated list of HIP records', label='HIP record', multivalue=True) option: List('ipseckeyrecord?', attribute=True, cli_name='ipseckey_rec',ist('ipseckeyrecord?', attribute=True, cli_name='ipseckey_rec', doc='comma-separated list of IPSECKEY records', label='IPSECKEY record', multivalue=True) option: List('keyrecord?', attribute=True, cli_name='key_rec',ist('keyrecord?', attribute=True, cli_name='key_rec', doc='comma-separated list of KEY records', label='KEY record', multivalue=True) option: List('kxrecord?', attribute=True, cli_name='kx_rec',ist('kxrecord?', attribute=True, cli_name='kx_rec', doc='comma-separated list of KX records', label='KX record', multivalue=True) option: List('locrecord?', attribute=True, cli_name='loc_rec',ist('locrecord?', attribute=True, cli_name='loc_rec', doc='comma-separated list of LOC records', label='LOC record', multivalue=True) -option: List('mdrecord?', attribute=True, cli_name='md_rec',ist('mdrecord?', attribute=True, cli_name='md_rec', doc='comma-separated list of MD records', label='MD record', multivalue=True) -option: List('minforecord?', attribute=True, cli_name='minfo_rec',ist('minforecord?', attribute=True, cli_name='minfo_rec', doc='comma-separated list of MINFO records', label='MINFO record', multivalue=True) option: List('mxrecord?', attribute=True, cli_name='mx_rec',ist('mxrecord?', attribute=True, cli_name='mx_rec', doc='comma-separated list of MX records', label='MX record', multivalue=True) option: List('naptrrecord?', attribute=True, cli_name='naptr_rec',ist('naptrrecord?', attribute=True, cli_name='naptr_rec', doc='comma-separated list of NAPTR records', label='NAPTR record', multivalue=True) option: List('nsrecord?', attribute=True, cli_name='ns_rec',ist('nsrecord?', attribute=True, cli_name='ns_rec', doc='comma-separated list of NS records', label='NS record', multivalue=True) option: List('nsecrecord?', attribute=True, cli_name='nsec_rec',ist('nsecrecord?', attribute=True, cli_name='nsec_rec', doc='comma-separated list of NSEC records', label='NSEC record', multivalue=True) option: List('nsec3record?', attribute=True, cli_name='nsec3_rec',ist('nsec3record?', attribute=True, cli_name='nsec3_rec', doc='comma-separated list of NSEC3 records', label='NSEC3 record', multivalue=True) option: List('nsec3paramrecord?', attribute=True, cli_name='nsec3param_rec',ist('nsec3paramrecord?', attribute=True, cli_name='nsec3param_rec', doc='comma-separated list of NSEC3PARAM records', label='NSEC3PARAM record', multivalue=True) -option: List('nxtrecord?', attribute=True, cli_name='nxt_rec',ist('nxtrecord?', attribute=True, cli_name='nxt_rec', doc='comma-separated list of NXT records', label='NXT record', multivalue=True) option: List('ptrrecord?', attribute=True, cli_name='ptr_rec',ist('ptrrecord?', attribute=True, cli_name='ptr_rec', doc='comma-separated list of PTR records', label='PTR record', multivalue=True) option: List('rrsigrecord?', attribute=True, cli_name='rrsig_rec',ist('rrsigrecord?', attribute=True, cli_name='rrsig_rec', doc='comma-separated list of RRSIG records', label='RRSIG record', multivalue=True) option: List('rprecord?', attribute=True, cli_name='rp_rec',ist('rprecord?', attribute=True, cli_name='rp_rec', doc='comma-separated list of RP records', label='RP record', multivalue=True) @@ -587,7 +579,7 @@ output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly output: Entry('result', <type 'dict'>, Gettext('A dictionary representing an LDAP entry', domain='ipa', localedir=None)) output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user") command: dnsrecord_del -args: 2,42,3 +args: 2,38,3 arg: Str('dnszoneidnsname', cli_name='dnszone', label=Gettext('Zone name', domain='ipa', localedir=None), query=True, required=True) arg: Str('idnsname', attribute=True, cli_name='name', label=Gettext('Record name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=True) option: Flag('del_all', autofill=True, default=False, label=Gettext('Delete all associated records', domain='ipa', localedir=None)) @@ -606,21 +598,17 @@ option: List('dlvrecord?', attribute=True, cli_name='dlv_rec',ist('dlvrecord?', option: List('dnamerecord?', attribute=True, cli_name='dname_rec',ist('dnamerecord?', attribute=True, cli_name='dname_rec', doc='comma-separated list of DNAME records', label='DNAME record', multivalue=True) option: List('dnskeyrecord?', attribute=True, cli_name='dnskey_rec',ist('dnskeyrecord?', attribute=True, cli_name='dnskey_rec', doc='comma-separated list of DNSKEY records', label='DNSKEY record', multivalue=True) option: List('dsrecord?', attribute=True, cli_name='ds_rec',ist('dsrecord?', attribute=True, cli_name='ds_rec', doc='comma-separated list of DS records', label='DS record', multivalue=True) -option: List('hinforecord?', attribute=True, cli_name='hinfo_rec',ist('hinforecord?', attribute=True, cli_name='hinfo_rec', doc='comma-separated list of HINFO records', label='HINFO record', multivalue=True) option: List('hiprecord?', attribute=True, cli_name='hip_rec',ist('hiprecord?', attribute=True, cli_name='hip_rec', doc='comma-separated list of HIP records', label='HIP record', multivalue=True) option: List('ipseckeyrecord?', attribute=True, cli_name='ipseckey_rec',ist('ipseckeyrecord?', attribute=True, cli_name='ipseckey_rec', doc='comma-separated list of IPSECKEY records', label='IPSECKEY record', multivalue=True) option: List('keyrecord?', attribute=True, cli_name='key_rec',ist('keyrecord?', attribute=True, cli_name='key_rec', doc='comma-separated list of KEY records', label='KEY record', multivalue=True) option: List('kxrecord?', attribute=True, cli_name='kx_rec',ist('kxrecord?', attribute=True, cli_name='kx_rec', doc='comma-separated list of KX records', label='KX record', multivalue=True) option: List('locrecord?', attribute=True, cli_name='loc_rec',ist('locrecord?', attribute=True, cli_name='loc_rec', doc='comma-separated list of LOC records', label='LOC record', multivalue=True) -option: List('mdrecord?', attribute=True, cli_name='md_rec',ist('mdrecord?', attribute=True, cli_name='md_rec', doc='comma-separated list of MD records', label='MD record', multivalue=True) -option: List('minforecord?', attribute=True, cli_name='minfo_rec',ist('minforecord?', attribute=True, cli_name='minfo_rec', doc='comma-separated list of MINFO records', label='MINFO record', multivalue=True) option: List('mxrecord?', attribute=True, cli_name='mx_rec',ist('mxrecord?', attribute=True, cli_name='mx_rec', doc='comma-separated list of MX records', label='MX record', multivalue=True) option: List('naptrrecord?', attribute=True, cli_name='naptr_rec',ist('naptrrecord?', attribute=True, cli_name='naptr_rec', doc='comma-separated list of NAPTR records', label='NAPTR record', multivalue=True) option: List('nsrecord?', attribute=True, cli_name='ns_rec',ist('nsrecord?', attribute=True, cli_name='ns_rec', doc='comma-separated list of NS records', label='NS record', multivalue=True) option: List('nsecrecord?', attribute=True, cli_name='nsec_rec',ist('nsecrecord?', attribute=True, cli_name='nsec_rec', doc='comma-separated list of NSEC records', label='NSEC record', multivalue=True) option: List('nsec3record?', attribute=True, cli_name='nsec3_rec',ist('nsec3record?', attribute=True, cli_name='nsec3_rec', doc='comma-separated list of NSEC3 records', label='NSEC3 record', multivalue=True) option: List('nsec3paramrecord?', attribute=True, cli_name='nsec3param_rec',ist('nsec3paramrecord?', attribute=True, cli_name='nsec3param_rec', doc='comma-separated list of NSEC3PARAM records', label='NSEC3PARAM record', multivalue=True) -option: List('nxtrecord?', attribute=True, cli_name='nxt_rec',ist('nxtrecord?', attribute=True, cli_name='nxt_rec', doc='comma-separated list of NXT records', label='NXT record', multivalue=True) option: List('ptrrecord?', attribute=True, cli_name='ptr_rec',ist('ptrrecord?', attribute=True, cli_name='ptr_rec', doc='comma-separated list of PTR records', label='PTR record', multivalue=True) option: List('rrsigrecord?', attribute=True, cli_name='rrsig_rec',ist('rrsigrecord?', attribute=True, cli_name='rrsig_rec', doc='comma-separated list of RRSIG records', label='RRSIG record', multivalue=True) option: List('rprecord?', attribute=True, cli_name='rp_rec',ist('rprecord?', attribute=True, cli_name='rp_rec', doc='comma-separated list of RP records', label='RP record', multivalue=True) @@ -644,7 +632,7 @@ output: Output('summary', (<type 'unicode'>, <type 'NoneType'>), 'User-friendly output: Output('result', <type 'dict'>, 'list of deletions that failed') output: Output('value', <type 'unicode'>, "The primary_key value of the entry, e.g. 'jdoe' for a user") command: dnsrecord_find -args: 2,46,4 +args: 2,42,4 arg: Str('dnszoneidnsname', cli_name='dnszone', label=Gettext('Zone name', domain='ipa', localedir=None), query=True, required=True) arg: Str('criteria?') option: Str('idnsname', attribute=True, autofill=False, cli_name='name', label=Gettext('Record name', domain='ipa', localedir=None), multivalue=False, primary_key=True, query=True, required=False) @@ -667,21 +655,17 @@ option: List('dlvrecord', attribute=True, cli_name='dlv_rec',ist('dlvrecord', at option: List('dnamerecord', attribute=True, cli_name='dname_rec',ist('dnamerecord', attribute=True, cli_name='dname_rec', doc='comma-separated list of DNAME records', label='DNAME record', multivalue=True, query=True, required=False) option: List('dnskeyrecord', attribute=True, cli_name='dnskey_rec',ist('dnskeyrecord', attribute=True, cli_name='dnskey_rec', doc='comma-separated list of DNSKEY records', label='DNSKEY record', multivalue=True, query=True, required=False) option: List('dsrecord', attribute=True, cli_name='ds_rec',ist('dsrecord', attribute=True, cli_name='ds_rec', doc='comma-separated list of DS records', label='DS record', multivalue=True, query=True, required=False) -option: List('hinforecord', attribute=True, cli_name='hinfo_rec',ist('hinforecord', attribute=True, cli_name='hinfo_rec', doc='comma-separated list of HINFO records', label='HINFO record', multivalue=True, query=True, required=False) option: List('hiprecord', attribute=True, cli_name='hip_rec',ist('hiprecord', attribute=True, cli_name='hip_rec', doc='comma-separated list of HIP records', label='HIP record', multivalue=True, query=True, required=False) option: List('ipseckeyrecord', attribute=True, cli_name='ipseckey_rec',ist('ipseckeyrecord', attribute=True, cli_name='ipseckey_rec', doc='comma-separated list of IPSECKEY records', label='IPSECKEY record', multivalue=True, query=True, required=False) option: List('keyrecord', attribute=True, cli_name='key_rec',ist('keyrecord', attribute=True, cli_name='key_rec', doc='comma-separated list of KEY records', label='KEY record', multivalue=True, query=True, required=False) option: List('kxrecord', attribute=True, cli_name='kx_rec',ist('kxrecord', attribute=True, cli_name='kx_rec', doc='comma-separated list of KX records', label='KX record', multivalue=True, query=True, required=False) option: List('locrecord', attribute=True, cli_name='loc_rec',ist('locrecord', attribute=True, cli_name='loc_rec', doc='comma-separated list of LOC records', label='LOC record', multivalue=True, query=True, required=False) -option: List('mdrecord', attribute=True, cli_name='md_rec',ist('mdrecord', attribute=True, cli_name='md_rec', doc='comma-separated list of MD records', label='MD record', multivalue=True, query=True, required=False) -option: List('minforecord', attribute=True, cli_name='minfo_rec',ist('minforecord', attribute=True, cli_name='minfo_rec', doc='comma-separated list of MINFO records', label='MINFO record', multivalue=True, query=True, required=False) option: List('mxrecord', attribute=True, cli_name='mx_rec',ist('mxrecord', attribute=True, cli_name='mx_rec', doc='comma-separated list of MX records', label='MX record', multivalue=True, query=True, required=False) option: List('naptrrecord', attribute=True, cli_name='naptr_rec',ist('naptrrecord', attribute=True, cli_name='naptr_rec', doc='comma-separated list of NAPTR records', label='NAPTR record', multivalue=True, query=True, required=False) option: List('nsrecord', attribute=True, cli_name='ns_rec',ist('nsrecord', attribute=True, cli_name='ns_rec', doc='comma-separated list of NS records', label='NS record', multivalue=True, query=True, required=False) option: List('nsecrecord', attribute=True, cli_name='nsec_rec',ist('nsecrecord', attribute=True, cli_name='nsec_rec', doc='comma-separated list of NSEC records', label='NSEC record', multivalue=True, query=True, required=False) option: List('nsec3record', attribute=True, cli_name='nsec3_rec',ist('nsec3record', attribute=True, cli_name='nsec3_rec', doc='comma-separated list of NSEC3 records', label='NSEC3 record', multivalue=True, query=True, required=False) option: List('nsec3paramrecord', attribute=True, cli_name='nsec3param_rec',ist('nsec3paramrecord', attribute=True, cli_name='nsec3param_rec', doc='comma-separated list of NSEC3PARAM records', label='NSEC3PARAM record', multivalue=True, query=True, required=False) -option: List('nxtrecord', attribute=True, cli_name='nxt_rec',ist('nxtrecord', attribute=True, cli_name='nxt_rec', doc='comma-separated list of NXT records', label='NXT record', multivalue=True, query=True, required=False) option: List('ptrrecord', attribute=True, cli_name='ptr_rec',ist('ptrrecord', attribute=True, cli_name='ptr_rec', doc='comma-separated list of PTR records', label='PTR record', multivalue=True, query=True, required=False) option: List('rrsigrecord', attribute=True, cli_name='rrsig_rec',ist('rrsigrecord', attribute=True, cli_name='rrsig_rec', doc='comma-separated list of RRSIG records', label='RRSIG record', multivalue=True, query=True, required=False) option: List('rprecord', attribute=True, cli_name='rp_rec',ist('rprecord', attribute=True, cli_name='rp_rec', doc='comma-separated list of RP records', label='RP record', multivalue=True, query=True, required=False) diff --git a/ipalib/plugins/dns.py b/ipalib/plugins/dns.py index d4d06166d..1437011e5 100644 --- a/ipalib/plugins/dns.py +++ b/ipalib/plugins/dns.py @@ -84,10 +84,10 @@ from ipapython import dnsclient # supported resource record types _record_types = ( u'A', u'AAAA', u'A6', u'AFSDB', u'APL', u'CERT', u'CNAME', u'DHCID', u'DLV', - u'DNAME', u'DNSKEY', u'DS', u'HINFO', u'HIP', u'IPSECKEY', u'KEY', u'KX', - u'LOC', u'MD', u'MINFO', u'MX', u'NAPTR', u'NS', u'NSEC', u'NSEC3', - u'NSEC3PARAM', u'NXT', u'PTR', u'RRSIG', u'RP', u'SIG', u'SPF', u'SRV', - u'SSHFP', u'TA', u'TKEY', u'TSIG', u'TXT', + u'DNAME', u'DNSKEY', u'DS', u'HIP', u'IPSECKEY', u'KEY', u'KX', u'LOC', + u'MX', u'NAPTR', u'NS', u'NSEC', u'NSEC3', u'NSEC3PARAM', u'PTR', + u'RRSIG', u'RP', u'SIG', u'SPF', u'SRV', u'SSHFP', u'TA', u'TKEY', + u'TSIG', u'TXT', ) # attributes derived from record types |