Merge branch 'master' of github.com:vyos/vyos-smoketest into vyos-smoketest-integration (T2832)

* 'master' of github.com:vyos/vyos-smoketest: (153 commits)
  pppoe-server: test some more values
  lcd: adjust to cli changes
  lcd: adapt test to new CLI design
  pppoe-server: initial smoketest with local and radius auth
  pppoe: validate dhcpv6 client will be started
  wireless: validate hostapd/wpa_supplicant is running
  pppoe: sync to new dhcpv6-pd cli
  anyconnect: T2812: add basic testing
  ethernet: check interface disable state
  router-advert: check 'infinity' option in script logic
  ssh: config file is now volatile (moved to /run)
  ipv6: link-local: test address assignment on interfaces
  router-advert: add initial test
  mdns-repeater: add basic test
  pseudo-ethernet: extend smoketests with VIFs
  l2tpv3: add initial interface test
  wireless: use library function for loading kernel modules
  ethernet: test "ip" subtree of interface for e.g. ARP settings
  pppoe: use assertEqual()
  service: bcast-relay: add initial tests
  ...

38 files changed, 3172 insertions, 1 deletions

diff --git a/.gitignore b/.gitignore
index e7c769aaa..e86ef4036 100644
--- a/.gitignore
+++ b/.gitignore
@@ -117,6 +117,7 @@ debian/debhelper-build-stamp
 debian/.debhelper/
 debian/vyos-1x
 debian/vyos-1x-vmware
+debian/vyos-1x-smoketest
 debian/*.postinst.debhelper
 debian/*.prerm.debhelper
 debian/*.substvars
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000000000..4362b4915
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,502 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/debian/control b/debian/control
index d6b4420c7..65808de86 100644
--- a/debian/control
+++ b/debian/control
@@ -122,3 +122,8 @@ Depends:
 Description: VyOS configuration scripts and data for VMware
  Adds configuration files required for VyOS running on VMware hosts.
 
+Package: vyos-1x-smoketest
+Architecture: all
+Depends:
+ vyos-1x
+Description: VyOS build sanity checking toolkit
diff --git a/debian/rules b/debian/rules
index c080b8633..58bafd333 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,3 +91,11 @@ override_dh_auto_install:
 
 	# Make directory for generated configuration file
 	mkdir -p $(DIR)/etc/vyos
+
+	# Install smoke test scripts
+	mkdir -p $(DIR)/$(VYOS_LIBEXEC_DIR)/tests/smoke/
+	cp -r smoketest/scripts/* $(DIR)/$(VYOS_LIBEXEC_DIR)/tests/smoke
+
+	# Install system programs
+	mkdir -p $(DIR)/$(VYOS_BIN_DIR)
+	cp -r smoketest/bin/* $(DIR)/$(VYOS_BIN_DIR)
diff --git a/debian/vyos-1x-smoketest.install b/debian/vyos-1x-smoketest.install
new file mode 100644
index 000000000..fdf949557
--- /dev/null
+++ b/debian/vyos-1x-smoketest.install
@@ -0,0 +1,2 @@
+usr/bin/vyos-smoketest
+usr/libexec/vyos/tests/smoke
diff --git a/debian/vyos-1x.install b/debian/vyos-1x.install
index 599f3f3f5..6cd678442 100644
--- a/debian/vyos-1x.install
+++ b/debian/vyos-1x.install
@@ -7,4 +7,17 @@ etc/udev
 etc/vyos
 lib/
 opt/
-usr/
+usr/bin/initial-setup
+usr/bin/vyos-config-file-query
+usr/bin/vyos-config-to-commands
+usr/bin/vyos-config-to-json
+usr/bin/vyos-hostsd-client
+usr/lib
+usr/libexec/vyos/completion
+usr/libexec/vyos/conf_mode
+usr/libexec/vyos/op_mode
+usr/libexec/vyos/services
+usr/libexec/vyos/system
+usr/libexec/vyos/validators
+usr/libexec/vyos/*.py
+usr/share
diff --git a/smoketest/bin/vyos-smoketest b/smoketest/bin/vyos-smoketest
new file mode 100755
index 000000000..cb039db42
--- /dev/null
+++ b/smoketest/bin/vyos-smoketest
@@ -0,0 +1,42 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2019-2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+
+from sys import exit
+from stat import S_IXOTH
+from subprocess import Popen, PIPE
+
+success = True
+for root, dirs, files in os.walk('/usr/libexec/vyos/tests/smoke'):
+    for name in files:
+        test_file = os.path.join(root, name)
+        mode = os.stat(test_file).st_mode
+
+        if mode & S_IXOTH:
+            print('Running Testcase: ' + test_file)
+            process = Popen([test_file], stdout=PIPE)
+            (output, err) = process.communicate()
+            exit_code = process.wait()
+            # We do not want an instant fail - other tests should be run, too
+            if exit_code != 0:
+                success = False
+
+if success:
+    exit(0)
+
+print("ERROR: One or more tests failed!")
+exit(1)
diff --git a/smoketest/scripts/cli/base_interfaces_test.py b/smoketest/scripts/cli/base_interfaces_test.py
new file mode 100644
index 000000000..14ec7e137
--- /dev/null
+++ b/smoketest/scripts/cli/base_interfaces_test.py
@@ -0,0 +1,269 @@
+# Copyright (C) 2019-2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import unittest
+
+from netifaces import ifaddresses, AF_INET, AF_INET6
+
+from vyos.configsession import ConfigSession
+from vyos.ifconfig import Interface
+from vyos.util import read_file
+from vyos.validate import is_intf_addr_assigned, is_ipv6_link_local
+
+class BasicInterfaceTest:
+    class BaseTest(unittest.TestCase):
+        _test_ip = False
+        _test_mtu = False
+        _test_vlan = False
+        _test_qinq = False
+        _test_ipv6 = False
+        _base_path = []
+
+        _options = {}
+        _interfaces = []
+        _qinq_range = ['10', '20', '30']
+        _vlan_range = ['100', '200', '300', '2000']
+        # choose IPv6 minimum MTU value for tests - this must always work
+        _mtu = '1280'
+
+        def setUp(self):
+            self.session = ConfigSession(os.getpid())
+
+            self._test_addr = ['192.0.2.1/26', '192.0.2.255/31', '192.0.2.64/32',
+                                '2001:db8:1::ffff/64', '2001:db8:101::1/112']
+            self._test_mtu = False
+            self._options = {}
+
+        def tearDown(self):
+            # we should not remove ethernet from the overall CLI
+            if 'ethernet' in self._base_path:
+                for interface in self._interfaces:
+                    # when using a dedicated interface to test via TEST_ETH environment
+                    # variable only this one will be cleared in the end - usable to test
+                    # ethernet interfaces via SSH
+                    self.session.delete(self._base_path + [interface])
+                    self.session.set(self._base_path + [interface, 'duplex', 'auto'])
+                    self.session.set(self._base_path + [interface, 'speed', 'auto'])
+                    self.session.set(self._base_path + [interface, 'smp-affinity', 'auto'])
+            else:
+                self.session.delete(self._base_path)
+
+            self.session.commit()
+            del self.session
+
+        def test_add_description(self):
+            """
+            Check if description can be added to interface
+            """
+            for intf in self._interfaces:
+                test_string='Description-Test-{}'.format(intf)
+                self.session.set(self._base_path + [intf, 'description', test_string])
+                for option in self._options.get(intf, []):
+                    self.session.set(self._base_path + [intf] + option.split())
+
+            self.session.commit()
+
+            # Validate interface description
+            for intf in self._interfaces:
+                test_string='Description-Test-{}'.format(intf)
+                with open('/sys/class/net/{}/ifalias'.format(intf), 'r') as f:
+                    tmp = f.read().rstrip()
+                    self.assertTrue(tmp, test_string)
+
+        def test_add_address_single(self):
+            """
+            Check if a single address can be added to interface.
+            """
+            addr = '192.0.2.0/31'
+            for intf in self._interfaces:
+                self.session.set(self._base_path + [intf, 'address', addr])
+                for option in self._options.get(intf, []):
+                    self.session.set(self._base_path + [intf] + option.split())
+
+            self.session.commit()
+
+            for intf in self._interfaces:
+                self.assertTrue(is_intf_addr_assigned(intf, addr))
+
+        def test_add_address_multi(self):
+            """
+            Check if IPv4/IPv6 addresses can be added to interface.
+            """
+
+            # Add address
+            for intf in self._interfaces:
+                for addr in self._test_addr:
+                    self.session.set(self._base_path + [intf, 'address', addr])
+                    for option in self._options.get(intf, []):
+                        self.session.set(self._base_path + [intf] + option.split())
+
+            self.session.commit()
+
+            # Validate address
+            for intf in self._interfaces:
+                for af in AF_INET, AF_INET6:
+                    for addr in ifaddresses(intf)[af]:
+                        # checking link local addresses makes no sense
+                        if is_ipv6_link_local(addr['addr']):
+                            continue
+
+                        self.assertTrue(is_intf_addr_assigned(intf, addr['addr']))
+
+        def test_ipv6_link_local(self):
+            """ Common function for IPv6 link-local address assignemnts """
+            if not self._test_ipv6:
+                return None
+
+            for interface in self._interfaces:
+                base = self._base_path + [interface]
+                for option in self._options.get(interface, []):
+                    self.session.set(base + option.split())
+
+            # after commit we must have an IPv6 link-local address
+            self.session.commit()
+
+            for interface in self._interfaces:
+                for addr in ifaddresses(interface)[AF_INET6]:
+                    self.assertTrue(is_ipv6_link_local(addr['addr']))
+
+            # disable IPv6 link-local address assignment
+            for interface in self._interfaces:
+                base = self._base_path + [interface]
+                self.session.set(base + ['ipv6', 'address', 'no-default-link-local'])
+
+            # after commit we must have no IPv6 link-local address
+            self.session.commit()
+
+            for interface in self._interfaces:
+                self.assertTrue(AF_INET6 not in ifaddresses(interface))
+
+        def _mtu_test(self, intf):
+            """ helper function to verify MTU size """
+            with open('/sys/class/net/{}/mtu'.format(intf), 'r') as f:
+                tmp = f.read().rstrip()
+                self.assertEqual(tmp, self._mtu)
+
+        def test_change_mtu(self):
+            """ Testcase if MTU can be changed on interface """
+            if not self._test_mtu:
+                return None
+            for intf in self._interfaces:
+                base = self._base_path + [intf]
+                self.session.set(base + ['mtu', self._mtu])
+                for option in self._options.get(intf, []):
+                    self.session.set(base + option.split())
+
+            self.session.commit()
+            for intf in self._interfaces:
+                self._mtu_test(intf)
+
+        def test_8021q_vlan(self):
+            """ Testcase for 802.1q VLAN interfaces """
+            if not self._test_vlan:
+                return None
+
+            for interface in self._interfaces:
+                base = self._base_path + [interface]
+                for option in self._options.get(interface, []):
+                    self.session.set(base + option.split())
+
+                for vlan in self._vlan_range:
+                    base = self._base_path + [interface, 'vif', vlan]
+                    self.session.set(base + ['mtu', self._mtu])
+                    for address in self._test_addr:
+                        self.session.set(base + ['address', address])
+
+            self.session.commit()
+            for intf in self._interfaces:
+                for vlan in self._vlan_range:
+                    vif = f'{intf}.{vlan}'
+                    for address in self._test_addr:
+                        self.assertTrue(is_intf_addr_assigned(vif, address))
+                    self._mtu_test(vif)
+
+
+        def test_8021ad_qinq_vlan(self):
+            """ Testcase for 802.1ad Q-in-Q VLAN interfaces """
+            if not self._test_qinq:
+                return None
+
+            for interface in self._interfaces:
+                base = self._base_path + [interface]
+                for option in self._options.get(interface, []):
+                    self.session.set(base + option.split())
+
+                for vif_s in self._qinq_range:
+                    for vif_c in self._vlan_range:
+                        base = self._base_path + [interface, 'vif-s', vif_s, 'vif-c', vif_c]
+                        self.session.set(base + ['mtu', self._mtu])
+                        for address in self._test_addr:
+                            self.session.set(base + ['address', address])
+
+            self.session.commit()
+            for interface in self._interfaces:
+                for vif_s in self._qinq_range:
+                    for vif_c in self._vlan_range:
+                        vif = f'{interface}.{vif_s}.{vif_c}'
+                        for address in self._test_addr:
+                            self.assertTrue(is_intf_addr_assigned(vif, address))
+                        self._mtu_test(vif)
+
+        def test_ip_options(self):
+            """ test IP options like arp """
+            if not self._test_ip:
+                return None
+
+            for interface in self._interfaces:
+                arp_tmo = '300'
+                path = self._base_path + [interface]
+                for option in self._options.get(interface, []):
+                    self.session.set(path + option.split())
+
+                # Options
+                self.session.set(path + ['ip', 'arp-cache-timeout', arp_tmo])
+                self.session.set(path + ['ip', 'disable-arp-filter'])
+                self.session.set(path + ['ip', 'enable-arp-accept'])
+                self.session.set(path + ['ip', 'enable-arp-announce'])
+                self.session.set(path + ['ip', 'enable-arp-ignore'])
+                self.session.set(path + ['ip', 'enable-proxy-arp'])
+                self.session.set(path + ['ip', 'proxy-arp-pvlan'])
+                self.session.set(path + ['ip', 'source-validation', 'loose'])
+
+            self.session.commit()
+
+            for interface in self._interfaces:
+                tmp = read_file(f'/proc/sys/net/ipv4/neigh/{interface}/base_reachable_time_ms')
+                self.assertEqual(tmp, str((int(arp_tmo) * 1000))) # tmo value is in milli seconds
+
+                tmp = read_file(f'/proc/sys/net/ipv4/conf/{interface}/arp_filter')
+                self.assertEqual('0', tmp)
+
+                tmp = read_file(f'/proc/sys/net/ipv4/conf/{interface}/arp_accept')
+                self.assertEqual('1', tmp)
+
+                tmp = read_file(f'/proc/sys/net/ipv4/conf/{interface}/arp_announce')
+                self.assertEqual('1', tmp)
+
+                tmp = read_file(f'/proc/sys/net/ipv4/conf/{interface}/arp_ignore')
+                self.assertEqual('1', tmp)
+
+                tmp = read_file(f'/proc/sys/net/ipv4/conf/{interface}/proxy_arp')
+                self.assertEqual('1', tmp)
+
+                tmp = read_file(f'/proc/sys/net/ipv4/conf/{interface}/proxy_arp_pvlan')
+                self.assertEqual('1', tmp)
+
+                tmp = read_file(f'/proc/sys/net/ipv4/conf/{interface}/rp_filter')
+                self.assertEqual('2', tmp)
diff --git a/smoketest/scripts/cli/test_interfaces_bonding.py b/smoketest/scripts/cli/test_interfaces_bonding.py
new file mode 100755
index 000000000..e3d3b25ee
--- /dev/null
+++ b/smoketest/scripts/cli/test_interfaces_bonding.py
@@ -0,0 +1,61 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import unittest
+
+from base_interfaces_test import BasicInterfaceTest
+
+from vyos.ifconfig import Section
+from vyos.configsession import ConfigSessionError
+from vyos.util import read_file
+
+class BondingInterfaceTest(BasicInterfaceTest.BaseTest):
+    def setUp(self):
+        super().setUp()
+
+        self._base_path = ['interfaces', 'bonding']
+        self._interfaces = ['bond0']
+        self._test_mtu = True
+        self._test_vlan = True
+        self._test_qinq = True
+        self._test_ipv6 = True
+
+        self._members = []
+        # we need to filter out VLAN interfaces identified by a dot (.)
+        # in their name - just in case!
+        if 'TEST_ETH' in os.environ:
+            self._members = os.environ['TEST_ETH'].split()
+        else:
+            for tmp in Section.interfaces("ethernet"):
+                if not '.' in tmp:
+                    self._members.append(tmp)
+
+        self._options['bond0'] = []
+        for member in self._members:
+            self._options['bond0'].append(f'member interface {member}')
+
+
+    def test_add_address_single(self):
+        """ derived method to check if member interfaces are enslaved properly """
+        super().test_add_address_single()
+
+        for interface in self._interfaces:
+            slaves = read_file(f'/sys/class/net/{interface}/bonding/slaves').split()
+            self.assertListEqual(slaves, self._members)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/smoketest/scripts/cli/test_interfaces_bridge.py b/smoketest/scripts/cli/test_interfaces_bridge.py
new file mode 100755
index 000000000..bc0bb69c6
--- /dev/null
+++ b/smoketest/scripts/cli/test_interfaces_bridge.py
@@ -0,0 +1,70 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import unittest
+
+from base_interfaces_test import BasicInterfaceTest
+from vyos.ifconfig import Section
+
+class BridgeInterfaceTest(BasicInterfaceTest.BaseTest):
+    def setUp(self):
+        super().setUp()
+
+        self._test_ipv6 = True
+
+        self._base_path = ['interfaces', 'bridge']
+        self._interfaces = ['br0']
+
+        self._members = []
+        # we need to filter out VLAN interfaces identified by a dot (.)
+        # in their name - just in case!
+        if 'TEST_ETH' in os.environ:
+            self._members = os.environ['TEST_ETH'].split()
+        else:
+            for tmp in Section.interfaces("ethernet"):
+                if not '.' in tmp:
+                    self._members.append(tmp)
+
+        self._options['br0'] = []
+        for member in self._members:
+            self._options['br0'].append(f'member interface {member}')
+
+    def test_add_remove_member(self):
+        for interface in self._interfaces:
+            base = self._base_path + [interface]
+            self.session.set(base + ['stp'])
+            self.session.set(base + ['address', '192.0.2.1/24'])
+
+            cost = 1000
+            priority = 10
+            # assign members to bridge interface
+            for member in self._members:
+                base_member = base + ['member', 'interface', member]
+                self.session.set(base_member + ['cost', str(cost)])
+                self.session.set(base_member + ['priority', str(priority)])
+                cost += 1
+                priority += 1
+
+        self.session.commit()
+
+        for interface in self._interfaces:
+            self.session.delete(self._base_path + [interface, 'member'])
+
+        self.session.commit()
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/smoketest/scripts/cli/test_interfaces_dummy.py b/smoketest/scripts/cli/test_interfaces_dummy.py
new file mode 100755
index 000000000..01942fc89
--- /dev/null
+++ b/smoketest/scripts/cli/test_interfaces_dummy.py
@@ -0,0 +1,28 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import unittest
+
+from base_interfaces_test import BasicInterfaceTest
+
+class DummyInterfaceTest(BasicInterfaceTest.BaseTest):
+    def setUp(self):
+         super().setUp()
+         self._base_path = ['interfaces', 'dummy']
+         self._interfaces = ['dum0', 'dum1', 'dum2']
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/smoketest/scripts/cli/test_interfaces_ethernet.py b/smoketest/scripts/cli/test_interfaces_ethernet.py
new file mode 100755
index 000000000..761ec7506
--- /dev/null
+++ b/smoketest/scripts/cli/test_interfaces_ethernet.py
@@ -0,0 +1,68 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import unittest
+
+from base_interfaces_test import BasicInterfaceTest
+from vyos.ifconfig import Section
+
+class EthernetInterfaceTest(BasicInterfaceTest.BaseTest):
+    def setUp(self):
+        super().setUp()
+
+        self._base_path = ['interfaces', 'ethernet']
+        self._test_ip = True
+        self._test_mtu = True
+        self._test_vlan = True
+        self._test_qinq = True
+        self._test_ipv6 = True
+        self._interfaces = []
+
+        # we need to filter out VLAN interfaces identified by a dot (.)
+        # in their name - just in case!
+        if 'TEST_ETH' in os.environ:
+            tmp = os.environ['TEST_ETH'].split()
+            self._interfaces = tmp
+        else:
+            for tmp in Section.interfaces("ethernet"):
+                if not '.' in tmp:
+                    self._interfaces.append(tmp)
+
+        def test_dhcp_disable(self):
+            """
+            When interface is configured as admin down, it must be admin down even
+            """
+            for interface in self._interfaces:
+                self.session.set(self._base_path + [interface, 'disable'])
+                for option in self._options.get(interface, []):
+                    self.session.set(self._base_path + [interface] + option.split())
+
+                # Also enable DHCP (ISC DHCP always places interface in admin up
+                # state so we check that we do not start DHCP client.
+                # https://phabricator.vyos.net/T2767
+                self.session.set(self._base_path + [interface, 'address', 'dhcp'])
+
+            self.session.commit()
+
+            # Validate interface state
+            for interface in self._interfaces:
+                with open(f'/sys/class/net/{interface}/flags', 'r') as f:
+                    flags = f.read()
+                self.assertEqual(int(flags, 16) & 1, 0)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/smoketest/scripts/cli/test_interfaces_geneve.py b/smoketest/scripts/cli/test_interfaces_geneve.py
new file mode 100755
index 000000000..f84a55f86
--- /dev/null
+++ b/smoketest/scripts/cli/test_interfaces_geneve.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import unittest
+
+from vyos.configsession import ConfigSession, ConfigSessionError
+from base_interfaces_test import BasicInterfaceTest
+
+
+class GeneveInterfaceTest(BasicInterfaceTest.BaseTest):
+    def setUp(self):
+        super().setUp()
+
+        self._base_path = ['interfaces', 'geneve']
+        self._options = {
+            'gnv0': ['vni 10', 'remote 127.0.1.1'],
+            'gnv1': ['vni 20', 'remote 127.0.1.2'],
+        }
+        self._interfaces = list(self._options)
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/smoketest/scripts/cli/test_interfaces_l2tpv3.py b/smoketest/scripts/cli/test_interfaces_l2tpv3.py
new file mode 100755
index 000000000..d8655d157
--- /dev/null
+++ b/smoketest/scripts/cli/test_interfaces_l2tpv3.py
@@ -0,0 +1,59 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import json
+import jmespath
+import unittest
+
+from base_interfaces_test import BasicInterfaceTest
+from vyos.util import cmd
+
+class GeneveInterfaceTest(BasicInterfaceTest.BaseTest):
+    def setUp(self):
+        super().setUp()
+
+        self._base_path = ['interfaces', 'l2tpv3']
+        self._options = {
+            'l2tpeth10': ['local-ip 127.0.0.1', 'remote-ip 127.10.10.10',
+                          'tunnel-id 100', 'peer-tunnel-id 10',
+                          'session-id 100', 'peer-session-id 10',
+                          'source-port 1010', 'destination-port 10101'],
+            'l2tpeth20': ['local-ip 127.0.0.1', 'peer-session-id 20',
+                          'peer-tunnel-id 200', 'remote-ip 127.20.20.20',
+                          'session-id 20', 'tunnel-id 200',
+                          'source-port 2020', 'destination-port 20202'],
+        }
+        self._interfaces = list(self._options)
+
+    def test_add_address_single(self):
+        super().test_add_address_single()
+
+        command = 'sudo ip -j l2tp show session'
+        json_out = json.loads(cmd(command))
+        for interface in self._options:
+            for config in json_out:
+                if config['interface'] == interface:
+                    # convert list with configuration items into a dict
+                    dict = {}
+                    for opt in self._options[interface]:
+                        dict.update({opt.split()[0].replace('-','_'): opt.split()[1]})
+
+                    for key in ['peer_session_id', 'peer_tunnel_id', 'session_id', 'tunnel_id']:
+                        self.assertEqual(str(config[key]), dict[key])
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/smoketest/scripts/cli/test_interfaces_loopback.py b/smoketest/scripts/cli/test_interfaces_loopback.py
new file mode 100755
index 000000000..ba428b5d3
--- /dev/null
+++ b/smoketest/scripts/cli/test_interfaces_loopback.py
@@ -0,0 +1,41 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import unittest
+
+from base_interfaces_test import BasicInterfaceTest
+from vyos.validate import is_intf_addr_assigned
+
+class LoopbackInterfaceTest(BasicInterfaceTest.BaseTest):
+    def setUp(self):
+         super().setUp()
+         # these addresses are never allowed to be removed from the system
+         self._loopback_addresses = ['127.0.0.1', '::1']
+         self._base_path = ['interfaces', 'loopback']
+         self._interfaces = ['lo']
+
+    def test_add_address_single(self):
+        super().test_add_address_single()
+        for addr in self._loopback_addresses:
+            self.assertTrue(is_intf_addr_assigned('lo', addr))
+
+    def test_add_address_multi(self):
+        super().test_add_address_multi()
+        for addr in self._loopback_addresses:
+            self.assertTrue(is_intf_addr_assigned('lo', addr))
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/smoketest/scripts/cli/test_interfaces_macsec.py b/smoketest/scripts/cli/test_interfaces_macsec.py
new file mode 100755
index 000000000..0f1b6486d
--- /dev/null
+++ b/smoketest/scripts/cli/test_interfaces_macsec.py
@@ -0,0 +1,102 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import re
+import unittest
+from psutil import process_iter
+
+from vyos.ifconfig import Section
+from base_interfaces_test import BasicInterfaceTest
+from vyos.configsession import ConfigSessionError
+from vyos.util import read_file
+
+def get_config_value(intf, key):
+    tmp = read_file(f'/run/wpa_supplicant/{intf}.conf')
+    tmp = re.findall(r'\n?{}=(.*)'.format(key), tmp)
+    return tmp[0]
+
+class MACsecInterfaceTest(BasicInterfaceTest.BaseTest):
+    def setUp(self):
+         super().setUp()
+         self._base_path = ['interfaces', 'macsec']
+         self._options = {
+             'macsec0': ['source-interface eth0',
+                         'security cipher gcm-aes-128']
+         }
+
+         # if we have a physical eth1 interface, add a second macsec instance
+         if 'eth1' in Section.interfaces("ethernet"):
+             macsec = { 'macsec1': ['source-interface eth1', 'security cipher gcm-aes-128'] }
+             self._options.update(macsec)
+
+         self._interfaces = list(self._options)
+
+    def test_encryption(self):
+        """ MACsec can be operating in authentication and encryption
+        mode - both using different mandatory settings, lets test
+        encryption as the basic authentication test has been performed
+        using the base class tests """
+        intf = 'macsec0'
+        src_intf = 'eth0'
+        mak_cak = '232e44b7fda6f8e2d88a07bf78a7aff4'
+        mak_ckn = '40916f4b23e3d548ad27eedd2d10c6f98c2d21684699647d63d41b500dfe8836'
+        replay_window = '64'
+        self.session.set(self._base_path + [intf, 'security', 'encrypt'])
+
+        # check validate() - Cipher suite must be set for MACsec
+        with self.assertRaises(ConfigSessionError):
+            self.session.commit()
+        self.session.set(self._base_path + [intf, 'security', 'cipher', 'gcm-aes-128'])
+
+        # check validate() - Physical source interface must be set for MACsec
+        with self.assertRaises(ConfigSessionError):
+            self.session.commit()
+        self.session.set(self._base_path + [intf, 'source-interface', src_intf])
+
+        # check validate() - MACsec security keys mandartory when encryption is enabled
+        with self.assertRaises(ConfigSessionError):
+            self.session.commit()
+        self.session.set(self._base_path + [intf, 'security', 'mka', 'cak', mak_cak])
+
+        # check validate() - MACsec security keys mandartory when encryption is enabled
+        with self.assertRaises(ConfigSessionError):
+            self.session.commit()
+        self.session.set(self._base_path + [intf, 'security', 'mka', 'ckn', mak_ckn])
+
+        self.session.set(self._base_path + [intf, 'security', 'replay-window', replay_window])
+        self.session.commit()
+
+        tmp = get_config_value(src_intf, 'macsec_integ_only')
+        self.assertTrue("0" in tmp)
+
+        tmp = get_config_value(src_intf, 'mka_cak')
+        self.assertTrue(mak_cak in tmp)
+
+        tmp = get_config_value(src_intf, 'mka_ckn')
+        self.assertTrue(mak_ckn in tmp)
+
+        # check that the default priority of 255 is programmed
+        tmp = get_config_value(src_intf, 'mka_priority')
+        self.assertTrue("255" in tmp)
+
+        tmp = get_config_value(src_intf, 'macsec_replay_window')
+        self.assertTrue(replay_window in tmp)
+
+        # Check for running process
+        self.assertTrue("wpa_supplicant" in (p.name() for p in process_iter()))
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/smoketest/scripts/cli/test_interfaces_pppoe.py b/smoketest/scripts/cli/test_interfaces_pppoe.py
new file mode 100755
index 000000000..822f05de6
--- /dev/null
+++ b/smoketest/scripts/cli/test_interfaces_pppoe.py
@@ -0,0 +1,162 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2019-2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import re
+import os
+import unittest
+
+from psutil import process_iter
+from vyos.configsession import ConfigSession, ConfigSessionError
+from vyos.util import read_file
+
+config_file = '/etc/ppp/peers/{}'
+dhcp6c_config_file = '/run/dhcp6c/dhcp6c.{}.conf'
+base_path = ['interfaces', 'pppoe']
+
+def get_config_value(interface, key):
+    with open(config_file.format(interface), 'r') as f:
+        for line in f:
+            if line.startswith(key):
+                return list(line.split())
+    return []
+
+def get_dhcp6c_config_value(interface, key):
+    tmp = read_file(dhcp6c_config_file.format(interface))
+    tmp = re.findall(r'\n?{}\s+(.*)'.format(key), tmp)
+
+    out = []
+    for item in tmp:
+        out.append(item.replace(';',''))
+    return out
+
+class PPPoEInterfaceTest(unittest.TestCase):
+    def setUp(self):
+        self.session = ConfigSession(os.getpid())
+        self._interfaces = ['pppoe0', 'pppoe50']
+        self._source_interface = 'eth0'
+
+    def tearDown(self):
+        self.session.delete(base_path)
+        self.session.commit()
+        del self.session
+
+    def test_pppoe(self):
+        """ Check if PPPoE dialer can be configured and runs """
+        for interface in self._interfaces:
+            user = 'VyOS-user-' + interface
+            passwd = 'VyOS-passwd-' + interface
+            mtu = '1400'
+
+            self.session.set(base_path + [interface, 'authentication', 'user', user])
+            self.session.set(base_path + [interface, 'authentication', 'password', passwd])
+            self.session.set(base_path + [interface, 'default-route', 'auto'])
+            self.session.set(base_path + [interface, 'mtu', mtu])
+            self.session.set(base_path + [interface, 'no-peer-dns'])
+
+            # check validate() - a source-interface is required
+            with self.assertRaises(ConfigSessionError):
+                self.session.commit()
+            self.session.set(base_path + [interface, 'source-interface', self._source_interface])
+
+            # commit changes
+            self.session.commit()
+
+        # verify configuration file(s)
+        for interface in self._interfaces:
+            user = 'VyOS-user-' + interface
+            password = 'VyOS-passwd-' + interface
+
+            tmp = get_config_value(interface, 'mtu')[1]
+            self.assertEqual(tmp, mtu)
+            tmp = get_config_value(interface, 'user')[1].replace('"', '')
+            self.assertEqual(tmp, user)
+            tmp = get_config_value(interface, 'password')[1].replace('"', '')
+            self.assertEqual(tmp, password)
+            tmp = get_config_value(interface, 'ifname')[1]
+            self.assertEqual(tmp, interface)
+
+            # Check if ppp process is running in the interface in question
+            running = False
+            for p in process_iter():
+                if "pppd" in p.name():
+                    if interface in p.cmdline():
+                        running = True
+
+            self.assertTrue(running)
+
+    def test_pppoe_dhcpv6pd(self):
+        """ Check if PPPoE dialer can be configured with DHCPv6-PD """
+        address = '1'
+        sla_id = '0'
+        sla_len = '8'
+        for interface in self._interfaces:
+            self.session.set(base_path + [interface, 'authentication', 'user', 'vyos'])
+            self.session.set(base_path + [interface, 'authentication', 'password', 'vyos'])
+            self.session.set(base_path + [interface, 'default-route', 'none'])
+            self.session.set(base_path + [interface, 'no-peer-dns'])
+            self.session.set(base_path + [interface, 'source-interface', self._source_interface])
+            self.session.set(base_path + [interface, 'ipv6', 'enable'])
+
+            # prefix delegation stuff
+            dhcpv6_pd_base = base_path + [interface, 'dhcpv6-options', 'pd', '0']
+            self.session.set(dhcpv6_pd_base + ['length', '56'])
+            self.session.set(dhcpv6_pd_base + ['interface', self._source_interface, 'address', address])
+            self.session.set(dhcpv6_pd_base + ['interface', self._source_interface, 'sla-id',  sla_id])
+
+            # commit changes
+            self.session.commit()
+
+            # verify "normal" PPPoE value - 1492 is default MTU
+            tmp = get_config_value(interface, 'mtu')[1]
+            self.assertEqual(tmp, '1492')
+            tmp = get_config_value(interface, 'user')[1].replace('"', '')
+            self.assertEqual(tmp, 'vyos')
+            tmp = get_config_value(interface, 'password')[1].replace('"', '')
+            self.assertEqual(tmp, 'vyos')
+
+            for param in ['+ipv6', 'ipv6cp-use-ipaddr']:
+                tmp = get_config_value(interface, param)[0]
+                self.assertEqual(tmp, param)
+
+            # verify DHCPv6 prefix delegation
+            # will return: ['delegation', '::/56 infinity;']
+            tmp = get_dhcp6c_config_value(interface, 'prefix')[1].split()[0] # mind the whitespace
+            self.assertEqual(tmp, '::/56')
+            tmp = get_dhcp6c_config_value(interface, 'prefix-interface')[0].split()[0]
+            self.assertEqual(tmp, self._source_interface)
+            tmp = get_dhcp6c_config_value(interface, 'ifid')[0]
+            self.assertEqual(tmp, address)
+            tmp = get_dhcp6c_config_value(interface, 'sla-id')[0]
+            self.assertEqual(tmp, sla_id)
+            tmp = get_dhcp6c_config_value(interface, 'sla-len')[0]
+            self.assertEqual(tmp, sla_len)
+
+            # Check if ppp process is running in the interface in question
+            running = False
+            for p in process_iter():
+                if "pppd" in p.name():
+                    running = True
+            self.assertTrue(running)
+
+            # We can not check if wide-dhcpv6 process is running as it is started
+            # after the PPP interface gets a link to the ISP - but we can see if
+            # it would be started by the scripts
+            tmp = read_file(f'/etc/ppp/ipv6-up.d/1000-vyos-pppoe-{interface}')
+            tmp = re.findall(f'systemctl start dhcp6c@{interface}.service', tmp)
+            self.assertTrue(tmp)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/smoketest/scripts/cli/test_interfaces_pseudo_ethernet.py b/smoketest/scripts/cli/test_interfaces_pseudo_ethernet.py
new file mode 100755
index 000000000..bc2e6e7eb
--- /dev/null
+++ b/smoketest/scripts/cli/test_interfaces_pseudo_ethernet.py
@@ -0,0 +1,39 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import unittest
+
+from base_interfaces_test import BasicInterfaceTest
+
+class PEthInterfaceTest(BasicInterfaceTest.BaseTest):
+
+    def setUp(self):
+        super().setUp()
+        self._base_path = ['interfaces', 'pseudo-ethernet']
+
+        self._test_ip = True
+        self._test_mtu = True
+        self._test_vlan = True
+        self._test_qinq = True
+
+        self._options = {
+            'peth0': ['source-interface eth1'],
+            'peth1': ['source-interface eth1'],
+        }
+        self._interfaces = list(self._options)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/smoketest/scripts/cli/test_interfaces_tunnel.py b/smoketest/scripts/cli/test_interfaces_tunnel.py
new file mode 100755
index 000000000..7611ffe26
--- /dev/null
+++ b/smoketest/scripts/cli/test_interfaces_tunnel.py
@@ -0,0 +1,109 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import unittest
+
+from vyos.configsession import ConfigSession
+
+from base_interfaces_test import BasicInterfaceTest
+
+class TunnelInterfaceTest(BasicInterfaceTest.BaseTest):
+    # encoding, tunnel endpoint (v4/v6), address (v4/v6)
+    _valid = [
+        ('gre', 4, 4),
+        ('gre', 4, 6),
+        ('ip6gre', 6, 4),
+        ('ip6gre', 6, 6),
+        ('gre-bridge', 4, 4),
+        ('ipip', 4, 4),
+        ('ipip', 4, 6),
+        ('ipip6', 6, 4),
+        ('ipip6', 6, 6),
+        ('ip6ip6', 6, 6),
+        ('sit', 4, 6),
+    ]
+
+    local = {
+        4: '10.100.{}.1/24',
+        6:  '2001:db8:{}::1/64',
+    }
+
+    remote = {
+        4: '192.0.{}.1',
+        6: '2002::{}:1',
+    }
+
+    address = {
+        4: '10.100.{}.1/24',
+        6:  '2001:db8:{}::1/64',
+    }
+
+    def setUp(self):
+        local = {}
+        remote = {}
+        address = {}
+
+        self._intf_dummy = ['interfaces', 'dummy']
+        self._base_path = ['interfaces', 'tunnel']
+        self._interfaces = ['tun{}'.format(n) for n in range(len(self._valid))]
+
+        self._test_mtu = True
+        super().setUp()
+
+        for number in range(len(self._valid)):
+            dum4 = 'dum4{}'.format(number)
+            dum6 = 'dum6{}'.format(number)
+
+            ipv4 = self.local[4].format(number)
+            ipv6 = self.local[6].format(number)
+
+            local.setdefault(4, {})[number] = ipv4
+            local.setdefault(6, {})[number] = ipv6
+
+            ipv4 = self.remote[4].format(number)
+            ipv6 = self.remote[6].format(number)
+
+            remote.setdefault(4, {})[number] = ipv4
+            remote.setdefault(6, {})[number] = ipv6
+
+            ipv4 = self.address[4].format(number)
+            ipv6 = self.address[6].format(number)
+
+            address.setdefault(4, {})[number] = ipv4
+            address.setdefault(6, {})[number] = ipv6
+
+            self.session.set(self._intf_dummy + [dum4, 'address', ipv4])
+            self.session.set(self._intf_dummy + [dum6, 'address', ipv6])
+        self.session.commit()
+
+        for number, (encap, p2p, addr) in enumerate(self._valid):
+            intf = 'tun%d' % number
+            tunnel = {}
+            tunnel['encapsulation'] = encap
+            tunnel['local-ip'] = local[p2p][number].split('/')[0]
+            tunnel['remote-ip'] = remote[p2p][number].split('/')[0]
+            tunnel['address'] = address[addr][number]
+            for name in tunnel:
+                self.session.set(self._base_path + [intf, name, tunnel[name]])
+
+    def tearDown(self):
+        self.session.delete(self._intf_dummy)
+        super().tearDown()
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/smoketest/scripts/cli/test_interfaces_vxlan.py b/smoketest/scripts/cli/test_interfaces_vxlan.py
new file mode 100755
index 000000000..2628e0285
--- /dev/null
+++ b/smoketest/scripts/cli/test_interfaces_vxlan.py
@@ -0,0 +1,35 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import unittest
+
+from vyos.configsession import ConfigSession, ConfigSessionError
+from base_interfaces_test import BasicInterfaceTest
+
+class VXLANInterfaceTest(BasicInterfaceTest.BaseTest):
+    def setUp(self):
+        super().setUp()
+
+        self._test_mtu = True
+        self._base_path = ['interfaces', 'vxlan']
+        self._options = {
+            'vxlan0': ['vni 10', 'remote 127.0.0.2'],
+            'vxlan1': ['vni 20', 'group 239.1.1.1', 'source-interface eth0'],
+        }
+        self._interfaces = list(self._options)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/smoketest/scripts/cli/test_interfaces_wireguard.py b/smoketest/scripts/cli/test_interfaces_wireguard.py
new file mode 100755
index 000000000..0c32a4696
--- /dev/null
+++ b/smoketest/scripts/cli/test_interfaces_wireguard.py
@@ -0,0 +1,68 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import unittest
+
+from vyos.configsession import ConfigSession, ConfigSessionError
+from base_interfaces_test import BasicInterfaceTest
+
+# Generate WireGuard default keypair
+if not os.path.isdir('/config/auth/wireguard/default'):
+    os.system('sudo /usr/libexec/vyos/op_mode/wireguard.py --genkey')
+
+base_path = ['interfaces', 'wireguard']
+
+class WireGuardInterfaceTest(unittest.TestCase):
+    def setUp(self):
+        self.session = ConfigSession(os.getpid())
+        self._test_addr = ['192.0.2.1/26', '192.0.2.255/31', '192.0.2.64/32',
+                          '2001:db8:1::ffff/64', '2001:db8:101::1/112']
+        self._interfaces = ['wg0', 'wg1']
+
+    def tearDown(self):
+        self.session.delete(base_path)
+        self.session.commit()
+        del self.session
+
+    def test_peer_setup(self):
+        """
+        Create WireGuard interfaces with associated peers
+        """
+        for intf in self._interfaces:
+            peer = 'foo-' + intf
+            psk = 'u2xdA70hkz0S1CG0dZlOh0aq2orwFXRIVrKo4DCvHgM='
+            pubkey = 'n6ZZL7ph/QJUJSUUTyu19c77my1dRCDHkMzFQUO9Z3A='
+
+            for addr in self._test_addr:
+                self.session.set(base_path + [intf, 'address', addr])
+
+            self.session.set(base_path + [intf, 'peer', peer, 'address', '127.0.0.1'])
+            self.session.set(base_path + [intf, 'peer', peer, 'port', '1337'])
+
+            # Allow different prefixes to traverse the tunnel
+            allowed_ips = ['10.0.0.0/8', '172.16.0.0/12', '192.168.0.0/16']
+            for ip in allowed_ips:
+                self.session.set(base_path + [intf, 'peer', peer, 'allowed-ips', ip])
+
+            self.session.set(base_path + [intf, 'peer', peer, 'preshared-key', psk])
+            self.session.set(base_path + [intf, 'peer', peer, 'pubkey', pubkey])
+            self.session.commit()
+
+            self.assertTrue(os.path.isdir(f'/sys/class/net/{intf}'))
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/smoketest/scripts/cli/test_interfaces_wireless.py b/smoketest/scripts/cli/test_interfaces_wireless.py
new file mode 100755
index 000000000..fae233244
--- /dev/null
+++ b/smoketest/scripts/cli/test_interfaces_wireless.py
@@ -0,0 +1,58 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import unittest
+
+from base_interfaces_test import BasicInterfaceTest
+from psutil import process_iter
+from vyos.util import check_kmod
+
+class WirelessInterfaceTest(BasicInterfaceTest.BaseTest):
+    def setUp(self):
+        super().setUp()
+
+        self._base_path = ['interfaces', 'wireless']
+        self._options = {
+            'wlan0':  ['physical-device phy0', 'ssid VyOS-WIFI-0',
+                       'type station', 'address 192.0.2.1/30'],
+            'wlan1':  ['physical-device phy0', 'ssid VyOS-WIFI-1',
+                       'type access-point', 'address 192.0.2.5/30', 'channel 0'],
+            'wlan10': ['physical-device phy1', 'ssid VyOS-WIFI-2',
+                       'type station', 'address 192.0.2.9/30'],
+            'wlan11': ['physical-device phy1', 'ssid VyOS-WIFI-3',
+                       'type access-point', 'address 192.0.2.13/30', 'channel 0'],
+        }
+        self._interfaces = list(self._options)
+        self.session.set(['system', 'wifi-regulatory-domain', 'SE'])
+
+    def test_add_address_single(self):
+        """ derived method to check if member interfaces are enslaved properly """
+        super().test_add_address_single()
+
+        for option, option_value in self._options.items():
+            if 'type access-point' in option_value:
+                # Check for running process
+                self.assertIn('hostapd', (p.name() for p in process_iter()))
+            elif 'type station' in option_value:
+                # Check for running process
+                self.assertIn('wpa_supplicant', (p.name() for p in process_iter()))
+            else:
+                self.assertTrue(False)
+
+if __name__ == '__main__':
+    check_kmod('mac80211_hwsim')
+    unittest.main()
diff --git a/smoketest/scripts/cli/test_interfaces_wirelessmodem.py b/smoketest/scripts/cli/test_interfaces_wirelessmodem.py
new file mode 100755
index 000000000..40cd03b93
--- /dev/null
+++ b/smoketest/scripts/cli/test_interfaces_wirelessmodem.py
@@ -0,0 +1,82 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import unittest
+
+from psutil import process_iter
+from vyos.configsession import ConfigSession, ConfigSessionError
+
+config_file = '/etc/ppp/peers/{}'
+base_path = ['interfaces', 'wirelessmodem']
+
+def get_config_value(interface, key):
+    with open(config_file.format(interface), 'r') as f:
+        for line in f:
+            if line.startswith(key):
+                return list(line.split())
+    return []
+
+class WWANInterfaceTest(unittest.TestCase):
+    def setUp(self):
+        self.session = ConfigSession(os.getpid())
+        self._interfaces = ['wlm0', 'wlm1']
+
+    def tearDown(self):
+        self.session.delete(base_path)
+        self.session.commit()
+        del self.session
+
+    def test_wlm_1(self):
+        for interface in self._interfaces:
+            self.session.set(base_path + [interface, 'no-peer-dns'])
+            self.session.set(base_path + [interface, 'ondemand'])
+
+            # check validate() - APN must be configure
+            with self.assertRaises(ConfigSessionError):
+                self.session.commit()
+            self.session.set(base_path + [interface, 'apn', 'vyos.net'])
+
+            # check validate() - device must be configure
+            with self.assertRaises(ConfigSessionError):
+                self.session.commit()
+            self.session.set(base_path + [interface, 'device', 'ttyS0'])
+
+            # commit changes
+            self.session.commit()
+
+        # verify configuration file(s)
+        for interface in self._interfaces:
+            tmp = get_config_value(interface, 'ifname')[1]
+            self.assertTrue(interface in tmp)
+
+            tmp = get_config_value(interface, 'demand')[0]
+            self.assertTrue('demand' in tmp)
+
+            tmp = os.path.isfile(f'/etc/ppp/peers/chat.{interface}')
+            self.assertTrue(tmp)
+
+            # Check if ppp process is running in the interface in question
+            running = False
+            for p in process_iter():
+                if "pppd" in p.name():
+                    if interface in p.cmdline():
+                        running = True
+
+            self.assertTrue(running)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/smoketest/scripts/cli/test_nat.py b/smoketest/scripts/cli/test_nat.py
new file mode 100755
index 000000000..416810e40
--- /dev/null
+++ b/smoketest/scripts/cli/test_nat.py
@@ -0,0 +1,63 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import jmespath
+import json
+import unittest
+
+from vyos.configsession import ConfigSession, ConfigSessionError
+from vyos.util import cmd
+
+base_path = ['nat']
+snat_pattern = 'nftables[?rule].rule[?chain].{chain: chain, comment: comment, address: { network: expr[].match.right.prefix.addr | [0], prefix: expr[].match.right.prefix.len | [0]}}'
+
+class TestNAT(unittest.TestCase):
+    def setUp(self):
+        # ensure we can also run this test on a live system - so lets clean
+        # out the current configuration :)
+        self.session = ConfigSession(os.getpid())
+        self.session.delete(base_path)
+
+    def tearDown(self):
+        self.session.delete(base_path)
+        self.session.commit()
+
+    def test_source_nat(self):
+        """ Configure and validate source NAT rule(s) """
+
+        path = base_path + ['source']
+        network = '192.168.0.0/16'
+        self.session.set(path + ['rule', '1', 'destination', 'address', network])
+        self.session.set(path + ['rule', '1', 'exclude'])
+
+        # check validate() - outbound-interface must be defined
+        with self.assertRaises(ConfigSessionError):
+            self.session.commit()
+
+        self.session.set(path + ['rule', '1', 'outbound-interface', 'any'])
+        self.session.commit()
+
+        tmp = cmd('sudo nft -j list table nat')
+        nftable_json = json.loads(tmp)
+        condensed_json = jmespath.search(snat_pattern, nftable_json)[0]
+
+        self.assertEqual(condensed_json['comment'], 'DST-NAT-1')
+        self.assertEqual(condensed_json['address']['network'], network.split('/')[0])
+        self.assertEqual(str(condensed_json['address']['prefix']), network.split('/')[1])
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/smoketest/scripts/cli/test_service_bcast-relay.py b/smoketest/scripts/cli/test_service_bcast-relay.py
new file mode 100755
index 000000000..fe4531c3b
--- /dev/null
+++ b/smoketest/scripts/cli/test_service_bcast-relay.py
@@ -0,0 +1,71 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2019-2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import unittest
+
+from psutil import process_iter
+from vyos.configsession import ConfigSession, ConfigSessionError
+
+base_path = ['service', 'broadcast-relay']
+
+class TestServiceBroadcastRelay(unittest.TestCase):
+    _address1 = '192.0.2.1/24'
+    _address2 = '192.0.2.1/24'
+
+    def setUp(self):
+        self.session = ConfigSession(os.getpid())
+        self.session.set(['interfaces', 'dummy', 'dum1001', 'address', self._address1])
+        self.session.set(['interfaces', 'dummy', 'dum1002', 'address', self._address2])
+        self.session.commit()
+
+    def tearDown(self):
+        self.session.delete(['interfaces', 'dummy', 'dum1001'])
+        self.session.delete(['interfaces', 'dummy', 'dum1002'])
+        self.session.delete(base_path)
+        self.session.commit()
+        del self.session
+
+    def test_service(self):
+        """ Check if broadcast relay service can be configured and runs """
+        ids = range(1, 5)
+        for id in ids:
+            base = base_path + ['id', str(id)]
+            self.session.set(base + ['description', 'vyos'])
+            self.session.set(base + ['port', str(10000 + id)])
+
+            # check validate() - two interfaces must be present
+            with self.assertRaises(ConfigSessionError):
+                self.session.commit()
+
+            self.session.set(base + ['interface', 'dum1001'])
+            self.session.set(base + ['interface', 'dum1002'])
+            self.session.set(base + ['address', self._address1.split('/')[0]])
+
+        self.session.commit()
+
+        for id in ids:
+            # check if process is running
+            running = False
+            for p in process_iter():
+                if "udp-broadcast-relay" in p.name():
+                    if p.cmdline()[3] == str(id):
+                        running = True
+                        break
+            self.assertTrue(running)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/smoketest/scripts/cli/test_service_dns_dynamic.py b/smoketest/scripts/cli/test_service_dns_dynamic.py
new file mode 100755
index 000000000..be52360ed
--- /dev/null
+++ b/smoketest/scripts/cli/test_service_dns_dynamic.py
@@ -0,0 +1,141 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2019-2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import re
+import os
+import unittest
+
+from getpass import getuser
+from psutil import process_iter
+from vyos.configsession import ConfigSession, ConfigSessionError
+from vyos.util import read_file
+
+DDCLIENT_CONF = '/run/ddclient/ddclient.conf'
+base_path = ['service', 'dns', 'dynamic']
+
+def get_config_value(key):
+    tmp = read_file(DDCLIENT_CONF)
+    tmp = re.findall(r'\n?{}=+(.*)'.format(key), tmp)
+    tmp = tmp[0].rstrip(',')
+    return tmp
+
+def check_process():
+    """
+    Check for running process, process name changes dynamically e.g.
+    "ddclient - sleeping for 270 seconds", thus we need a different approach
+    """
+    running = False
+    for p in process_iter():
+        if "ddclient" in p.name():
+            running = True
+    return running
+
+class TestServiceDDNS(unittest.TestCase):
+    def setUp(self):
+        self.session = ConfigSession(os.getpid())
+
+    def tearDown(self):
+        # Delete DDNS configuration
+        self.session.delete(base_path)
+        self.session.commit()
+
+        del self.session
+
+    def test_service(self):
+        """ Check individual DDNS service providers """
+        ddns = ['interface', 'eth0', 'service']
+        services = ['cloudflare', 'afraid', 'dyndns', 'zoneedit']
+
+        for service in services:
+            user = 'vyos_user'
+            password = 'vyos_pass'
+            zone = 'vyos.io'
+            self.session.delete(base_path)
+            self.session.set(base_path + ddns + [service, 'host-name', 'test.ddns.vyos.io'])
+            self.session.set(base_path + ddns + [service, 'login', user])
+            self.session.set(base_path + ddns + [service, 'password', password])
+            self.session.set(base_path + ddns + [service, 'zone', zone])
+
+            # commit changes
+            if service == 'cloudflare':
+                self.session.commit()
+            else:
+                # zone option only works on cloudflare, an exception is raised
+                # for all others
+                with self.assertRaises(ConfigSessionError):
+                    self.session.commit()
+                self.session.delete(base_path + ddns + [service, 'zone', 'vyos.io'])
+                # commit changes again - now it should work
+                self.session.commit()
+
+            # we can only read the configuration file when we operate as 'root'
+            if getuser() == 'root':
+                protocol = get_config_value('protocol')
+                login = get_config_value('login')
+                pwd = get_config_value('password')
+
+                # some services need special treatment
+                protoname = service
+                if service == 'cloudflare':
+                    tmp = get_config_value('zone')
+                    self.assertTrue(tmp == zone)
+                elif service == 'afraid':
+                    protoname = 'freedns'
+                elif service == 'dyndns':
+                    protoname = 'dyndns2'
+                elif service == 'zoneedit':
+                    protoname = 'zoneedit1'
+
+                self.assertTrue(protocol == protoname)
+                self.assertTrue(login == user)
+                self.assertTrue(pwd == "'" + password + "'")
+
+            # Check for running process
+            self.assertTrue(check_process())
+
+
+    def test_rfc2136(self):
+        """ Check if DDNS service can be configured and runs """
+        ddns = ['interface', 'eth0', 'rfc2136', 'vyos']
+        ddns_key_file = '/config/auth/my.key'
+
+        self.session.set(base_path + ddns + ['key', ddns_key_file])
+        self.session.set(base_path + ddns + ['record', 'test.ddns.vyos.io'])
+        self.session.set(base_path + ddns + ['server', 'ns1.vyos.io'])
+        self.session.set(base_path + ddns + ['ttl', '300'])
+        self.session.set(base_path + ddns + ['zone', 'vyos.io'])
+
+        # ensure an exception will be raised as no key is present
+        if os.path.exists(ddns_key_file):
+            os.unlink(ddns_key_file)
+
+        # check validate() - the key file does not exist yet
+        with self.assertRaises(ConfigSessionError):
+            self.session.commit()
+
+        with open(ddns_key_file, 'w') as f:
+            f.write('S3cretKey')
+
+        # commit changes
+        self.session.commit()
+
+        # TODO: inspect generated configuration file
+
+        # Check for running process
+        self.assertTrue(check_process())
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/smoketest/scripts/cli/test_service_mdns-repeater.py b/smoketest/scripts/cli/test_service_mdns-repeater.py
new file mode 100755
index 000000000..18900b6d2
--- /dev/null
+++ b/smoketest/scripts/cli/test_service_mdns-repeater.py
@@ -0,0 +1,51 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import unittest
+
+from psutil import process_iter
+from vyos.configsession import ConfigSession
+
+base_path = ['service', 'mdns', 'repeater']
+intf_base = ['interfaces', 'dummy']
+
+class TestServiceMDNSrepeater(unittest.TestCase):
+    def setUp(self):
+        self.session = ConfigSession(os.getpid())
+
+    def tearDown(self):
+        self.session.delete(base_path)
+        self.session.delete(intf_base + ['dum10'])
+        self.session.delete(intf_base + ['dum20'])
+        self.session.commit()
+        del self.session
+
+    def test_service(self):
+        # Service required a configured IP address on the interface
+
+        self.session.set(intf_base + ['dum10', 'address', '192.0.2.1/30'])
+        self.session.set(intf_base + ['dum20', 'address', '192.0.2.5/30'])
+
+        self.session.set(base_path + ['interface', 'dum10'])
+        self.session.set(base_path + ['interface', 'dum20'])
+        self.session.commit()
+
+        # Check for running process
+        self.assertTrue("mdns-repeater" in (p.name() for p in process_iter()))
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/smoketest/scripts/cli/test_service_pppoe-server.py b/smoketest/scripts/cli/test_service_pppoe-server.py
new file mode 100755
index 000000000..901ca792d
--- /dev/null
+++ b/smoketest/scripts/cli/test_service_pppoe-server.py
@@ -0,0 +1,167 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import re
+import os
+import unittest
+
+from configparser import ConfigParser
+from psutil import process_iter
+from vyos.configsession import ConfigSession
+from vyos.configsession import ConfigSessionError
+
+base_path = ['service', 'pppoe-server']
+local_if = ['interfaces', 'dummy', 'dum667']
+pppoe_conf = '/run/accel-pppd/pppoe.conf'
+
+ac_name = 'ACN'
+subnet = '172.18.0.0/24'
+gateway = '192.0.2.1'
+nameserver = '9.9.9.9'
+mtu = '1492'
+interface = 'eth0'
+
+class TestServicePPPoEServer(unittest.TestCase):
+    def setUp(self):
+        self.session = ConfigSession(os.getpid())
+        # ensure we can also run this test on a live system - so lets clean
+        # out the current configuration :)
+        self.session.delete(base_path)
+
+    def tearDown(self):
+        self.session.delete(base_path)
+        self.session.delete(local_if)
+        self.session.commit()
+        del self.session
+
+    def verify(self, conf):
+        # validate some common values in the configuration
+        for tmp in ['log_syslog', 'pppoe', 'chap-secrets', 'ippool', 'ipv6pool',
+                    'ipv6_nd', 'ipv6_dhcp', 'auth_mschap_v2', 'auth_mschap_v1',
+                    'auth_chap_md5', 'auth_pap', 'shaper']:
+            # Settings without values provide None
+            self.assertEqual(conf['modules'][tmp], None)
+
+        # check Access Concentrator setting
+        self.assertTrue(conf['pppoe']['ac-name'] == ac_name)
+        self.assertTrue(conf['pppoe'].getboolean('verbose'))
+        self.assertTrue(conf['pppoe']['interface'], interface)
+
+        # check configured subnet
+        self.assertEqual(conf['ip-pool'][subnet], None)
+        self.assertEqual(conf['ip-pool']['gw-ip-address'], gateway)
+
+        # check ppp
+        self.assertTrue(conf['ppp'].getboolean('verbose'))
+        self.assertTrue(conf['ppp'].getboolean('check-ip'))
+        self.assertEqual(conf['ppp']['min-mtu'], mtu)
+        self.assertEqual(conf['ppp']['mtu'], mtu)
+        self.assertEqual(conf['ppp']['lcp-echo-interval'], '30')
+        self.assertEqual(conf['ppp']['lcp-echo-timeout'], '0')
+        self.assertEqual(conf['ppp']['lcp-echo-failure'], '3')
+
+    def basic_config(self):
+        self.session.set(local_if + ['address', '192.0.2.1/32'])
+
+        self.session.set(base_path + ['access-concentrator', ac_name])
+        self.session.set(base_path + ['authentication', 'mode', 'local'])
+        self.session.set(base_path + ['client-ip-pool', 'subnet', subnet])
+        self.session.set(base_path + ['name-server', nameserver])
+        self.session.set(base_path + ['interface', interface])
+        self.session.set(base_path + ['local-ip', gateway])
+
+    def test_local_auth(self):
+        """ Test configuration of local authentication for PPPoE server """
+        self.basic_config()
+        # authentication
+        self.session.set(base_path + ['authentication', 'local-users', 'username', 'vyos', 'password', 'vyos'])
+        self.session.set(base_path + ['authentication', 'mode', 'local'])
+        # other settings
+        self.session.set(base_path + ['ppp-options', 'ccp'])
+        self.session.set(base_path + ['ppp-options', 'mppe', 'require'])
+        self.session.set(base_path + ['limits', 'connection-limit', '20/min'])
+
+        # commit changes
+        self.session.commit()
+
+        # Validate configuration values
+        conf = ConfigParser(allow_no_value=True)
+        conf.read(pppoe_conf)
+
+        # basic verification
+        self.verify(conf)
+
+        # check auth
+        self.assertEqual(conf['chap-secrets']['chap-secrets'], '/run/accel-pppd/pppoe.chap-secrets')
+        self.assertEqual(conf['chap-secrets']['gw-ip-address'], gateway)
+
+        # check pado
+        self.assertEqual(conf['ppp']['mppe'], 'require')
+        self.assertTrue(conf['ppp'].getboolean('ccp'))
+
+        # check other settings
+        self.assertEqual(conf['connlimit']['limit'], '20/min')
+
+        # Check for running process
+        self.assertTrue('accel-pppd' in (p.name() for p in process_iter()))
+
+    def test_radius_auth(self):
+        """ Test configuration of RADIUS authentication for PPPoE server """
+        radius_server = '192.0.2.22'
+        radius_key = 'secretVyOS'
+        radius_port = '2000'
+        radius_port_acc = '3000'
+
+        self.basic_config()
+        self.session.set(base_path + ['authentication', 'radius', 'server', radius_server, 'key', radius_key])
+        self.session.set(base_path + ['authentication', 'radius', 'server', radius_server, 'port', radius_port])
+        self.session.set(base_path + ['authentication', 'radius', 'server', radius_server, 'acct-port', radius_port_acc])
+        self.session.set(base_path + ['authentication', 'mode', 'radius'])
+
+        # commit changes
+        self.session.commit()
+
+        # Validate configuration values
+        conf = ConfigParser(allow_no_value=True)
+        conf.read(pppoe_conf)
+
+        # basic verification
+        self.verify(conf)
+
+        # check auth
+        self.assertTrue(conf['radius'].getboolean('verbose'))
+        self.assertTrue(conf['radius']['acct-timeout'], '3')
+        self.assertTrue(conf['radius']['timeout'], '3')
+        self.assertTrue(conf['radius']['max-try'], '3')
+        self.assertTrue(conf['radius']['gw-ip-address'], gateway)
+
+        server = conf['radius']['server'].split(',')
+        self.assertEqual(radius_server, server[0])
+        self.assertEqual(radius_key, server[1])
+        self.assertEqual(f'auth-port={radius_port}', server[2])
+        self.assertEqual(f'acct-port={radius_port_acc}', server[3])
+        self.assertEqual(f'req-limit=0', server[4])
+        self.assertEqual(f'fail-time=0', server[5])
+
+        # check defaults
+        self.assertEqual(conf['ppp']['mppe'], 'prefer')
+        self.assertFalse(conf['ppp'].getboolean('ccp'))
+
+        # Check for running process
+        self.assertTrue('accel-pppd' in (p.name() for p in process_iter()))
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/smoketest/scripts/cli/test_service_router-advert.py b/smoketest/scripts/cli/test_service_router-advert.py
new file mode 100755
index 000000000..ec2110c8a
--- /dev/null
+++ b/smoketest/scripts/cli/test_service_router-advert.py
@@ -0,0 +1,99 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2019-2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import re
+import os
+import unittest
+
+from psutil import process_iter
+from vyos.configsession import ConfigSession
+from vyos.util import read_file
+
+RADVD_CONF = '/run/radvd/radvd.conf'
+
+interface = 'eth1'
+base_path = ['service', 'router-advert', 'interface', interface]
+address_base = ['interfaces', 'ethernet', interface, 'address']
+
+def get_config_value(key):
+    tmp = read_file(RADVD_CONF)
+    tmp = re.findall(r'\n?{}\s+(.*)'.format(key), tmp)
+    return tmp[0].split()[0].replace(';','')
+
+class TestServiceRADVD(unittest.TestCase):
+    def setUp(self):
+        self.session = ConfigSession(os.getpid())
+        self.session.set(address_base + ['2001:db8::1/64'])
+
+    def tearDown(self):
+        self.session.delete(address_base)
+        self.session.delete(base_path)
+        self.session.commit()
+        del self.session
+
+    def test_single(self):
+        self.session.set(base_path + ['prefix', '::/64', 'no-on-link-flag'])
+        self.session.set(base_path + ['prefix', '::/64', 'no-autonomous-flag'])
+        self.session.set(base_path + ['prefix', '::/64', 'valid-lifetime', 'infinity'])
+        self.session.set(base_path + ['dnssl', '2001:db8::1234'])
+        self.session.set(base_path + ['other-config-flag'])
+
+        # commit changes
+        self.session.commit()
+
+        # verify values
+        tmp = get_config_value('interface')
+        self.assertEqual(tmp, interface)
+
+        tmp = get_config_value('prefix')
+        self.assertEqual(tmp, '::/64')
+
+        tmp = get_config_value('AdvOtherConfigFlag')
+        self.assertEqual(tmp, 'on')
+
+        # this is a default value
+        tmp = get_config_value('AdvRetransTimer')
+        self.assertEqual(tmp, '0')
+
+        # this is a default value
+        tmp = get_config_value('AdvCurHopLimit')
+        self.assertEqual(tmp, '64')
+
+        # this is a default value
+        tmp = get_config_value('AdvDefaultPreference')
+        self.assertEqual(tmp, 'medium')
+
+        tmp = get_config_value('AdvAutonomous')
+        self.assertEqual(tmp, 'off')
+
+        # this is a default value
+        tmp = get_config_value('AdvValidLifetime')
+        self.assertEqual(tmp, 'infinity')
+
+        # this is a default value
+        tmp = get_config_value('AdvPreferredLifetime')
+        self.assertEqual(tmp, '14400')
+
+        tmp = get_config_value('AdvOnLink')
+        self.assertEqual(tmp, 'off')
+
+
+
+        # Check for running process
+        self.assertTrue('radvd' in (p.name() for p in process_iter()))
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/smoketest/scripts/cli/test_service_snmp.py b/smoketest/scripts/cli/test_service_snmp.py
new file mode 100755
index 000000000..fb5f5393f
--- /dev/null
+++ b/smoketest/scripts/cli/test_service_snmp.py
@@ -0,0 +1,155 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2019-2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import re
+import unittest
+
+from vyos.validate import is_ipv4
+from psutil import process_iter
+
+from vyos.configsession import ConfigSession, ConfigSessionError
+from vyos.util import read_file
+
+SNMPD_CONF = '/etc/snmp/snmpd.conf'
+base_path = ['service', 'snmp']
+
+def get_config_value(key):
+    tmp = read_file(SNMPD_CONF)
+    tmp = re.findall(r'\n?{}\s+(.*)'.format(key), tmp)
+    return tmp[0]
+
+class TestSNMPService(unittest.TestCase):
+    def setUp(self):
+        self.session = ConfigSession(os.getpid())
+        # ensure we can also run this test on a live system - so lets clean
+        # out the current configuration :)
+        self.session.delete(base_path)
+
+    def tearDown(self):
+        del self.session
+
+    def test_snmp(self):
+        """ Check if SNMP can be configured and service runs """
+        clients = ['192.0.2.1', '2001:db8::1']
+        networks = ['192.0.2.128/25', '2001:db8:babe::/48']
+        listen = ['127.0.0.1', '::1']
+
+        for auth in ['ro', 'rw']:
+            community = 'VyOS' + auth
+            self.session.set(base_path + ['community', community, 'authorization', auth])
+            for client in clients:
+                self.session.set(base_path + ['community', community, 'client', client])
+            for network in networks:
+                self.session.set(base_path + ['community', community, 'network', network])
+
+        for addr in listen:
+            self.session.set(base_path + ['listen-address', addr])
+
+        self.session.set(base_path + ['contact', 'maintainers@vyos.io'])
+        self.session.set(base_path + ['location', 'qemu'])
+
+        self.session.commit()
+
+        # verify listen address, it will be returned as
+        # ['unix:/run/snmpd.socket,udp:127.0.0.1:161,udp6:[::1]:161']
+        # thus we need to transfor this into a proper list
+        config = get_config_value('agentaddress')
+        expected = 'unix:/run/snmpd.socket'
+        for addr in listen:
+            if is_ipv4(addr):
+                expected += ',udp:{}:161'.format(addr)
+            else:
+                expected += ',udp6:[{}]:161'.format(addr)
+
+        self.assertTrue(expected in config)
+
+        # Check for running process
+        self.assertTrue("snmpd" in (p.name() for p in process_iter()))
+
+
+    def test_snmpv3_sha(self):
+        """ Check if SNMPv3 can be configured with SHA authentication and service runs"""
+
+        self.session.set(base_path + ['v3', 'engineid', '000000000000000000000002'])
+        self.session.set(base_path + ['v3', 'group', 'default', 'mode', 'ro'])
+        # check validate() - a view must be created before this can be comitted
+        with self.assertRaises(ConfigSessionError):
+            self.session.commit()
+
+        self.session.set(base_path + ['v3', 'view', 'default', 'oid', '1'])
+        self.session.set(base_path + ['v3', 'group', 'default', 'view', 'default'])
+
+        # create user
+        self.session.set(base_path + ['v3', 'user', 'vyos', 'auth', 'plaintext-password', 'vyos12345678'])
+        self.session.set(base_path + ['v3', 'user', 'vyos', 'auth', 'type', 'sha'])
+        self.session.set(base_path + ['v3', 'user', 'vyos', 'privacy', 'plaintext-password', 'vyos12345678'])
+        self.session.set(base_path + ['v3', 'user', 'vyos', 'privacy', 'type', 'aes'])
+        self.session.set(base_path + ['v3', 'user', 'vyos', 'group', 'default'])
+
+        self.session.commit()
+
+        # commit will alter the CLI values - check if they have been updated:
+        hashed_password = '4e52fe55fd011c9c51ae2c65f4b78ca93dcafdfe'
+        tmp = self.session.show_config(base_path + ['v3', 'user', 'vyos', 'auth', 'encrypted-password']).split()[1]
+        self.assertEqual(tmp, hashed_password)
+
+        tmp = self.session.show_config(base_path + ['v3', 'user', 'vyos', 'privacy', 'encrypted-password']).split()[1]
+        self.assertEqual(tmp, hashed_password)
+
+        # TODO: read in config file and check values
+
+        # Check for running process
+        self.assertTrue("snmpd" in (p.name() for p in process_iter()))
+
+    def test_snmpv3_md5(self):
+        """ Check if SNMPv3 can be configured with MD5 authentication and service runs"""
+
+        self.session.set(base_path + ['v3', 'engineid', '000000000000000000000002'])
+        self.session.set(base_path + ['v3', 'group', 'default', 'mode', 'ro'])
+        # check validate() - a view must be created before this can be comitted
+        with self.assertRaises(ConfigSessionError):
+            self.session.commit()
+
+        self.session.set(base_path + ['v3', 'view', 'default', 'oid', '1'])
+        self.session.set(base_path + ['v3', 'group', 'default', 'view', 'default'])
+
+        # create user
+        self.session.set(base_path + ['v3', 'user', 'vyos', 'auth', 'plaintext-password', 'vyos12345678'])
+        self.session.set(base_path + ['v3', 'user', 'vyos', 'auth', 'type', 'md5'])
+        self.session.set(base_path + ['v3', 'user', 'vyos', 'privacy', 'plaintext-password', 'vyos12345678'])
+        self.session.set(base_path + ['v3', 'user', 'vyos', 'privacy', 'type', 'des'])
+        self.session.set(base_path + ['v3', 'user', 'vyos', 'group', 'default'])
+
+        self.session.commit()
+
+        # commit will alter the CLI values - check if they have been updated:
+        hashed_password = '4c67690d45d3dfcd33d0d7e308e370ad'
+        tmp = self.session.show_config(base_path + ['v3', 'user', 'vyos', 'auth', 'encrypted-password']).split()[1]
+        self.assertEqual(tmp, hashed_password)
+
+        tmp = self.session.show_config(base_path + ['v3', 'user', 'vyos', 'privacy', 'encrypted-password']).split()[1]
+        self.assertEqual(tmp, hashed_password)
+
+        # TODO: read in config file and check values
+
+        # Check for running process
+        self.assertTrue("snmpd" in (p.name() for p in process_iter()))
+
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/smoketest/scripts/cli/test_service_ssh.py b/smoketest/scripts/cli/test_service_ssh.py
new file mode 100755
index 000000000..3ee498f3d
--- /dev/null
+++ b/smoketest/scripts/cli/test_service_ssh.py
@@ -0,0 +1,116 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2019-2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import re
+import os
+import unittest
+
+from psutil import process_iter
+from vyos.configsession import ConfigSession, ConfigSessionError
+from vyos.util import read_file
+
+SSHD_CONF = '/run/ssh/sshd_config'
+base_path = ['service', 'ssh']
+
+def get_config_value(key):
+    tmp = read_file(SSHD_CONF)
+    tmp = re.findall(r'\n?{}\s+(.*)'.format(key), tmp)
+    return tmp
+
+class TestServiceSSH(unittest.TestCase):
+    def setUp(self):
+        self.session = ConfigSession(os.getpid())
+        # ensure we can also run this test on a live system - so lets clean
+        # out the current configuration :)
+        self.session.delete(base_path)
+
+    def tearDown(self):
+        # delete testing SSH config
+        self.session.delete(base_path)
+        # restore "plain" SSH access
+        self.session.set(base_path)
+
+        self.session.commit()
+        del self.session
+
+    def test_ssh_single(self):
+        """ Check if SSH service can be configured and runs """
+        self.session.set(base_path + ['port', '1234'])
+        self.session.set(base_path + ['disable-host-validation'])
+        self.session.set(base_path + ['disable-password-authentication'])
+        self.session.set(base_path + ['loglevel', 'verbose'])
+        self.session.set(base_path + ['client-keepalive-interval', '100'])
+        self.session.set(base_path + ['listen-address', '127.0.0.1'])
+
+        # commit changes
+        self.session.commit()
+
+        # Check configured port
+        port = get_config_value('Port')[0]
+        self.assertTrue("1234" in port)
+
+        # Check DNS usage
+        dns = get_config_value('UseDNS')[0]
+        self.assertTrue("no" in dns)
+
+        # Check PasswordAuthentication
+        pwd = get_config_value('PasswordAuthentication')[0]
+        self.assertTrue("no" in pwd)
+
+        # Check loglevel
+        loglevel = get_config_value('LogLevel')[0]
+        self.assertTrue("VERBOSE" in loglevel)
+
+        # Check listen address
+        address = get_config_value('ListenAddress')[0]
+        self.assertTrue("127.0.0.1" in address)
+
+        # Check keepalive
+        keepalive = get_config_value('ClientAliveInterval')[0]
+        self.assertTrue("100" in keepalive)
+
+        # Check for running process
+        self.assertTrue("sshd" in (p.name() for p in process_iter()))
+
+    def test_ssh_multi(self):
+        """ Check if SSH service can be configured and runs with multiple
+            listen ports and listen-addresses """
+        ports = ['22', '2222']
+        for port in ports:
+            self.session.set(base_path + ['port', port])
+
+        addresses = ['127.0.0.1', '::1']
+        for address in addresses:
+            self.session.set(base_path + ['listen-address', address])
+
+        # commit changes
+        self.session.commit()
+
+        # Check configured port
+        tmp = get_config_value('Port')
+        for port in ports:
+            self.assertIn(port, tmp)
+
+        # Check listen address
+        tmp = get_config_value('ListenAddress')
+        for address in addresses:
+            self.assertIn(address, tmp)
+
+        # Check for running process
+        self.assertTrue("sshd" in (p.name() for p in process_iter()))
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/smoketest/scripts/cli/test_system_lcd.py b/smoketest/scripts/cli/test_system_lcd.py
new file mode 100755
index 000000000..931a91c53
--- /dev/null
+++ b/smoketest/scripts/cli/test_system_lcd.py
@@ -0,0 +1,54 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2020 Francois Mertz fireboxled@gmail.com
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import unittest
+
+from configparser import ConfigParser
+from psutil import process_iter
+from vyos.configsession import ConfigSession
+
+base_path = ['system', 'lcd']
+
+class TestSystemLCD(unittest.TestCase):
+    def setUp(self):
+        self.session = ConfigSession(os.getpid())
+
+    def tearDown(self):
+        self.session.delete(base_path)
+        self.session.commit()
+        del self.session
+
+    def test_system_display(self):
+        # configure some system display
+        self.session.set(base_path + ['device', 'ttyS1'])
+        self.session.set(base_path + ['model', 'cfa-533'])
+
+        # commit changes
+        self.session.commit()
+
+        # load up ini-styled LCDd.conf
+        conf = ConfigParser()
+        conf.read('/run/LCDd/LCDd.conf')
+
+        self.assertEqual(conf['CFontzPacket']['Model'], '533')
+        self.assertEqual(conf['CFontzPacket']['Device'], '/dev/ttyS1')
+
+        # both processes running
+        self.assertTrue('LCDd' in (p.name() for p in process_iter()))
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/smoketest/scripts/cli/test_system_login.py b/smoketest/scripts/cli/test_system_login.py
new file mode 100755
index 000000000..3c4b1fa28
--- /dev/null
+++ b/smoketest/scripts/cli/test_system_login.py
@@ -0,0 +1,67 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2019-2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import re
+import unittest
+
+from subprocess import Popen, PIPE
+from vyos.configsession import ConfigSession, ConfigSessionError
+import vyos.util as util
+
+base_path = ['system', 'login']
+users = ['vyos1', 'vyos2']
+
+class TestSystemLogin(unittest.TestCase):
+    def setUp(self):
+        self.session = ConfigSession(os.getpid())
+
+    def tearDown(self):
+        # Delete individual users from configuration
+        for user in users:
+            self.session.delete(base_path + ['user', user])
+
+        self.session.commit()
+        del self.session
+
+    def test_user(self):
+        """ Check if user can be created and we can SSH to localhost """
+        self.session.set(['service', 'ssh', 'port', '22'])
+
+        for user in users:
+            name = "VyOS Roxx " + user
+            home_dir = "/tmp/" + user
+
+            self.session.set(base_path + ['user', user, 'authentication', 'plaintext-password', user])
+            self.session.set(base_path + ['user', user, 'full-name', 'VyOS Roxx'])
+            self.session.set(base_path + ['user', user, 'home-directory', home_dir])
+
+        self.session.commit()
+
+        for user in users:
+            cmd = ['su','-', user]
+            proc = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
+            tmp = "{}\nuname -a".format(user)
+            proc.stdin.write(tmp.encode())
+            proc.stdin.flush()
+            (stdout, stderr) = proc.communicate()
+
+            # stdout is something like this:
+            # b'Linux vyos 4.19.101-amd64-vyos #1 SMP Sun Feb 2 10:18:07 UTC 2020 x86_64 GNU/Linux\n'
+            self.assertTrue(len(stdout) > 40)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/smoketest/scripts/cli/test_system_nameserver.py b/smoketest/scripts/cli/test_system_nameserver.py
new file mode 100755
index 000000000..9040be072
--- /dev/null
+++ b/smoketest/scripts/cli/test_system_nameserver.py
@@ -0,0 +1,66 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2019-2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import re
+import unittest
+
+from vyos.configsession import ConfigSession, ConfigSessionError
+import vyos.util as util
+
+RESOLV_CONF = '/etc/resolv.conf'
+
+test_servers = ['192.0.2.10', '2001:db8:1::100']
+base_path = ['system', 'name-server']
+
+def get_name_servers():
+    resolv_conf = util.read_file(RESOLV_CONF)
+    return re.findall(r'\n?nameserver\s+(.*)', resolv_conf)
+
+class TestSystemNameServer(unittest.TestCase):
+    def setUp(self):
+        self.session = ConfigSession(os.getpid())
+
+    def tearDown(self):
+        # Delete existing name servers
+        self.session.delete(base_path)
+        self.session.commit()
+
+        del self.session
+
+    def test_add_server(self):
+        """ Check if server is added to resolv.conf """
+        for s in test_servers:
+            self.session.set(base_path + [s])
+        self.session.commit()
+
+        servers = get_name_servers()
+        for s in servers:
+            self.assertTrue(s in servers)
+
+    def test_delete_server(self):
+        """ Test if a deleted server disappears from resolv.conf """
+        for s in test_servers:
+          self.session.delete(base_path + [s])
+        self.session.commit()
+
+        servers = get_name_servers()
+        for s in servers:
+            self.assertTrue(test_server_1 not in servers)
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/smoketest/scripts/cli/test_system_ntp.py b/smoketest/scripts/cli/test_system_ntp.py
new file mode 100755
index 000000000..856a28916
--- /dev/null
+++ b/smoketest/scripts/cli/test_system_ntp.py
@@ -0,0 +1,108 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2019-2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import re
+import os
+import unittest
+
+from psutil import process_iter
+from vyos.configsession import ConfigSession, ConfigSessionError
+from vyos.template import vyos_address_from_cidr, vyos_netmask_from_cidr
+from vyos.util import read_file
+
+NTP_CONF = '/etc/ntp.conf'
+base_path = ['system', 'ntp']
+
+def get_config_value(key):
+    tmp = read_file(NTP_CONF)
+    tmp = re.findall(r'\n?{}\s+(.*)'.format(key), tmp)
+    # remove possible trailing whitespaces
+    return [item.strip() for item in tmp]
+
+class TestSystemNTP(unittest.TestCase):
+    def setUp(self):
+        self.session = ConfigSession(os.getpid())
+        # ensure we can also run this test on a live system - so lets clean
+        # out the current configuration :)
+        self.session.delete(base_path)
+
+    def tearDown(self):
+        self.session.delete(base_path)
+        self.session.commit()
+        del self.session
+
+    def test_ntp_options(self):
+        """ Test basic NTP support with multiple servers and their options """
+        servers = ['192.0.2.1', '192.0.2.2']
+        options = ['noselect', 'preempt', 'prefer']
+
+        for server in servers:
+            for option in options:
+                self.session.set(base_path + ['server', server, option])
+
+        # commit changes
+        self.session.commit()
+
+        # Check generated configuration
+        tmp = get_config_value('server')
+        for server in servers:
+            test = f'{server} iburst ' + ' '.join(options)
+            self.assertTrue(test in tmp)
+
+        # Check for running process
+        self.assertTrue("ntpd" in (p.name() for p in process_iter()))
+
+    def test_ntp_clients(self):
+        """ Test the allowed-networks statement """
+        listen_address = ['127.0.0.1', '::1']
+        for listen in listen_address:
+            self.session.set(base_path + ['listen-address', listen])
+
+        networks = ['192.0.2.0/24', '2001:db8:1000::/64']
+        for network in networks:
+            self.session.set(base_path + ['allow-clients', 'address', network])
+
+        # Verify "NTP server not configured" verify() statement
+        with self.assertRaises(ConfigSessionError):
+            self.session.commit()
+
+        servers = ['192.0.2.1', '192.0.2.2']
+        for server in servers:
+            self.session.set(base_path + ['server', server])
+
+        self.session.commit()
+
+        # Check generated client address configuration
+        for network in networks:
+            network_address = vyos_address_from_cidr(network)
+            network_netmask = vyos_netmask_from_cidr(network)
+
+            tmp = get_config_value(f'restrict {network_address}')[0]
+            test = f'mask {network_netmask} nomodify notrap nopeer'
+            self.assertTrue(tmp in test)
+
+        # Check listen address
+        tmp = get_config_value('interface')
+        test = ['ignore wildcard']
+        for listen in listen_address:
+            test.append(f'listen {listen}')
+        self.assertEqual(tmp, test)
+
+        # Check for running process
+        self.assertTrue("ntpd" in (p.name() for p in process_iter()))
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/smoketest/scripts/cli/test_vpn_anyconnect.py b/smoketest/scripts/cli/test_vpn_anyconnect.py
new file mode 100755
index 000000000..dd8ab1609
--- /dev/null
+++ b/smoketest/scripts/cli/test_vpn_anyconnect.py
@@ -0,0 +1,58 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import re
+import os
+import unittest
+
+from psutil import process_iter
+from vyos.configsession import ConfigSession, ConfigSessionError
+from vyos.util import read_file
+
+OCSERV_CONF = '/run/ocserv/ocserv.conf'
+base_path = ['vpn', 'anyconnect']
+cert = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
+cert_key = '/etc/ssl/private/ssl-cert-snakeoil.key'
+
+class TestVpnAnyconnect(unittest.TestCase):
+    def setUp(self):
+        self.session = ConfigSession(os.getpid())
+
+    def tearDown(self):
+        # Delete vpn anyconnect configuration
+        self.session.delete(base_path)
+        self.session.commit()
+
+        del self.session
+
+    def test_vpn(self):
+        user = 'vyos_user'
+        password = 'vyos_pass'
+        self.session.delete(base_path)
+        self.session.set(base_path + ["authentication", "local-users", "username", user, "password", password])
+        self.session.set(base_path + ["authentication", "mode", "local"])
+        self.session.set(base_path + ["network-settings", "client-ip-settings", "subnet", "192.0.2.0/24"])
+        self.session.set(base_path + ["ssl", "ca-cert-file", cert])
+        self.session.set(base_path + ["ssl", "cert-file", cert])
+        self.session.set(base_path + ["ssl", "key-file", cert_key])
+
+        self.session.commit()
+
+        # Check for running process
+        self.assertTrue("ocserv-main" in (p.name() for p in process_iter()))
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/smoketest/scripts/cli/test_vrf.py b/smoketest/scripts/cli/test_vrf.py
new file mode 100755
index 000000000..efa095b30
--- /dev/null
+++ b/smoketest/scripts/cli/test_vrf.py
@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import unittest
+
+from vyos.configsession import ConfigSession, ConfigSessionError
+from vyos.util import read_file
+
+class VRFTest(unittest.TestCase):
+    def setUp(self):
+        self.session = ConfigSession(os.getpid())
+        self._vrfs = ['red', 'green', 'blue']
+
+    def tearDown(self):
+        # delete all VRFs
+        self.session.delete(['vrf'])
+        self.session.commit()
+        del self.session
+
+    def test_table_id(self):
+        table = 1000
+        for vrf in self._vrfs:
+            base = ['vrf', 'name', vrf]
+            description = "VyOS-VRF-" + vrf
+            self.session.set(base + ['description', description])
+
+            # check validate() - a table ID is mandatory
+            with self.assertRaises(ConfigSessionError):
+                self.session.commit()
+
+            self.session.set(base + ['table', str(table)])
+            table += 1
+
+        # commit changes
+        self.session.commit()
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/smoketest/scripts/system/test_module_load.py b/smoketest/scripts/system/test_module_load.py
new file mode 100755
index 000000000..59c3e0b6a
--- /dev/null
+++ b/smoketest/scripts/system/test_module_load.py
@@ -0,0 +1,42 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2019-2020 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import unittest
+
+modules = {
+    "intel": ["e1000", "e1000e", "igb", "ixgb", "ixgbe", "ixgbevf", "i40e", "i40evf", "iavf"],
+    "accel_ppp": ["ipoe", "vlan_mon"],
+    "misc": ["wireguard"]
+}
+
+class TestKernelModules(unittest.TestCase):
+    def test_load_modules(self):
+        success = True
+        for msk in modules:
+            ms = modules[msk]
+            for m in ms:
+                # We want to uncover all modules that fail,
+                # not fail at the first one
+                try:
+                    os.system("modprobe {0}".format(m))
+                except:
+                    success = False
+
+            self.assertTrue(success)
+
+if __name__ == '__main__':
+    unittest.main()