Skip to content

Commit 70633b2

Browse files
author
olevole
committed
remove dup code
1 parent c634842 commit 70633b2

File tree

2 files changed

+58
-130
lines changed

2 files changed

+58
-130
lines changed

‎tools/capabilities

Lines changed: 32 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ ${H3_COLOR}Options${N0_COLOR}:
1515

1616
${H3_COLOR}Examples${N0_COLOR}:
1717

18-
# cbsd capabilities
18+
# cbsd capabilities json=1
19+
20+
${H3_COLOR}See also${N0_COLOR}:
21+
22+
cbsd summary --help
1923

2024
"
2125

@@ -29,79 +33,57 @@ json=0
2933
bhyve_status="0"
3034
bhyve_description="Native FreeBSD hypervisor"
3135
bhyve_prefix="b"
32-
bhyve_info="https://www.bsdstore.ru/en/cbsd_bhyve_quickstart.html"
36+
bhyve_info="https://github.com/cbsd/cbsd/blob/develop/share/docs/bhyve/cbsd_bhyve_quickstart.md"
3337

3438
jail_status="0"
3539
jail_description="Native FreeBSD lightweight containers"
36-
jail_prefix="b"
37-
jail_info="https://www.bsdstore.ru/en/cbsd_jail_quickstart.html"
40+
jail_prefix="j"
41+
jail_info="https://github.com/cbsd/cbsd/blob/develop/share/docs/jail/cbsd_jail_quickstart.md"
3842

3943
qemu_status="0"
4044
qemu_description="QEMU hypervisor"
4145
qemu_prefix="q"
42-
qemu_info="https://www.bsdstore.ru/en/cbsd_qemu_quickstart.html"
46+
qemu_info="https://github.com/cbsd/cbsd/blob/develop/share/docs/qemu/cbsd_qemu_quickstart.md"
4347

4448
virtualbox_status="0"
4549
virtualbox_description="VirtualBox hypervisor"
4650
virtualbox_prefix="v"
47-
virtualbox_info="https://www.bsdstore.ru/en/cbsd_vbox_quickstart.html"
51+
virtualbox_info="https://github.com/cbsd/cbsd/blob/develop/share/docs/qemu/cbsd_virtualbox_quickstart.md"
4852

4953
vmm_status="0"
5054
vmm_description="Native OpenBSD hypervisor"
5155
vmm_prefix="o"
52-
vmm_info="https://www.bsdstore.ru/en/cbsd_vmm_quickstart.html"
56+
vmm_info="https://github.com/cbsd/cbsd/blob/develop/share/docs/jail/cbsd_vmm_quickstart.md"
5357

5458
xen_status="0"
5559
xen_description="XEN hypervisor"
56-
xen_prefix="b"
57-
xen_info="https://www.bsdstore.ru/en/cbsd_xen_quickstart.html"
58-
60+
xen_prefix="x"
61+
xen_info="https://github.com/cbsd/cbsd/blob/develop/share/docs/qemu/cbsd_xen_quickstart.md"
5962

6063
# ACCEL
6164
nvmm_status="0"
6265
kvm_status="0"
6366

67+
bhyve_ext_help_url="https://github.com/cbsd/cbsd/blob/develop/share/docs/bhyve/cbsd_bhyve_quickstart.md"
68+
[ -n "${BHYVE_CMD}" ] && bhyve_status="1"
69+
70+
jail_ext_help_url="https://github.com/cbsd/cbsd/blob/develop/share/docs/jail/cbsd_jail_quickstart.md"
71+
[ -n "${JAIL_CMD}" ] && jail_status="1"
72+
73+
nvmm_ext_help_url="https://github.com/cbsd/cbsd/blob/develop/share/docs/qemu/cbsd_qemu_quickstart.md#cbsd--qemu--dragonflybsd"
74+
[ -n "${NVMMCTL_CMD}" ] && nvmm_status="1"
6475

65-
if [ -n "${BHYVE_CMD}" ]; then
66-
bhyve_status="1"
67-
bhyve_ext_help_url="https://www.bsdstore.ru/en/cbsd_bhyve_quickstart.html"
68-
else
69-
bhyve_ext_help_url="https://www.bsdstore.ru/en/cbsd_bhyve_quickstart.html"
70-
fi
71-
72-
if [ -n "${JAIL_CMD}" ]; then
73-
jail_status="1"
74-
jail_ext_help_url="https://www.bsdstore.ru/en/cbsd_jail_quickstart.html"
75-
else
76-
jail_ext_help_url="https://www.bsdstore.ru/en/cbsd_jail_quickstart.html"
77-
fi
78-
79-
if [ -n "${NVMMCTL_CMD}" ]; then
80-
nvmm_status="1"
81-
nvmm_ext_help_url="https://www.bsdstore.ru/en/cbsd_nvmm_quickstart.html"
82-
else
83-
nvmm_ext_help_url="https://www.bsdstore.ru/en/cbsd_nvmm_quickstart.html"
84-
fi
85-
86-
if [ -n "${VMM_CMD}" ]; then
87-
vmm_status="1"
88-
vmm_ext_help_url="https://www.bsdstore.ru/en/cbsd_vmm_quickstart.html"
89-
else
90-
vmm_ext_help_url="https://www.bsdstore.ru/en/cbsd_vmm_quickstart.html"
91-
fi
92-
93-
if [ -n "${QEMU_SYSTEM_X86_64_CMD}" ]; then
94-
qemu_status="1"
95-
qemu_ext_help_url="https://www.bsdstore.ru/en/cbsd_qemu_quickstart.html"
96-
else
97-
qemu_ext_help_url="https://www.bsdstore.ru/en/cbsd_qemu_quickstart.html"
98-
fi
99-
100-
if [ -n "${XL_CMD}" ]; then
101-
xen_status="1"
102-
else
103-
xen_ext_help_url="https://www.bsdstore.ru/en/cbsd_xen_quickstart.html"
104-
fi
76+
vmm_ext_help_url="https://github.com/cbsd/cbsd/blob/develop/share/docs/jail/cbsd_vmm_quickstart.md"
77+
[ -n "${VMM_CMD}" ] && vmm_status="1"
78+
79+
qemu_ext_help_url="https://github.com/cbsd/cbsd/blob/develop/share/docs/qemu/cbsd_qemu_quickstart.md"
80+
[ -n "${QEMU_SYSTEM_X86_64_CMD}" ] && qemu_status="1"
81+
82+
xen_ext_help_url="https://github.com/cbsd/cbsd/blob/develop/share/docs/qemu/cbsd_xen_quickstart.md"
83+
[ -n "${XL_CMD}" ] && xen_status="1"
84+
85+
virtualbox_ext_help_url="https://github.com/cbsd/cbsd/blob/develop/share/docs/qemu/cbsd_virtualbox_quickstart.md"
86+
[ -n "${VIRTUALBOX_CMD}" ] && virtualbox_status="1"
10587

10688
_cap_count_total=0
10789
_cap_count_available=0
@@ -127,7 +109,6 @@ for i in bhyve jail qemu virtualbox vmm xen; do
127109
eval _info=\${${i}_info}
128110
[ -z "${_status}" ] && _status="0"
129111

130-
131112
case "${_status}" in
132113
0)
133114
_cap_count_unavailable=$(( _cap_count_unavailable + _cap_count_unavailable ))
@@ -161,7 +142,6 @@ emulator_${i}_description="${_description}"
161142
emulator_${i}_info="${_info}"
162143
EOF
163144
fi
164-
165145
done
166146

167147
[ "${json}" = "1" ] && echo "]"

‎tools/summary

Lines changed: 26 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ ${H3_COLOR}Examples${N0_COLOR}:
1717

1818
# cbsd summary
1919

20+
${H3_COLOR}See also${N0_COLOR}:
21+
22+
cbsd capabilities --help
23+
2024
"
2125

2226
. ${subrdir}/nc.subr
@@ -36,8 +40,8 @@ inc_jaillist_sum()
3640

3741
[ -z "${db}" ] && return 0
3842

