1 --- zsh-5.0.5/Completion/Solaris/Command/_dladm Wed Nov 27 11:00:18 2013 |
1 diff --git a/Completion/Solaris/Command/_dladm b/Completion/Solaris/Command/_dladm |
2 +++ zsh-5.0.5/Completion/Solaris/Command/_dladm Fri Mar 28 16:00:53 2014 |
2 index cb598de..d6d0aa0 100644 |
3 @@ -1,5 +1,5 @@ |
3 --- a/Completion/Solaris/Command/_dladm |
4 #compdef dladm |
4 +++ b/Completion/Solaris/Command/_dladm |
5 -# Synced with the S11U1 build 19 man page |
5 @@ -60,15 +60,19 @@ _dladm_iblinks() { |
6 +# Synced with the S11U2 build 34 man page |
6 compadd "$@" - $(_call_program iblinks dladm show-ib -p -o link) |
7 |
|
8 _dladm_links() { |
|
9 compadd "$@" - $(dladm show-link -p -o link) |
|
10 @@ -61,15 +61,19 @@ |
|
11 compadd "$@" - $(dladm show-ib -p -o link) |
|
12 } |
7 } |
13 |
8 |
14 +_dladm_eoiblinks() { |
9 +_dladm_eoiblinks() { |
15 + compadd "$@" - $(dladm show-eoib -p -o link) |
10 + compadd "$@" - $(_call_program eoiblinks dladm show-eoib -p -o link) |
16 +} |
11 +} |
17 + |
12 + |
18 _dladm() { |
13 _dladm() { |
19 local context state line expl |
14 local curcontext="$curcontext" state line expl |
20 typeset -A opt_args |
15 typeset -A opt_args |
21 local -a subcmds |
16 local -a subcmds |
22 local -a linkprops linkprops_general linkprops_nonvlanvnic linkprops_wifi |
17 local -a linkprops linkprops_general linkprops_nonvlanvnic linkprops_wifi |
23 - local -a linkprops_ether linkprops_ib linkprops_iptun |
18 - local -a linkprops_ether linkprops_ib linkprops_iptun |
24 - local -a link_properties link_stats_properties vnic_properties |
19 - local -a link_properties link_stats_properties vnic_properties |
25 - local -a aggr_properties aggr_lacp_properties aggr_ext_properties |
20 - local -a aggr_properties aggr_lacp_properties aggr_ext_properties |
26 - local -a vlan_properties wifi_properties wifi_connect_properties |
21 - local -a vlan_properties wifi_properties wifi_connect_properties |
27 + local -a linkprops_ether linkprops_ib linkprops_iptun linkprops_aggr |
22 + local -a linkprops_ether linkprops_ib linkprops_iptun linkprops_aggr |
28 + local -a phys_properties link_properties vnic_properties |
23 + local -a phys_properties link_properties vnic_properties |
29 + local -a aggr_properties aggr_lacp_properties aggr_dlmp_properties aggr_ext_properties |
24 + local -a aggr_properties aggr_lacp_properties aggr_dlmp_properties aggr_ext_properties |
30 + local -a vlan_properties wifi_properties wifi_connect_properties eoib_properties |
25 + local -a vlan_properties wifi_properties wifi_connect_properties eoib_properties |
31 local -a ether_properties linkprop_properties secobj_properties |
26 local -a ether_properties linkprop_properties secobj_properties |
32 local -a bridge_properties bridge_stats_properties bridge_link_properties |
27 local -a bridge_properties bridge_stats_properties bridge_link_properties |
33 local -a bridge_link_stats_properties bridge_fwd_properties |
28 local -a bridge_link_stats_properties bridge_fwd_properties |
34 @@ -81,7 +85,7 @@ |
29 @@ -80,7 +84,7 @@ _dladm() { |
35 # TODO: some subcommands may take different arguments based on options |
30 # TODO: some subcommands may take different arguments based on options |
36 |
31 |
37 subcmds=( |
32 subcmds=( |
38 - "help" "show-ether" "show-ib" "show-usage" |
33 - help show-ether show-ib |
39 + "help" "show-ether" |
34 + help show-ether |
40 {"rename","show"}"-link" |
35 {add,create,delete,modify,remove,show}-{aggr,bridge} |
41 {"add","create","delete","modify","remove","show"}"-aggr" |
36 {rename,show}-link |
42 {"connect","disconnect","scan","show"}"-wifi" |
37 {connect,disconnect,scan,show}-wifi |
43 @@ -94,6 +98,7 @@ |
38 @@ -88,7 +92,8 @@ _dladm() { |
44 {"create","modify","delete","add","remove","show"}"-bridge" |
39 {create,delete,modify,show}-vlan |
45 {"create","modify","delete","show"}"-iptun" |
40 {delete,show}-phys |
46 {"create","delete","show"}"-part" |
41 {create,delete,modify,show}-{vnic,iptun} |
47 + {"create","delete","show"}"-eoib" "show-ib" |
42 - {create,delete,show}-{etherstub,secobj,part,cap} |
48 ) |
43 + {create,delete,show}-{etherstub,secobj,part,cap,eoib} |
49 |
44 + show-ib |
50 if [[ $service == "dladm" ]]; then |
45 ) |
51 @@ -110,10 +115,12 @@ |
46 |
52 fi |
47 if [[ $service == "dladm" ]]; then |
53 |
48 @@ -105,10 +110,11 @@ _dladm() { |
54 link_properties=( "link" "zone" "class" "mtu" "state" "over" ) |
49 fi |
55 - link_stats_properties=( "link" "ipackets" "rbytes" "ierrors" "opackets" "obytes" "oerrors" ) |
50 |
56 |
51 link_properties=( link zone class mtu state over ) |
57 + phys_properties=( "link" "media" "state" "speed" "duplex" "device" "vfs-avail" "vfs-inuse" "flags" ) |
52 - link_stats_properties=( link ipackets rbytes ierrors opackets obytes oerrors ) |
|
53 + phys_properties=( link media state speed duplex device vfs-avail vfs-inuse flags ) |
|
54 |
|
55 aggr_properties=( link policy addrpolicy lacpactivity lacptimer mode flags ) |
|
56 aggr_lacp_properties=( link port aggregatable sync coll dist defaulted expired ) |
|
57 + aggr_dlmp_properties=( link port flags state targets xtargets ) |
|
58 aggr_ext_properties=( link port speed duplex state address portstate ) |
|
59 |
|
60 vlan_properties=( link vid over flags ) |
|
61 @@ -118,11 +124,12 @@ _dladm() { |
|
62 |
|
63 ether_properties=( link ptype state auto speed-duplex pause rem_fault ) |
|
64 |
|
65 - linkprop_properties=( link property value default possible ) |
|
66 + linkprop_properties=( link property value effective default possible ) |
|
67 |
|
68 secobj_properties=( object class ) |
|
69 |
|
70 - vnic_properties=( link over speed macaddr macaddrtype ) |
|
71 + vnic_properties=( link over speed macaddr macaddrtype macaddrtypes vid |
|
72 + vids evs vport tenant vfs-assigned ) |
|
73 |
|
74 bridge_properties=( bridge address priority bmaxage bhellotime bfwddelay |
|
75 forceproto tctime tccount tchange desroot rootcost rootport |
|
76 @@ -139,23 +146,21 @@ _dladm() { |
|
77 |
|
78 part_properties=( link pkey over state flags ) |
|
79 |
|
80 - ib_properties=( link hcaguid portguid port state pkeys ) |
|
81 + ib_properties=( link hcaguid portguid port state gwname gwport gwid gwflags pkeys ) |
|
82 + eoib_properties=( link gwname gwport gwid speed macaddress over flags ) |
|
83 |
|
84 linkprops_general=( |
|
85 'autopush:streams modules' |
|
86 'cos:value:(0 1 2 3 4 5 6 7)' |
|
87 'cpus:processors' |
|
88 - 'cpus-effective' |
|
89 'etsbw-lcl:percentage:' |
|
90 'etsbw-lcl-advice' |
|
91 - 'etsbw-lcl-effective' |
|
92 - 'etsbw-rmt-effective' |
|
93 + 'etsbw-rmt-advice' |
|
94 + 'iov:value:(auto inherit on off)' |
|
95 'lro:value:(off on auto)' |
|
96 - 'lro-effective' |
|
97 'mac-address:MAC address' |
|
98 'maxbw:bandwith' |
|
99 'pool:pools' |
|
100 - 'pool-effective' |
|
101 'priority:priority:(high medium low)' |
|
102 'rxringsavail' |
|
103 'rxrings:value' |
|
104 @@ -171,13 +176,10 @@ _dladm() { |
|
105 'stp_mcheck:value:(0 1)' |
|
106 'protection:value:(mac-nospoof ip-nospoof dhcp-nospoof restricted)' |
|
107 'vsi-mgrid:IPv6 address' |
|
108 - 'vsi-mgrid-effective' |
|
109 'vsi-mgrid-enc:encoding:(oracle_v1 none)' |
|
110 - 'vsi-mgrid-enc-effective' |
|
111 'vsi-typeid:value' |
|
112 - 'vsi-typeid-effective' |
|
113 'vsi-vers:value' |
|
114 - 'vsi-vers-effective' |
|
115 + 'vswitching:value:(local remote auto)' |
|
116 'zone:zone:_zones' |
|
117 ) |
|
118 linkprops_nonvlanvnic=( |
|
119 @@ -185,7 +187,6 @@ _dladm() { |
|
120 'learn_decay:value' |
|
121 'learn_limit:value' |
|
122 'rxfanout:value' |
|
123 - 'rxfanout-effective:value' |
|
124 'stp:value:(0 1)' |
|
125 ) |
|
126 linkprops_wifi=( |
|
127 @@ -213,13 +214,11 @@ _dladm() { |
|
128 'en_10fdx_cap:value:(0 1)' |
|
129 'en_10hdx_cap:value:(0 1)' |
|
130 'flowctrl:value:(auto no rx tx pfc bi)' |
|
131 - 'flowctrl-effective' |
|
132 'gvrp-timeout:value' |
|
133 'mtu:value' |
|
134 'ntcs' |
|
135 'pfcmap:value' |
|
136 - 'pfcmap-lcl-effective' |
|
137 - 'pfcmap-rmt-effective' |
|
138 + 'pfcmap-rmt' |
|
139 'speed' |
|
140 'tagmode:value:(normal vlanonly)' |
|
141 'vlan-announce:value:(off gvrp)' |
|
142 @@ -231,9 +230,14 @@ _dladm() { |
|
143 "hoplimit:value" |
|
144 "encaplimit:value" |
|
145 ) |
|
146 + linkprops_aggr=( |
|
147 + 'probe-enabled:value:(true false)' |
|
148 + 'probe-ip:value:' |
|
149 + 'probe-fdt' |
|
150 + ) |
|
151 linkprops=( |
|
152 $linkprops_general $linkprops_wifi $linkprops_ether |
|
153 - $linkprops_ib $linkprops_iptun |
|
154 + $linkprops_ib $linkprops_iptun $linkprops_aggr |
|
155 ) |
|
156 |
|
157 case $service in |
|
158 @@ -247,12 +251,7 @@ _dladm() { |
|
159 '(-p --parseable)'{-p,--parseable}'[parseable output]' \ |
|
160 '-Z[display ZONE column in output]' \ |
|
161 '-z[zone]:zone:_sequence _zones' \ |
|
162 - - set1 \ |
|
163 '(-o --output)'{-o,--output}'[properties to display]:property:_values -s , "property" $link_properties' \ |
|
164 - - set2 \ |
|
165 - '(-s --statistics)'{-s,--statistics}'[display link statistics]' \ |
|
166 - '(-i --interval)'{-i,--interval}'[specify an interval]:interval:' \ |
|
167 - '(-o --output)'{-o,--output}'[properties to display]:property:_values -s , "property" $link_stats_properties' \ |
|
168 ':link name:_dladm_links' |
|
169 ;; |
|
170 |
|
171 @@ -268,14 +267,15 @@ _dladm() { |
|
172 '-D[show Data Center Bridging information]:featureset:(ets pfc)' \ |
|
173 '-H[show hardware resource usage]' \ |
|
174 '-L[display location information]' \ |
|
175 + '-l[For ETS DCB, show additional local information]' \ |
|
176 + '-r[For ETS DCB, show additional remote information]' \ |
|
177 '(-P --persistent)'{-P,--persistent}'[display persistent link configuration]' \ |
|
178 '(-p --parseable)'{-p,--parseable}'[parseable output]' \ |
|
179 '-m[display MAC address information]' \ |
|
180 + '-V[Display SR-IOV information]' \ |
|
181 '-Z[display ZONE column in output]' \ |
|
182 '-z[zone]:zone:_sequence _zones' \ |
|
183 - '(-s --statistics)'{-s,--statistics}'[display link statistics]' \ |
|
184 - '(-i --interval)'{-i,--interval}'[specify an interval]:interval:' \ |
|
185 - '(-o --output)'{-o,--output}'[properties to display]:property:_values -s , "property" link media state speed duplex device' \ |
|
186 + '(-o --output)'{-o,--output}'[properties to display]:property:_values -s , "property" $phys_properties' \ |
|
187 ':physical link name:_dladm_devs' |
|
188 ;; |
|
189 |
|
190 @@ -299,7 +299,7 @@ _dladm() { |
|
191 |
|
192 (modify-aggr) |
|
193 _arguments -A "-*" \ |
|
194 - '(-t --temporary)'{-t,--temporary}'[aggregation should be temporary]' \ |
|
195 + '(-t --temporary)'{-t,--temporary}'[modifications should be temporary]' \ |
|
196 '(-R --root)'{-R,--root}'[root directory]:directory:_path_files -/' \ |
|
197 '(-l --link)'{-l,--link}'[component link]:link:_dladm_links' \ |
|
198 '(-m --mode)'{-m,--mode}'[aggregation mode]:mode:(dlmp trunk)' \ |
|
199 @@ -319,7 +319,7 @@ _dladm() { |
|
200 |
|
201 (add-aggr) |
|
202 _arguments -A "-*" \ |
|
203 - '(-t --temporary)'{-t,--temporary}'[aggregation should be temporary]' \ |
|
204 + '(-t --temporary)'{-t,--temporary}'[additions should be temporary]' \ |
|
205 '(-R --root)'{-R,--root}'[root directory]:directory:_path_files -/' \ |
|
206 '(-l --link)'{-l,--link}'[component link]:link:_dladm_links' \ |
|
207 ':aggregate link name:_dladm_aggrs' |
|
208 @@ -327,7 +327,7 @@ _dladm() { |
|
209 |
|
210 (remove-aggr) |
|
211 _arguments -A "-*" \ |
|
212 - '(-t --temporary)'{-t,--temporary}'[aggregation should be temporary]' \ |
|
213 + '(-t --temporary)'{-t,--temporary}'[removals should be temporary]' \ |
|
214 '(-R --root)'{-R,--root}'[root directory]:directory:_path_files -/' \ |
|
215 '(-l --link)'{-l,--link}'[component link]:link:_dladm_aggr_ports' \ |
|
216 ':aggregate link name:_dladm_aggrs' |
|
217 @@ -337,8 +337,6 @@ _dladm() { |
|
218 _arguments -A "-*" \ |
|
219 '(-P --persistent)'{-P,--persistent}'[display persistent link configuration]' \ |
|
220 '(-p --parseable)'{-p,--parseable}'[parseable output]' \ |
|
221 - '(-s --statistics)'{-s,--statistics}'[display link statistics]' \ |
|
222 - '(-i --interval)'{-i,--interval}'[specify an interval]:interval:' \ |
|
223 '-Z[display ZONE column in output]' \ |
|
224 '-z[zone]:zone:_sequence _zones' \ |
|
225 ':aggregate link name:_dladm_links' \ |
|
226 @@ -347,6 +345,9 @@ _dladm() { |
|
227 - lacp \ |
|
228 '(-L --lacp)'{-L,--lacp}'[LACP information]' \ |
|
229 '(-o --output)'{-o,--output}'[properties to display]:property:_values -s , "property" $aggr_lacp_properties' \ |
|
230 + - dlmp \ |
|
231 + '-S[Display detailed probe information]' \ |
|
232 + '(-o --output)'{-o,--output}'[properties to display]:property:_values -s , "property" $aggr_dlmp_properties' \ |
|
233 - extended \ |
|
234 '(-x --extended)'{-x,--extended}'[extended information]' \ |
|
235 '(-o --output)'{-o,--output}'[properties to display]:property:_values -s , "property" $aggr_ext_properties' |
|
236 @@ -371,7 +372,7 @@ _dladm() { |
|
237 |
|
238 (modify-vlan) |
|
239 _arguments -A "-*" \ |
|
240 - '(-t --temporary)'{-t,--temporary}'[VLAN should be temporary]' \ |
|
241 + '(-t --temporary)'{-t,--temporary}'[modifications should be temporary]' \ |
|
242 '(-f --force)'{-f,--force}'[force VLAN creation]' \ |
|
243 '(-R --root-dir)'{-R,--root-dir}'[root directory]:directory:_path_files -/' \ |
|
244 '(-l --link)'{-l,--link}'[component link]:link:_dladm_links' \ |
|
245 @@ -469,7 +470,7 @@ _dladm() { |
|
246 |
|
247 (create-secobj) |
|
248 _arguments -A "-*" \ |
|
249 - '(-t --temporary)'{-t,--temporary}'[creation should be temporary]' \ |
|
250 + '(-t --temporary)'{-t,--temporary}'[object should be temporary]' \ |
|
251 '(-R --root)'{-R,--root}'[root directory]:directory:_path_files -/' \ |
|
252 '(-c --class)'{-c,--class}'[class]:class:(wep wpa)' \ |
|
253 '(-f --file)'{-f,--file}'[file containing object value]:file:_path_files' \ |
|
254 @@ -494,12 +495,17 @@ _dladm() { |
|
255 (create-vnic) |
|
256 # TODO: MAC address completion could be richer |
|
257 _arguments -A "-*" \ |
|
258 - '(-t --temporary)'{-t,--temporary}'[creation should be temporary]' \ |
|
259 + '(-t --temporary)'{-t,--temporary}'[VNIC should be temporary]' \ |
|
260 + - nonEVS \ |
|
261 '(-R --root)'{-R,--root}'[root directory]:directory:_path_files -/' \ |
|
262 '(-l --link)'{-l,--link}'[component link]:link:_dladm_links' \ |
|
263 '(-m --mac-address)'{-m,--mac-address}'[MAC address]:address:(factory random auto vrrp)' \ |
|
264 '-v[VLAN ID]:id:' \ |
|
265 '(-p --prop)'{-p,--prop}'[property values]:value:_values -s , "property" ${(M)linkprops_general\:#*\:*}' \ |
|
266 + ':VNIC name:' \ |
|
267 + - EVS \ |
|
268 + '(-c --connect)'{-c,--connect}'[Elastic Virtual Switch name]:evs name: ' \ |
|
269 + '(-T --tenant)'{-T,--tenant}'[Tenant name]:tenant: ' \ |
|
270 ':VNIC name:' |
|
271 ;; |
|
272 |
|
273 @@ -513,7 +519,7 @@ _dladm() { |
|
274 (modify-vnic) |
|
275 # TODO: MAC address completion could be richer |
|
276 _arguments -A "-*" \ |
|
277 - '(-t --temporary)'{-t,--temporary}'[creation should be temporary]' \ |
|
278 + '(-t --temporary)'{-t,--temporary}'[modifications should be temporary]' \ |
|
279 '(-R --root)'{-R,--root}'[root directory]:directory:_path_files -/' \ |
|
280 '(-l --link)'{-l,--link}'[component link]:link:_dladm_links' \ |
|
281 '(-m --mac-address)'{-m,--mac-address}'[MAC address]:address:(factory random auto vrrp)' \ |
|
282 @@ -531,8 +537,6 @@ _dladm() { |
|
283 '(-p --parseable)'{-p,--parseable}'[parseable output]' \ |
|
284 '(-o --output)'{-o,--output}'[properties to display]:property:_values -s , "property" $vnic_properties' \ |
|
285 '(-l --link)'{-l,--link}'[limit to VNICs on link]:link:_dladm_links' \ |
|
286 - '(-s --statistics)'{-s,--statistics}'[display VNIC statistics]' \ |
|
287 - '(-i --interval)'{-i,--interval}'[specify an interval]:interval:' \ |
|
288 '-Z[display ZONE column in output]' \ |
|
289 '-v[display all VLAN information]' \ |
|
290 '-z[zone]:zone:_sequence _zones' \ |
|
291 @@ -541,7 +545,7 @@ _dladm() { |
|
292 |
|
293 (create-etherstub) |
|
294 _arguments -A "-*" \ |
|
295 - '(-t --temporary)'{-t,--temporary}'[creation should be temporary]' \ |
|
296 + '(-t --temporary)'{-t,--temporary}'[etherstub should be temporary]' \ |
|
297 '(-R --root)'{-R,--root}'[root directory]:directory:_path_files -/' \ |
|
298 ':etherstub name:' |
|
299 ;; |
|
300 @@ -560,16 +564,6 @@ _dladm() { |
|
301 ':etherstub name:_dladm_etherstubs' |
|
302 ;; |
|
303 |
|
304 - (show-usage) |
|
305 - _arguments -A "-*" \ |
|
306 - '(-f --file)'{-f,--file}'[read records from file]:file:_path_files' \ |
|
307 - '(-F --format)'{-F,--format}'[plotfile format]:plotfile format:(gnuplot)' \ |
|
308 - '(-p --plot)'{-p,--plot}'[write plot to file]:' \ |
|
309 - '(-e --start)'{-e,--start}'[start time]:date/time (MM/DD/YYYY,hh\:mm\:ss)' \ |
|
310 - '(-s --stop)'{-s,--stop}'[stop time]:date/time (MM/DD/YYYY,hh\:mm\:ss)' \ |
|
311 - ':link name:_dladm_links' |
|
312 - ;; |
|
313 - |
|
314 (create-bridge) |
|
315 _arguments -A "-*" \ |
|
316 '(-P --protect)'{-P,--protect}'[specify a protection method]:protection method:(stp trill)' \ |
|
317 @@ -583,7 +577,6 @@ _dladm() { |
|
318 ':bridge name:' |
|
319 ;; |
|
320 |
|
321 - |
|
322 (modify-bridge) |
|
323 _arguments -A "-*" \ |
|
324 '(-P --protect)'{-P,--protect}'[specify a protection method]:protection method:(stp trill)' \ |
|
325 @@ -596,14 +589,12 @@ _dladm() { |
|
326 ':bridge name:_dladm_bridges' |
|
327 ;; |
|
328 |
|
329 - |
|
330 (delete-bridge) |
|
331 _arguments -A "-*" \ |
|
332 '(-R --root)'{-R,--root}'[root directory]:directory:_path_files -/' \ |
|
333 ':bridge name:_dladm_bridges' |
|
334 ;; |
|
335 |
|
336 - |
|
337 (add-bridge|remove-bridge) |
|
338 _arguments -A "-*" \ |
|
339 '(-R --root)'{-R,--root}'[root directory]:directory:_path_files -/' \ |
|
340 @@ -611,7 +602,6 @@ _dladm() { |
|
341 ':bridge name:_dladm_bridges' |
|
342 ;; |
|
343 |
|
344 - |
|
345 (show-bridge) |
|
346 # XXX $bridge_stats_properties get added into -o completions for set1 |
|
347 # XXX $bridge_link_stats_properties get added into -o completions for set3 |
|
348 @@ -640,10 +630,9 @@ _dladm() { |
|
349 ':bridge name:_dladm_bridges' |
|
350 ; |
|
351 |
|
352 - |
|
353 (create-iptun) |
|
354 _arguments -A "-*" \ |
|
355 - '(-t --temporary)'{-t,--temporary}'[temporary tunnel]' \ |
|
356 + '(-t --temporary)'{-t,--temporary}'[tunnel should be temporary]' \ |
|
357 '(-R --root)'{-R,--root}'[root directory]:directory:_path_files -/' \ |
|
358 '(-T --type)'{-T,--type}'[tunnel type]:tunnel type:(ipv4 ipv6 6to4)' \ |
|
359 '(-a --address)'{-a,--address}'[endpoint addresses]:address/host:_values -s , "address/host" $tunnel_values' \ |
|
360 @@ -652,7 +641,7 @@ _dladm() { |
|
361 |
|
362 (modify-iptun) |
|
363 _arguments -A "-*" \ |
|
364 - '(-t --temporary)'{-t,--temporary}'[temporary modification]' \ |
|
365 + '(-t --temporary)'{-t,--temporary}'[modifications should be temporary]' \ |
|
366 '(-R --root)'{-R,--root}'[root directory]:directory:_path_files -/' \ |
|
367 '(-a --address)'{-a,--address}'[endpoint addresses]:address/host:_values -s , "address/host" $tunnel_values' \ |
|
368 ':tunnel name:_dladm_iptuns' |
|
369 @@ -660,7 +649,7 @@ _dladm() { |
|
370 |
|
371 (delete-iptun) |
|
372 _arguments -A "-*" \ |
|
373 - '(-t --temporary)'{-t,--temporary}'[temporary deletion]' \ |
|
374 + '(-t --temporary)'{-t,--temporary}'[deletion should be temporary]' \ |
|
375 '(-R --root)'{-R,--root}'[root directory]:directory:_path_files -/' \ |
|
376 ':tunnel name:_dladm_iptuns' |
|
377 ;; |
|
378 @@ -677,7 +666,7 @@ _dladm() { |
|
379 |
|
380 (create-part) |
|
381 _arguments -A "-*" \ |
|
382 - '(-t --temporary)'{-t,--temporary}'[temporary partition]' \ |
|
383 + '(-t --temporary)'{-t,--temporary}'[partition should be temporary]' \ |
|
384 '(-R --root)'{-R,--root}'[root directory]:directory:_path_files -/' \ |
|
385 '(-f --force)'{-f,--force}'[force partition creation]' \ |
|
386 '(-l --link)'{-l,--link}'[IP-over-IB physical link name]:IB link:_dladm_iblinks' \ |
|
387 @@ -688,7 +677,7 @@ _dladm() { |
|
388 |
|
389 (delete-part) |
|
390 _arguments -A "-*" \ |
|
391 - '(-t --temporary)'{-t,--temporary}'[temporary deletion]' \ |
|
392 + '(-t --temporary)'{-t,--temporary}'[deletion should be temporary]' \ |
|
393 '(-R --root)'{-R,--root}'[root directory]:directory:_path_files -/' \ |
|
394 ':link name:_dladm_parts' |
|
395 ;; |
|
396 @@ -725,6 +714,35 @@ _dladm() { |
|
397 ':cap link' |
|
398 ;; |
|
399 |
|
400 + (create-eoib) |
|
401 + _arguments -A "-*" \ |
|
402 + '(-t --temporary)'{-t,--temporary}'[EoIB Link should be temporary]' \ |
|
403 + '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
404 + '(-l --link)'{-l,--link}'[InfiniBand link]:IB link:_dladm_iblinks' \ |
|
405 + '(-g --gateway)'{-g,--gateway}'[Gateway name]:gateway name: ' \ |
|
406 + '-c[Gateway ethernet port]:gateway port: ' \ |
|
407 + ':EoIB link name:' |
|
408 + ;; |
58 + |
409 + |
59 aggr_properties=( "link" "policy" "addrpolicy" "lacpactivity" "lacptimer" "mode" "flags" ) |
410 + (delete-eoib) |
60 aggr_lacp_properties=( "link" "port" "aggregatable" "sync" "coll" "dist" "defaulted" "expired" ) |
411 + _arguments -A "-*" \ |
61 + aggr_dlmp_properties=( "link" "port" "flags" "state" "targets" "xtargets" ) |
412 + '(-t --temporary)'{-t,--temporary}'[Deletion should be temporary]' \ |
62 aggr_ext_properties=( "link" "port" "speed" "duplex" "state" "address" "portstate" ) |
413 + '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
63 |
414 + ':EoIB link name:_dladm_eoiblinks' |
64 vlan_properties=( "link" "vid" "over" "flags" ) |
415 + ;; |
65 @@ -123,11 +130,12 @@ |
|
66 |
|
67 ether_properties=( "link" "ptype" "state" "auto" "speed-duplex" "pause" "rem_fault" ) |
|
68 |
|
69 - linkprop_properties=( "link" "property" "value" "default" "possible" ) |
|
70 + linkprop_properties=( "link" "property" "value" "effective" "default" "possible" ) |
|
71 |
|
72 secobj_properties=( "object" "class" ) |
|
73 |
|
74 - vnic_properties=( "link" "over" "speed" "macaddr" "macaddrtype" ) |
|
75 + vnic_properties=( "link" "over" "speed" "macaddr" "macaddrtype" "macaddrtypes" |
|
76 + "vid" "vids" "evs" "vport" "tenant" "vfs-assigned" ) |
|
77 |
|
78 bridge_properties=( "bridge" "address" "priority" "bmaxage" "bhellotime" "bfwddelay" |
|
79 "forceproto" "tctime" "tccount" "tchange" "desroot" "rootcost" "rootport" |
|
80 @@ -144,23 +152,21 @@ |
|
81 |
|
82 part_properties=( "link" "pkey" "over" "state" "flags" ) |
|
83 |
|
84 - ib_properties=( "link" "hcaguid" "portguid" "port" "state" "pkeys" ) |
|
85 + ib_properties=( "link" "hcaguid" "portguid" "port" "state" "gwname" "gwport" "gwid" "gwflags" "pkeys" ) |
|
86 + eoib_properties=( "link" "gwname" "gwport" "gwid" "speed" "macaddress" "over" "flags" ) |
|
87 |
|
88 linkprops_general=( |
|
89 "autopush:streams modules:" |
|
90 "cos:value:(0 1 2 3 4 5 6 7)" |
|
91 "cpus:processors:" |
|
92 - "cpus-effective" |
|
93 "etsbw-lcl:percentage:" |
|
94 "etsbw-lcl-advice" |
|
95 - "etsbw-lcl-effective" |
|
96 - "etsbw-rmt-effective" |
|
97 + "etsbw-rmt-advice" |
|
98 + "iov:value:(auto inherit on off)" |
|
99 "lro:value:(off on auto)" |
|
100 - "lro-effective" |
|
101 "mac-address:MAC address:" |
|
102 "maxbw:bandwith:" |
|
103 "pool:pools:" |
|
104 - "pool-effective" |
|
105 "priority:priority:(high medium low)" |
|
106 "rxringsavail" |
|
107 "rxrings:value:" |
|
108 @@ -176,13 +182,10 @@ |
|
109 "stp_mcheck:value:(0 1)" |
|
110 "protection:value:(mac-nospoof ip-nospoof dhcp-nospoof restricted)" |
|
111 "vsi-mgrid:IPv6 address:" |
|
112 - "vsi-mgrid-effective" |
|
113 "vsi-mgrid-enc:encoding:(oracle_v1 none)" |
|
114 - "vsi-mgrid-enc-effective" |
|
115 "vsi-typeid:value:" |
|
116 - "vsi-typeid-effective" |
|
117 "vsi-vers:value:" |
|
118 - "vsi-vers-effective" |
|
119 + "vswitching:value:(local remote auto)" |
|
120 "zone:value:_zones" |
|
121 ) |
|
122 linkprops_nonvlanvnic=( |
|
123 @@ -190,7 +193,6 @@ |
|
124 "learn_decay:value:" |
|
125 "learn_limit:value:" |
|
126 "rxfanout:value:" |
|
127 - "rxfanout-effective:value:" |
|
128 "stp:value:(0 1)" |
|
129 ) |
|
130 linkprops_wifi=( |
|
131 @@ -218,13 +220,11 @@ |
|
132 "en_10fdx_cap:value:(0 1)" |
|
133 "en_10hdx_cap:value:(0 1)" |
|
134 "flowctrl:value:(auto no rx tx pfc bi)" |
|
135 - "flowctrl-effective" |
|
136 "gvrp-timeout:value:" |
|
137 "mtu:value:" |
|
138 "ntcs" |
|
139 "pfcmap:value:" |
|
140 - "pfcmap-lcl-effective" |
|
141 - "pfcmap-rmt-effective" |
|
142 + "pfcmap-rmt" |
|
143 "speed" |
|
144 "tagmode:value:(normal vlanonly)" |
|
145 "vlan-announce:value:(off gvrp)" |
|
146 @@ -236,9 +236,14 @@ |
|
147 "hoplimit:value:" |
|
148 "encaplimit:value:" |
|
149 ) |
|
150 + linkprops_aggr=( |
|
151 + "probe-enabled:value:(true false)" |
|
152 + "probe-ip:value:" |
|
153 + "probe-fdt" |
|
154 + ) |
|
155 linkprops=( |
|
156 $linkprops_general $linkprops_wifi $linkprops_ether |
|
157 - $linkprops_ib $linkprops_iptun |
|
158 + $linkprops_ib $linkprops_iptun $linkprops_aggr |
|
159 ) |
|
160 |
|
161 case $service in |
|
162 @@ -252,12 +257,7 @@ |
|
163 '(-p --parseable)'{-p,--parseable}'[Parseable output]' \ |
|
164 '-Z[Display ZONE column in output]' \ |
|
165 '-z[zone]:zonename:_values -s , "zone" $(zoneadm list)' \ |
|
166 - - set1 \ |
|
167 '(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" $link_properties' \ |
|
168 - - set2 \ |
|
169 - '(-s --statistics)'{-s,--statistics}'[Display link statistics]' \ |
|
170 - '(-i --interval)'{-i,--interval}'[Specify an interval]:interval:' \ |
|
171 - '(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" $link_stats_properties' \ |
|
172 ':link name:_dladm_links' |
|
173 ;; |
|
174 |
|
175 @@ -273,14 +273,15 @@ |
|
176 '-D[Show Data Center Bridging information]:featureset:(ets pfc)' \ |
|
177 '-H[Show hardware resource usage]' \ |
|
178 '-L[Display location information]' \ |
|
179 + '-l[For ETS DCB, show additional local information]' \ |
|
180 + '-r[For ETS DCB, show additional remote information]' \ |
|
181 '(-P --persistent)'{-P,--persistent}'[Display persistent link configuration]' \ |
|
182 '(-p --parseable)'{-p,--parseable}'[Parseable output]' \ |
|
183 '-m[Display MAC address information]' \ |
|
184 + '-V[Display SR-IOV information]' \ |
|
185 '-Z[Display ZONE column in output]' \ |
|
186 '-z[zone]:zonename:_values -s , "zone" $(zoneadm list)' \ |
|
187 - '(-s --statistics)'{-s,--statistics}'[Display link statistics]' \ |
|
188 - '(-i --interval)'{-i,--interval}'[Specify an interval]:interval:' \ |
|
189 - '(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" link media state speed duplex device' \ |
|
190 + '(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" $phys_properties' \ |
|
191 ':physical link name:_dladm_devs' |
|
192 ;; |
|
193 |
|
194 @@ -304,7 +305,7 @@ |
|
195 |
|
196 ("modify-aggr") |
|
197 _arguments -A "-*" \ |
|
198 - '(-t --temporary)'{-t,--temporary}'[Aggregation should be temporary]' \ |
|
199 + '(-t --temporary)'{-t,--temporary}'[Modifications should be temporary]' \ |
|
200 '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
201 '(-l --link)'{-l,--link}'[Component link]:link:_dladm_links' \ |
|
202 '(-m --mode)'{-m,--mode}'[Aggregation mode]:mode:(dlmp trunk)' \ |
|
203 @@ -324,7 +325,7 @@ |
|
204 |
|
205 ("add-aggr") |
|
206 _arguments -A "-*" \ |
|
207 - '(-t --temporary)'{-t,--temporary}'[Aggregation should be temporary]' \ |
|
208 + '(-t --temporary)'{-t,--temporary}'[Additions should be temporary]' \ |
|
209 '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
210 '(-l --link)'{-l,--link}'[Component link]:link:_dladm_links' \ |
|
211 ':aggregate link name:_dladm_aggrs' |
|
212 @@ -332,7 +333,7 @@ |
|
213 |
|
214 ("remove-aggr") |
|
215 _arguments -A "-*" \ |
|
216 - '(-t --temporary)'{-t,--temporary}'[Aggregation should be temporary]' \ |
|
217 + '(-t --temporary)'{-t,--temporary}'[Removals should be temporary]' \ |
|
218 '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
219 '(-l --link)'{-l,--link}'[Component link]:link:_dladm_aggr_ports' \ |
|
220 ':aggregate link name:_dladm_aggrs' |
|
221 @@ -342,8 +343,6 @@ |
|
222 _arguments -A "-*" \ |
|
223 '(-P --persistent)'{-P,--persistent}'[Display persistent link configuration]' \ |
|
224 '(-p --parseable)'{-p,--parseable}'[Parseable output]' \ |
|
225 - '(-s --statistics)'{-s,--statistics}'[Display link statistics]' \ |
|
226 - '(-i --interval)'{-i,--interval}'[Specify an interval]:interval:' \ |
|
227 '-Z[Display ZONE column in output]' \ |
|
228 '-z[zone]:zonename:_values -s , "zone" $(zoneadm list)' \ |
|
229 ':aggregate link name:_dladm_links' \ |
|
230 @@ -352,6 +351,9 @@ |
|
231 - lacp \ |
|
232 '(-L --lacp)'{-L,--lacp}'[LACP information]' \ |
|
233 '(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" $aggr_lacp_properties' \ |
|
234 + - dlmp \ |
|
235 + '-S[Display detailed probe information]' \ |
|
236 + '(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" $aggr_dlmp_properties' \ |
|
237 - extended \ |
|
238 '(-x --extended)'{-x,--extended}'[Extended information]' \ |
|
239 '(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" $aggr_ext_properties' |
|
240 @@ -376,7 +378,7 @@ |
|
241 |
|
242 ("modify-vlan") |
|
243 _arguments -A "-*" \ |
|
244 - '(-t --temporary)'{-t,--temporary}'[VLAN should be temporary]' \ |
|
245 + '(-t --temporary)'{-t,--temporary}'[Modifications should be temporary]' \ |
|
246 '(-f --force)'{-f,--force}'[Force VLAN creation]' \ |
|
247 '(-R --root-dir)'{-R,--root-dir}'[Root directory]:directory:_path_files -/' \ |
|
248 '(-l --link)'{-l,--link}'[Component link]:link:_dladm_links' \ |
|
249 @@ -474,7 +476,7 @@ |
|
250 |
|
251 ("create-secobj") |
|
252 _arguments -A "-*" \ |
|
253 - '(-t --temporary)'{-t,--temporary}'[Creation should be temporary]' \ |
|
254 + '(-t --temporary)'{-t,--temporary}'[Object should be temporary]' \ |
|
255 '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
256 '(-c --class)'{-c,--class}'[Class]:class:(wep wpa)' \ |
|
257 '(-f --file)'{-f,--file}'[File containing object value]:file:_path_files' \ |
|
258 @@ -499,12 +501,17 @@ |
|
259 ("create-vnic") |
|
260 # TODO: MAC address completion could be richer |
|
261 _arguments -A "-*" \ |
|
262 - '(-t --temporary)'{-t,--temporary}'[Creation should be temporary]' \ |
|
263 + '(-t --temporary)'{-t,--temporary}'[VNIC should be temporary]' \ |
|
264 + - nonEVS \ |
|
265 '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
266 '(-l --link)'{-l,--link}'[Component link]:link:_dladm_links' \ |
|
267 '(-m --mac-address)'{-m,--mac-address}'[MAC address]:address:(factory random auto vrrp)' \ |
|
268 '-v[VLAN ID]:id:' \ |
|
269 '(-p --prop)'{-p,--prop}'[Property values]:value:_values -s , "property" ${(M)linkprops_general\:#*\:*}' \ |
|
270 + ':VNIC name:' \ |
|
271 + - EVS \ |
|
272 + '(-c --connect)'{-c,--connect}'[Elastic Virtual Switch name]:evs name: ' \ |
|
273 + '(-T --tenant)'{-T,--tenant}'[Tenant name]:tenant: ' \ |
|
274 ':VNIC name:' |
|
275 ;; |
|
276 |
|
277 @@ -518,7 +525,7 @@ |
|
278 ("modify-vnic") |
|
279 # TODO: MAC address completion could be richer |
|
280 _arguments -A "-*" \ |
|
281 - '(-t --temporary)'{-t,--temporary}'[Creation should be temporary]' \ |
|
282 + '(-t --temporary)'{-t,--temporary}'[Modifications should be temporary]' \ |
|
283 '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
284 '(-l --link)'{-l,--link}'[Component link]:link:_dladm_links' \ |
|
285 '(-m --mac-address)'{-m,--mac-address}'[MAC address]:address:(factory random auto vrrp)' \ |
|
286 @@ -536,8 +543,8 @@ |
|
287 '(-p --parseable)'{-p,--parseable}'[Parseable output]' \ |
|
288 '(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" $vnic_properties' \ |
|
289 '(-l --link)'{-l,--link}'[Limit to VNICs on link]:link:_dladm_links' \ |
|
290 - '(-s --statistics)'{-s,--statistics}'[Display VNIC statistics]' \ |
|
291 - '(-i --interval)'{-i,--interval}'[Specify an interval]:interval:' \ |
|
292 + '-c[Display EVS information]' \ |
|
293 + '-V[Display SR-IOV information]' \ |
|
294 '-Z[Display ZONE column in output]' \ |
|
295 '-z[zone]:zonename:_values -s , "zone" $(zoneadm list)' \ |
|
296 ':VNIC name:_dladm_vnics' |
|
297 @@ -545,7 +552,7 @@ |
|
298 |
|
299 ("create-etherstub") |
|
300 _arguments -A "-*" \ |
|
301 - '(-t --temporary)'{-t,--temporary}'[Creation should be temporary]' \ |
|
302 + '(-t --temporary)'{-t,--temporary}'[Etherstub should be temporary]' \ |
|
303 '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
304 ':etherstub name:' |
|
305 ;; |
|
306 @@ -564,16 +571,6 @@ |
|
307 ':etherstub name:_dladm_etherstubs' |
|
308 ;; |
|
309 |
|
310 - ("show-usage") |
|
311 - _arguments -A "-*" \ |
|
312 - '(-f --file)'{-f,--file}'[Read records from file]:file:_path_files' \ |
|
313 - '(-F --format)'{-F,--format}'[Plotfile format]:plotfile format:(gnuplot)' \ |
|
314 - '(-p --plot)'{-p,--plot}'[Write plot to file]:' \ |
|
315 - '(-e --start)'{-e,--start}'[Start time]:date/time (MM/DD/YYYY,hh\:mm\:ss)' \ |
|
316 - '(-s --stop)'{-s,--stop}'[Stop time]:date/time (MM/DD/YYYY,hh\:mm\:ss)' \ |
|
317 - ':link name:_dladm_links' |
|
318 - ;; |
|
319 - |
|
320 ("create-bridge") |
|
321 _arguments -A "-*" \ |
|
322 '(-P --protect)'{-P,--protect}'[Specify a protection method]:protection method:(stp trill)' \ |
|
323 @@ -587,7 +584,6 @@ |
|
324 ':bridge name:' |
|
325 ;; |
|
326 |
|
327 - |
|
328 ("modify-bridge") |
|
329 _arguments -A "-*" \ |
|
330 '(-P --protect)'{-P,--protect}'[Specify a protection method]:protection method:(stp trill)' \ |
|
331 @@ -600,7 +596,6 @@ |
|
332 ':bridge name:_dladm_bridges' |
|
333 ;; |
|
334 |
|
335 - |
|
336 ("delete-bridge") |
|
337 _arguments -A "-*" \ |
|
338 '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
339 @@ -607,7 +602,6 @@ |
|
340 ':bridge name:_dladm_bridges' |
|
341 ;; |
|
342 |
|
343 - |
|
344 ("add-bridge"|"remove-bridge") |
|
345 _arguments -A "-*" \ |
|
346 '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
347 @@ -615,7 +609,6 @@ |
|
348 ':bridge name:_dladm_bridges' |
|
349 ;; |
|
350 |
|
351 - |
|
352 ("show-bridge") |
|
353 # XXX $bridge_stats_properties get added into -o completions for set1 |
|
354 # XXX $bridge_link_stats_properties get added into -o completions for set3 |
|
355 @@ -644,10 +637,9 @@ |
|
356 ':bridge name:_dladm_bridges' |
|
357 ;; |
|
358 |
|
359 - |
|
360 ("create-iptun") |
|
361 _arguments -A "-*" \ |
|
362 - '(-t --temporary)'{-t,--temporary}'[Temporary tunnel]' \ |
|
363 + '(-t --temporary)'{-t,--temporary}'[Tunnel should be temporary]' \ |
|
364 '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
365 '(-T --type)'{-T,--type}'[Tunnel type]:tunnel type:(ipv4 ipv6 6to4)' \ |
|
366 '(-a --address)'{-a,--address}'[Endpoint addresses]:address/host:_values -s , "address/host" $tunnel_values' \ |
|
367 @@ -656,7 +648,7 @@ |
|
368 |
|
369 ("modify-iptun") |
|
370 _arguments -A "-*" \ |
|
371 - '(-t --temporary)'{-t,--temporary}'[Temporary modification]' \ |
|
372 + '(-t --temporary)'{-t,--temporary}'[Modifications should be temporary]' \ |
|
373 '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
374 '(-a --address)'{-a,--address}'[Endpoint addresses]:address/host:_values -s , "address/host" $tunnel_values' \ |
|
375 ':tunnel name:_dladm_iptuns' |
|
376 @@ -664,7 +656,7 @@ |
|
377 |
|
378 ("delete-iptun") |
|
379 _arguments -A "-*" \ |
|
380 - '(-t --temporary)'{-t,--temporary}'[Temporary deletion]' \ |
|
381 + '(-t --temporary)'{-t,--temporary}'[Deletion should be temporary]' \ |
|
382 '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
383 ':tunnel name:_dladm_iptuns' |
|
384 ;; |
|
385 @@ -681,7 +673,7 @@ |
|
386 |
|
387 ("create-part") |
|
388 _arguments -A "-*" \ |
|
389 - '(-t --temporary)'{-t,--temporary}'[Temporary partition]' \ |
|
390 + '(-t --temporary)'{-t,--temporary}'[Partition should be temporary]' \ |
|
391 '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
392 '(-f --force)'{-f,--force}'[Force partition creation]' \ |
|
393 '(-l --link)'{-l,--link}'[IP-over-IB physical link name]:IB link:_dladm_iblinks' \ |
|
394 @@ -692,7 +684,7 @@ |
|
395 |
|
396 ("delete-part") |
|
397 _arguments -A "-*" \ |
|
398 - '(-t --temporary)'{-t,--temporary}'[Temporary deletion]' \ |
|
399 + '(-t --temporary)'{-t,--temporary}'[Deletion should be temporary]' \ |
|
400 '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
401 ':link name:_dladm_parts' |
|
402 ;; |
|
403 @@ -714,6 +706,35 @@ |
|
404 ':IB link name:_dladm_iblinks' |
|
405 ;; |
|
406 |
|
407 + ("create-eoib") |
|
408 + _arguments -A "-*" \ |
|
409 + '(-t --temporary)'{-t,--temporary}'[EoIB Link should be temporary]' \ |
|
410 + '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
|
411 + '(-l --link)'{-l,--link}'[InfiniBand link]:IB link:_dladm_iblinks' \ |
|
412 + '(-g --gateway)'{-g,--gateway}'[Gateway name]:gateway name: ' \ |
|
413 + '-c[Gateway ethernet port]:gateway port: ' \ |
|
414 + ':EoIB link name:' |
|
415 + ;; |
|
416 + |
416 + |
417 + ("delete-eoib") |
417 + (show-eoib) |
418 + _arguments -A "-*" \ |
418 + _arguments -A "-*" \ |
419 + '(-t --temporary)'{-t,--temporary}'[Deletion should be temporary]' \ |
419 + '(-P --persistent)'{-P,--persistent}'[Display persistent link configuration]' \ |
420 + '(-R --root)'{-R,--root}'[Root directory]:directory:_path_files -/' \ |
420 + '(-p --parseable)'{-p,--parseable}'[Parseable output]' \ |
421 + ':EoIB link name:_dladm_eoiblinks' |
421 + '(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" $eoib_properties' \ |
422 + ;; |
422 + '(-g --gateway)'{-g,--gateway}'[Gateway name]:gateway name: ' \ |
|
423 + '(-l --link)'{-l,--link}'[InfiniBand link]:IB link:_dladm_iblinks' \ |
|
424 + '-Z[Display ZONE column in output]' \ |
|
425 + '-z[zone]:zonename:_values -s , "zone" $(zoneadm list)' \ |
|
426 + ':EoIB link name:_dladm_eoiblinks' |
|
427 + ;; |
423 + |
428 + |
424 + ("show-eoib") |
429 (*) |
425 + _arguments -A "-*" \ |
430 _default |
426 + '(-P --persistent)'{-P,--persistent}'[Display persistent link configuration]' \ |
431 ;; |
427 + '(-p --parseable)'{-p,--parseable}'[Parseable output]' \ |
432 diff --git a/Completion/Solaris/Command/_flowadm b/Completion/Solaris/Command/_flowadm |
428 + '(-o --output)'{-o,--output}'[Properties to display]:property:_values -s , "property" $eoib_properties' \ |
433 index e4d682f..3dc5741 100644 |
429 + '(-g --gateway)'{-g,--gateway}'[Gateway name]:gateway name: ' \ |
434 --- a/Completion/Solaris/Command/_flowadm |
430 + '(-l --link)'{-l,--link}'[InfiniBand link]:IB link:_dladm_iblinks' \ |
435 +++ b/Completion/Solaris/Command/_flowadm |
431 + '-Z[Display ZONE column in output]' \ |
436 @@ -12,7 +12,7 @@ subcmds=( |
432 + '-z[zone]:zonename:_values -s , "zone" $(zoneadm list)' \ |
437 reset-flowprop show-flowprop |
433 + ':EoIB link name:_dladm_eoiblinks' |
|
434 + ;; |
|
435 + |
|
436 (*) |
|
437 _message "unknown dladm subcommand: $service" |
|
438 ;; |
|
439 --- zsh-5.0.5/Completion/Solaris/Command/_flowadm Wed Nov 27 11:00:18 2013 |
|
440 +++ zsh-5.0.5/Completion/Solaris/Command/_flowadm Fri Mar 28 11:07:23 2014 |
|
441 @@ -1,5 +1,5 @@ |
|
442 #compdef flowadm |
|
443 -# Synced with the S11U1 build 19 man page |
|
444 +# Synced with the S11U2 build 34 man page |
|
445 |
|
446 _flowadm() { |
|
447 |
|
448 @@ -35,6 +35,8 @@ |
|
449 |
|
450 props=( |
|
451 "maxbw" |
|
452 + "priority" |
|
453 + "hwflow" |
|
454 ) |
438 ) |
|
439 tr=( tcp udp sctp icmp icmpv6 ) |
|
440 -props=( maxbw ) |
|
441 +props=( maxbw priority hwflow ) |
455 |
442 |
456 if [[ $service == "flowadm" ]]; then |
443 if [[ $service == "flowadm" ]]; then |
457 @@ -56,7 +58,7 @@ |
444 _arguments -C -A "-*" \ |
|
445 @@ -33,7 +33,7 @@ case $service in |
458 |
446 |
459 ("show-flow") |
447 ("show-flow") |
460 _arguments -A "-*" \ |
448 _arguments -A "-*" \ |
461 - '-o[specify field to display]:field:(flow link ipaddr proto port dsfield)' \ |
449 - '-o[specify field to display]:field:(flow link ipaddr proto port dsfield)' \ |
462 + '-o[specify field to display]:field:(flow link proto laddr lport raddr rport port dsfield pid)' \ |
450 + '-o[specify field to display]:field:(flow link proto laddr lport raddr rport port dsfield pid)' \ |