Testsuite: T8111: add basic_cli_tests() helper function

1 files changed, 34 insertions, 29 deletions

diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install
index 00487347..d0350643 100755
--- a/scripts/check-qemu-install
+++ b/scripts/check-qemu-install
@@ -361,6 +361,38 @@ def toggleUEFISecureBoot(c):
     UEFIKeyPress(c, KEY_DOWN)
     UEFIKeyPress(c, KEY_RETURN)
 
+def basic_cli_tests(c):
+    # Repeating / shared basic CLI test between installed images and the
+    # cloud-init test-case
+    c.sendline('configure')
+    c.expect(cfg_mode_prompt)
+    c.sendline('exit')
+    c.expect(op_mode_prompt)
+    c.sendline('show version')
+    c.expect(op_mode_prompt)
+    c.sendline('show version kernel')
+    c.expect(f'{vyos_defaults["kernel_version"]}-{vyos_defaults["kernel_flavor"]}')
+    c.expect(op_mode_prompt)
+    c.sendline('show version frr')
+    c.expect(op_mode_prompt)
+    c.sendline('show interfaces')
+    c.expect(op_mode_prompt)
+    c.sendline('systemd-detect-virt')
+    c.expect('kvm')
+    c.expect(op_mode_prompt)
+    c.sendline('show system cpu')
+    c.expect(op_mode_prompt)
+    c.sendline('show system memory')
+    c.expect(op_mode_prompt)
+    c.sendline('show system memory detail | no-more')
+    c.expect(op_mode_prompt)
+    c.sendline('show configuration commands | match kernel')
+    c.expect(op_mode_prompt)
+    c.sendline('cat /proc/cmdline')
+    c.expect(op_mode_prompt)
+    c.sendline('show version all | grep -e "vpp" -e "vyos-1x"')
+    c.expect(op_mode_prompt)
+
 if args.qemu_cmd:
     tmp = get_qemu_cmd(qemu_name, args.uefi, args.disk, raid=diskname_raid, iso_img=args.iso, vnc_enabled=args.vnc, secure_boot=args.sbtest)
     os.system(tmp)
@@ -429,6 +461,7 @@ try:
         c.expect(cfg_mode_prompt)
         c.sendline('exit')
         c.expect(op_mode_prompt)
+
     #################################################
     # Installing into VyOS system
     #################################################
@@ -576,35 +609,7 @@ try:
     # Basic Configmode/Opmode switch
     #################################################
     log.info('Basic CLI configuration mode test')
-
-    c.sendline('configure')
-    c.expect(cfg_mode_prompt)
-    c.sendline('exit')
-    c.expect(op_mode_prompt)
-    c.sendline('show version')
-    c.expect(op_mode_prompt)
-    c.sendline('show version kernel')
-    c.expect(f'{vyos_defaults["kernel_version"]}-{vyos_defaults["kernel_flavor"]}')
-    c.expect(op_mode_prompt)
-    c.sendline('show version frr')
-    c.expect(op_mode_prompt)
-    c.sendline('show interfaces')
-    c.expect(op_mode_prompt)
-    c.sendline('systemd-detect-virt')
-    c.expect('kvm')
-    c.expect(op_mode_prompt)
-    c.sendline('show system cpu')
-    c.expect(op_mode_prompt)
-    c.sendline('show system memory')
-    c.expect(op_mode_prompt)
-    c.sendline('show system memory detail | no-more')
-    c.expect(op_mode_prompt)
-    c.sendline('show configuration commands | match kernel')
-    c.expect(op_mode_prompt)
-    c.sendline('cat /proc/cmdline')
-    c.expect(op_mode_prompt)
-    c.sendline('show version all | grep -e "vpp" -e "vyos-1x"')
-    c.expect(op_mode_prompt)
+    basic_cli_tests(c)
 
     #################################################
     # Verify /etc/os-release via lsb_release