Hi Ilya, Ilya Maximets <i.maxim...@samsung.com> writes:
> There is no need to create a separate function for each alias. > This will simplify adding new default options and utils. > > Signed-off-by: Ilya Maximets <i.maxim...@samsung.com> > --- > tests/ovs-macros.at | 35 +++++------------------------------ > 1 file changed, 5 insertions(+), 30 deletions(-) > > diff --git a/tests/ovs-macros.at b/tests/ovs-macros.at > index 677eea7..e3365b6 100644 > --- a/tests/ovs-macros.at > +++ b/tests/ovs-macros.at > @@ -124,36 +124,11 @@ fi > # Set default timeout for 30 seconds. > # This should be sufficient on all platforms. > OVS_TIMEOUT=30 > -alias ovs-vsctl='OVS_VSCTL_TIMEOUT' >/dev/null 2>&1 > -if [ $? -eq 0 ]; then > - OVS_VSCTL_TIMEOUT () { > - command ovs-vsctl --timeout=$OVS_TIMEOUT "$@" > - } > - alias ovs-ofctl='OVS_OFCTL_TIMEOUT' > - alias ovs-appctl='OVS_APPCTL_TIMEOUT' > - alias ovn-sbctl='OVS_SBCTL_TIMEOUT' > - alias ovn-nbctl='OVN_NBCTL_TIMEOUT' > - alias vtep-ctl='VTEP_CTL_TIMEOUT' > - alias ovsdb-client='OVSDB_CLIENT_TIMEOUT' > - OVS_OFCTL_TIMEOUT () { > - command ovs-ofctl --timeout=$OVS_TIMEOUT "$@" > - } > - OVS_APPCTL_TIMEOUT () { > - command ovs-appctl --timeout=$OVS_TIMEOUT "$@" > - } > - OVS_SBCTL_TIMEOUT () { > - command ovn-sbctl --timeout=$OVS_TIMEOUT "$@" > - } > - OVN_NBCTL_TIMEOUT () { > - command ovn-nbctl --timeout=$OVS_TIMEOUT "$@" > - } > - VTEP_CTL_TIMEOUT () { > - command vtep-ctl --timeout=$OVS_TIMEOUT "$@" > - } > - OVSDB_CLIENT_TIMEOUT () { > - command ovsdb-client --timeout=$OVS_TIMEOUT "$@" > - } > -fi > +OVS_UTILS_LIST="ovs-vsctl ovs-ofctl ovs-appctl ovn-sbctl ovn-nbctl > + vtep-ctl ovsdb-client" > +for util in $OVS_UTILS_LIST; do > + alias $util="$util $OVS_TIMEOUT" >/dev/null 2>&1 Maybe I misunderstood something - should this be? + alias $util="$util --timeout=$OVS_TIMEOUT" >/dev/null 2>&1 > +done > > # parent_pid PID > # _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev