Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F151032809
D25220.id72952.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
5 KB
Referenced Files
None
Subscribers
None
D25220.id72952.diff
View Options
Index: etc/mtree/BSD.tests.dist
===================================================================
--- etc/mtree/BSD.tests.dist
+++ etc/mtree/BSD.tests.dist
@@ -448,6 +448,8 @@
..
ping6
..
+ route
+ ..
..
secure
lib
Index: sbin/route/Makefile
===================================================================
--- sbin/route/Makefile
+++ sbin/route/Makefile
@@ -19,6 +19,9 @@
.endif
CFLAGS+= -I.
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+= tests
+
keywords.h: keywords
LC_ALL=C awk '!/^#|^$$/ { \
printf "#define\tK_%s\t%d\n\t{\"%s\", K_%s},\n", \
Index: sbin/route/tests/Makefile
===================================================================
--- /dev/null
+++ sbin/route/tests/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+PACKAGE= tests
+
+ATF_TESTS_SH+= \
+ basic
+
+${PACKAGE}FILES+= \
+ utils.subr
+
+.include <bsd.test.mk>
Index: sbin/route/tests/basic.sh
===================================================================
--- /dev/null
+++ sbin/route/tests/basic.sh
@@ -0,0 +1,80 @@
+#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
+# Copyright (c) 2020 Ahsan Barkati
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+#
+
+. $(atf_get_srcdir)/utils.subr
+
+atf_test_case "basic_v4" "cleanup"
+basic_v4_head()
+{
+ atf_set descr 'add/change/delete route test for v4'
+ atf_set require.user root
+ atf_set require.progs jq
+}
+
+basic_v4_body()
+{
+ epair=$(vnet_mkepair)
+ ifconfig ${epair}a 192.0.2.2/24 up
+ vnet_mkjail alcatraz ${epair}b
+ jexec alcatraz ifconfig ${epair}b 192.0.2.1/24 up
+
+ # add a new route in the jail
+ jexec alcatraz route add 192.0.2.3 192.0.2.2
+ gateway=$(check_route "alcatraz" "192.0.2.3")
+
+ if [ "${gateway}" != "192.0.2.2" ]; then
+ atf_fail "Failed to add new route."
+ fi
+
+ # change the added route
+ jexec alcatraz route change 192.0.2.3 192.0.2.4
+ gateway=$(check_route "alcatraz" "192.0.2.3")
+
+ if [ "${gateway}" != "192.0.2.4" ]; then
+ atf_fail "Failed to change route."
+ fi
+
+ # delete the route
+ jexec alcatraz route delete 192.0.2.3
+ gateway=$(check_route "alcatraz" "192.0.2.3")
+
+ if [ "${gateway}" != "" ]; then
+ atf_fail "Failed to delete route."
+ fi
+}
+
+basic_v4_cleanup()
+{
+ vnet_cleanup
+}
+
+atf_init_test_cases()
+{
+ atf_add_test_case "basic_v4"
+}
Index: sbin/route/tests/utils.subr
===================================================================
--- /dev/null
+++ sbin/route/tests/utils.subr
@@ -0,0 +1,47 @@
+#-
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
+# Copyright (c) 2020 Ahsan Barkati
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+#
+
+. $(atf_get_srcdir)/../../sys/common/vnet.subr
+
+check_route()
+{
+ jname=$1
+ dest=$2
+ result=$(jexec $jname netstat -r --libxo json)
+
+ # This query selects the JSON item from the array of rt-entry of IPv4 table
+ # for which the destination address is $dest
+ query=".statistics.\"route-information\".\"route-table\".\"rt-family\"[0].\"rt-entry\"[]|select(.destination==\"${dest}\")"
+
+ # Gateway is then extracted from the JSON item as described above
+ gateway=$(echo $result | jq -r ${query}.gateway)
+
+ echo ${gateway}
+}
+
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Apr 6, 1:51 PM (3 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30974170
Default Alt Text
D25220.id72952.diff (5 KB)
Attached To
Mode
D25220: Add tests for "add", "change" and "delete" functionality of /sbin/route.
Attached
Detach File
Event Timeline
Log In to Comment