summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--API.txt2
-rw-r--r--install/ui/host.js10
-rw-r--r--install/ui/test/data/ipa_init.json68
-rw-r--r--ipalib/plugins/host.py1
4 files changed, 58 insertions, 23 deletions
diff --git a/API.txt b/API.txt
index 87a6e79ce..17a470bf4 100644
--- a/API.txt
+++ b/API.txt
@@ -1286,7 +1286,7 @@ option: Flag('random', attribute=True, autofill=True, cli_name='random', default
option: Bytes('usercertificate', validate_certificate, attribute=True, cli_name='certificate', label=Gettext('Certificate', domain='ipa', localedir=None), multivalue=False, required=False)
option: Flag('force', autofill=True, default=False, label=Gettext('Force', domain='ipa', localedir=None))
option: Flag('no_reverse', autofill=True, default=False)
-option: Str('ip_address?', validate_ipaddr)
+option: Str('ip_address?', validate_ipaddr, label=Gettext('IP Address', domain='ipa', localedir=None))
option: Flag('all', autofill=True, cli_name='all', default=False, exclude='webui', flags=['no_output'])
option: Flag('raw', autofill=True, cli_name='raw', default=False, exclude='webui', flags=['no_output'])
option: Str('version?', exclude='webui', flags=['no_option', 'no_output'])
diff --git a/install/ui/host.js b/install/ui/host.js
index bd149178e..702d0cb83 100644
--- a/install/ui/host.js
+++ b/install/ui/host.js
@@ -98,8 +98,14 @@ IPA.entity_factories.host = function () {
editable: true,
undo: false
},
- {factory:IPA.force_host_add_checkbox_widget}
- ]
+ {factory:IPA.force_host_add_checkbox_widget},
+ {
+ factory:IPA.text_widget,
+ name:"ip_address",
+ undo:false,
+ label: IPA.get_method_option('host_add','ip_address')['label']
+ }
+ ]
}).
build();
};
diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json
index b7df77797..b74e1b41a 100644
--- a/install/ui/test/data/ipa_init.json
+++ b/install/ui/test/data/ipa_init.json
@@ -169,7 +169,7 @@
"pattern_errmsg": null,
"primary_key": false,
"query": false,
- "required": true,
+ "required": false,
"type": "unicode"
}
]
@@ -429,7 +429,7 @@
"pattern_errmsg": null,
"primary_key": false,
"query": false,
- "required": true,
+ "required": false,
"type": "unicode"
}
]
@@ -3855,7 +3855,7 @@
"flags": [],
"hint": null,
"include": null,
- "label": "<ip_address>",
+ "label": "IP Address",
"length": null,
"maxlength": null,
"minlength": null,
@@ -7288,7 +7288,7 @@
"pattern_errmsg": null,
"primary_key": false,
"query": false,
- "required": false,
+ "required": true,
"type": "unicode"
}
]
@@ -10371,12 +10371,16 @@
"memberof": [
"group",
"netgroup",
- "role"
+ "role",
+ "hbacrule",
+ "sudorule"
],
"memberofindirect": [
"group",
"netgroup",
- "role"
+ "role",
+ "hbacrule",
+ "sudorule"
]
},
"bindable": false,
@@ -11348,15 +11352,22 @@
"managedby": [
"host"
],
+ "managing": [
+ "host"
+ ],
"memberof": [
"hostgroup",
"netgroup",
- "role"
+ "role",
+ "hbacrule",
+ "sudorule"
],
"memberofindirect": [
"hostgroup",
"netgroup",
- "role"
+ "role",
+ "hbacrule",
+ "sudorule"
]
},
"bindable": true,
@@ -11416,6 +11427,11 @@
"man_by_",
"not_man_by_"
],
+ "managing": [
+ "Managing",
+ "man_",
+ "not_man_"
+ ],
"memberof": [
"Member Of",
"in_",
@@ -11751,11 +11767,15 @@
"hostgroup"
],
"memberof": [
- "hostgroup"
+ "hostgroup",
+ "hbacrule",
+ "sudorule"
],
"memberofindirect": [
"host",
- "hostgroup"
+ "hostgroup",
+ "hbacrule",
+ "sudorule"
]
},
"bindable": false,
@@ -13751,7 +13771,8 @@
"memberuser",
"memberhost",
"memberallowcmd",
- "memberdenycmd"
+ "memberdenycmd",
+ "ipasudoopt"
],
"hidden_attributes": [
"objectclass",
@@ -14491,12 +14512,16 @@
"memberof": [
"group",
"netgroup",
- "role"
+ "role",
+ "hbacrule",
+ "sudorule"
],
"memberofindirect": [
"group",
"netgroup",
- "role"
+ "role",
+ "hbacrule",
+ "sudorule"
]
},
"bindable": true,
@@ -14507,6 +14532,9 @@
"sn",
"homedirectory",
"loginshell",
+ "uidnumber",
+ "gidnumber",
+ "mail",
"ou",
"telephonenumber",
"title",
@@ -15594,30 +15622,30 @@
"Administrator"
],
"gidnumber": [
- "469800000"
+ "1488000000"
],
"homedirectory": [
"/home/admin"
],
"ipauniqueid": [
- "31758798-8707-11e0-9000-525400b55a47"
+ "8c37adc4-9949-11e0-a3ce-525400b55a47"
],
"krbextradata": [
{
- "__base64__": "AAIiXN1Ncm9vdC9hZG1pbkBTRVJWRVIxNS5BWU9VTkcuQk9TVE9OLkRFVkVMLlJFREhBVC5DT00A"
+ "__base64__": "AAJl/vtNcm9vdC9hZG1pbkBTRVJWRVIxNS5BWU9VTkcuQk9TVE9OLkRFVkVMLlJFREhBVC5DT00A"
},
{
"__base64__": "AAgBAA=="
}
],
"krblastpwdchange": [
- "20110525194434Z"
+ "20110618012453Z"
],
"krblastsuccessfulauth": [
- "20110525211013Z"
+ "20110620185940Z"
],
"krbpasswordexpiration": [
- "20110823194434Z"
+ "20110916012453Z"
],
"krbprincipalname": [
"admin@SERVER15.AYOUNG.BOSTON.DEVEL.REDHAT.COM"
@@ -15647,7 +15675,7 @@
"admin"
],
"uidnumber": [
- "469800000"
+ "1488000000"
]
}
],
diff --git a/ipalib/plugins/host.py b/ipalib/plugins/host.py
index e9fb943a6..ec58e1e40 100644
--- a/ipalib/plugins/host.py
+++ b/ipalib/plugins/host.py
@@ -361,6 +361,7 @@ class host_add(LDAPCreate):
),
Str('ip_address?', validate_ipaddr,
doc=_('Add the host to DNS with this IP address'),
+ label=_('IP Address'),
),
)