39-
tmp_jaillist_sum=$( cbsdsqlro ${db} SELECT count\(jname\) FROM jails WHERE emulator != \"bhyve\" )
40-
tmp_vmlist_sum=$( cbsdsqlro ${db} SELECT count\(jname\) FROM jails WHERE emulator = \"bhyve\" )
43+
tmp_jaillist_sum=$( cbsdsqlro ${db} "SELECT count(jname) FROM jails WHERE emulator = 'jail'" )
44+
tmp_vmlist_sum=$( cbsdsqlro ${db} "SELECT count(jname) FROM jails WHERE emulator != 'jail'" )
4145

4246
if ! is_number ${tmp_jaillist_sum}; then
4347
jaillist_sum=$(( jaillist_sum + tmp_jaillist_sum ))
@@ -62,7 +66,7 @@ inc_hwstats_sum()
6266

6367
local sqldelimer=" "
6468

65-
eval $( cbsdsqlro ${db} SELECT ncpu,physmem,freemem,cpufreq FROM local | while read _ncpu _physmem _freemem _cpufreq; do
69+
eval $( cbsdsqlro ${db} "SELECT ncpu,physmem,freemem,cpufreq FROM local" | while read _ncpu _physmem _freemem _cpufreq; do
6670
echo "local tmp_ncpu=\"${_ncpu}\""
6771
echo "local tmp_physmem=\"${_physmem}\""
6872
echo "local tmp_freemem=\"${_freemem}\""
@@ -97,11 +101,11 @@ freemem_sum_bytes=0
97101
cpusum_without_freq=0
98102
cpufreq_sum=0
99103

100-
nodelist=$( cbsdsqlro nodes SELECT nodename FROM nodelist )
104+
nodelist=$( cbsdsqlro nodes "SELECT nodename FROM nodelist" )
101105

102106
# calculate offline nodes
103107
for i in ${nodelist}; do
104-
node_ip=$( cbsdsqlro nodes SELECT ip FROM nodelist WHERE nodename=\"${i}\" )
108+
node_ip=$( cbsdsqlro nodes "SELECT ip FROM nodelist WHERE nodename='${i}'" )
105109
[ -z "${node_ip}" ] && continue
106110
if ! check_locktime ${ftmpdir}/shmux_${node_ip}.lock >/dev/null 2>&1; then
107111
nodelist_offline=$(( nodelist_offline + 1 ))
@@ -120,7 +124,6 @@ done
120124
if [ -n "${cpufreq_sum}" -a -n "${cpu_with_freq}" ]; then
121125
cpufreq_average=$(( cpufreq_sum / cpu_with_freq ))
122126
fi
123-
#nodelist_sum=$( cbsdsqlro nodes SELECT count\(nodename\) FROM nodelist )
124127

125128
if [ ${human} -eq 1 ]; then
126129
if conv2human "${physmem_sum_bytes}"; then
@@ -202,77 +205,22 @@ ${ECHO} "${BOLD} ${H5_COLOR}General node info ${N0_COLOR}"
202205
${ECHO} "${BOLD} ${H1_COLOR}==================================== ${N0_COLOR}"
203206
echo
204207

205-
bhyve_status="unavailable"
206-
bhyve_status_color="${N4_COLOR}"
207-
208-
jail_status="unavailable"
209-
jail_status_color="${N4_COLOR}"
210-
211-
nvmm_status="unavailable"
212-
nvmm_status_color="${N4_COLOR}"
213-
214-
vmm_status="unavailable"
215-
vmm_status_color="${N4_COLOR}"
216-
217-
xen_status="unavailable"
218-
xen_status_color="${N4_COLOR}"
219-
220-
qemu_status="unavailable"
221-
qemu_status_color="${N4_COLOR}"
222-
223-
if [ -n "${BHYVE_CMD}" ]; then
224-
bhyve_status="available"
225-
bhyve_status_color="${N2_COLOR}"
226-
bhyve_ext_help_url="https://www.bsdstore.ru/en/cbsd_bhyve_quickstart.html"
227-
else
228-
bhyve_ext_help_url="https://www.bsdstore.ru/en/cbsd_bhyve_platform.html"
229-
fi
230-
231-
if [ -n "${JAIL_CMD}" ]; then
232-
jail_status="available"
233-
jail_status_color="${N2_COLOR}"
234-
jail_ext_help_url="https://www.bsdstore.ru/en/cbsd_jail_quickstart.html"
235-
else
236-
jail_ext_help_url="https://www.bsdstore.ru/en/cbsd_jail_platform.html"
237-
fi
238-
239-
if [ -n "${NVMMCTL_CMD}" ]; then
240-
nvmm_status="available"
241-
nvmm_status_color="${N2_COLOR}"
242-
nvmm_ext_help_url="https://www.bsdstore.ru/en/cbsd_nvmm_quickstart.html"
243-
else
244-
nvmm_ext_help_url="https://www.bsdstore.ru/en/cbsd_nvmm_platform.html"
245-
fi
246-
247-
if [ -n "${VMM_CMD}" ]; then
248-
vmm_status="available"
249-
vmm_status_color="${N2_COLOR}"
250-
vmm_ext_help_url="https://www.bsdstore.ru/en/cbsd_vmm_quickstart.html"
251-
else
252-
vmm_ext_help_url="https://www.bsdstore.ru/en/cbsd_vmm_platform.html"
253-
fi
254-
if [ -n "${QEMU_SYSTEM_X86_64_CMD}" ]; then
255-
qemu_status="available"
256-
qemu_status_color="${N2_COLOR}"
257-
qemu_system_ext_help_url="https://www.bsdstore.ru/en/cbsd_qemu_quickstart.html"
258-
else
259-
qemu_system_ext_help_url="https://www.bsdstore.ru/en/cbsd_qemu_platform.html"
260-
fi
261-
262-
if [ -n "${XL_CMD}" ]; then
263-
xen_status="available"
264-
xen_ext_help_url="https://www.bsdstore.ru/en/cbsd_ext_quickstart.html"
265-
else
266-
xen_ext_help_url="https://www.bsdstore.ru/en/cbsd_xen_platform.html"
267-
fi
268-
269-
printf " ${N1_COLOR}%-15s: ${bhyve_status_color}%-16s${N0_COLOR} ( %-53s )${N0_COLOR}\n" "bhyve" ${bhyve_status} ${bhyve_ext_help_url}
270-
printf " ${N1_COLOR}%-15s: ${jail_status_color}%-16s${N0_COLOR} ( %-53s )${N0_COLOR}\n" "jail" ${jail_status} ${jail_ext_help_url}
271-
printf " ${N1_COLOR}%-15s: ${qemu_status_color}%-16s${N0_COLOR} ( %-53s )${N0_COLOR}\n" "qemu" ${qemu_status} ${qemu_system_ext_help_url}
272-
printf " ${N1_COLOR}%-15s: ${nvmm_status_color}%-16s${N0_COLOR} ( %-53s )${N0_COLOR}\n" "nvmm" ${nvmm_status} ${nvmm_ext_help_url}
273-
printf " ${N1_COLOR}%-15s: ${vmm_status_color}%-16s${N0_COLOR} ( %-53s )${N0_COLOR}\n" "vmm" ${vmm_status} ${vmm_ext_help_url}
274-
printf " ${N1_COLOR}%-15s: ${xen_status_color}%-16s${N0_COLOR} ( %-53s )${N0_COLOR}\n" "xen" ${xen_status} ${xen_ext_help_url}
275-
208+
eval $( capabilities )
209+
210+
for i in bhyve jail qemu xen virtualbox; do
211+
eval bool_status="\$emulator_${i}_available"
212+
eval info="\$emulator_${i}_info"
213+
case "${bool_status}" in
214+
1)
215+
status="available"
216+
status_color="${N2_COLOR}"
217+
;;
218+
*)
219+
status="unavailable"
220+
status_color="${N4_COLOR}"
221+
;;
222+
esac
223+
printf " ${status_color}%-11s: %-11s${N0_COLOR} ( %-53s )${N0_COLOR}\n" "${i}" ${status} ${info}
224+
done
276225
echo
277-
278226
exit 0

0 commit comments

Comments
 (0)