Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Winssl, fixing windows guest tests & adding windows guest ssl test. #20

Open
wants to merge 16 commits into
base: final
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
301 changes: 117 additions & 184 deletions qemu/cfg/tests-spice.cfg

Large diffs are not rendered by default.

23 changes: 0 additions & 23 deletions qemu/tests/cfg/fullscreen_setup.cfg

This file was deleted.

24 changes: 0 additions & 24 deletions qemu/tests/cfg/rv_connect.cfg

This file was deleted.

28 changes: 0 additions & 28 deletions qemu/tests/cfg/rv_connect_win.cfg

This file was deleted.

40 changes: 0 additions & 40 deletions qemu/tests/cfg/rv_copyandpaste.cfg

This file was deleted.

23 changes: 0 additions & 23 deletions qemu/tests/cfg/rv_disconnect.cfg

This file was deleted.

24 changes: 0 additions & 24 deletions qemu/tests/cfg/rv_fullscreen.cfg

This file was deleted.

24 changes: 0 additions & 24 deletions qemu/tests/cfg/rv_input.cfg

This file was deleted.

32 changes: 0 additions & 32 deletions qemu/tests/cfg/rv_logging.cfg

This file was deleted.

106 changes: 106 additions & 0 deletions qemu/tests/cfg/spice.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
- rv:
no JeOS
vms = vm1 vm2
guest_vm = vm1
client_vm = vm2
display_vm2 = vnc
vga_vm2 = cirrus
full_screen = no
virtio_ports_vm1 = "vdagent"
virtio_port_type_vm1 = "serialport"
virtio_port_chardev_vm1 = "spicevmc"
virtio_port_name_prefix_vm1 = "com.redhat.spice."

variants:
-RHEL.6.3.x86_64:
image_name_vm2 = images/rhel63-64_client
-RHEL.6.3.i386:
image_name_vm2 = images/rhel63-32_client
-RHEL.6.devel.x86_64:
image_name_vm2 = images/rhel6devel-64_client
-RHEL.6.devel.i386:
image_name_vm2 = images/rhel6devel-32_client
variants:
-fullscreen_setup:
type = fullscreen_setup
-rv_connect:
type = rv_connect
-rv_disconnect: rv_connect
type = rv_disconnect
-rv_fullscreen: fullscreen_setup, rv_connect
type = rv_fullscreen
-rv_copyandpaste: rv_connect
type = rv_copyandpaste
interpreter = python
dst_dir = /tmp
guest_script = cb.py
script_params_img_set = --set_image
script_params_img_save = -m
script_params_writef = -f
script_params_createf = -n
final_textfile = StringLengthTest.txt
final_image = PNGTest.png
image_tocopy_name = Image-small.png
final_image_bmp = BMPTest.bmp
image_tocopy_name_bmp = Image2.bmp
image_type = png
script_params = --set
script_params_clear = --clear
text_to_test = Testing_this_text_was_copied
- rv_input: rv_connect
type = rv_input
guest_script = key_event_form.py
- rv_logging: rv_connect
type = rv_logging
logtest = qxl
qxl_log = /var/log/Xorg.0.log
spice_log = /var/log/spice-vdagent.log
interpreter = python
dst_dir = /tmp
guest_script = cb.py
script_params = --set
text_to_test = Testing_this_text_was_copied
- rv_vmshutdown: rv_connect
type = rv_vmshutdown
cmd_cli_shutdown = "shutdown -h now"
cmd_qemu_shutdown = "system_powerdown"
- client_guest_shutdown:
type = client_guest_shutdown
shutdown_method = shell
kill_vm = yes
kill_vm_gracefully = no

variants:
#variant for a RHEL client and a RHEL guest
-rr:
rootuser=root
rootpassword=123456
rootuser_vm2=root
rootpassword_vm2=123456
#variant for a RHEL client and a Windows guest
-rw:
shutdown_command_vm2 = shutdown -h now
rootuser_vm1 = Administrator
pssword_vm1 = 1q2w3eP
shell_port_vm1 = 10022
shell_client_vm1 = nc
shell_linesep_vm1 = \r\n
shell_prompt_vm1 = >$
file_transfer_port_vm1 = 10023
file_transfer_client_vm1 = rss
display_vm2 = vnc
os_type_vm2 = linux
shell_prompt_vm2 = ^\[.*\][\#\$]\s*$
shell_client_vm2 = ssh
rootuser_vm2 = root
rootpassword_vm2 = 123456
shell_port_vm2 = 22
file_transfer_client_vm2 = scp
file_transfer_port_vm2 = 22
status_test_command_vm2 = echo $?

#variant for a Windows client and a RHEL guest
-wr:
#variant for a Windows client and a Windows guest
-ww:

2 changes: 1 addition & 1 deletion shared/cfg/guest-os/Linux/RHEL/6.devel.i386.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
initrd = images/rhel6devel-32/initrd.img
syslog_server_proto = udp
unattended_install.cdrom:
cdrom_cd1 = RHEL6-devel-i386.iso
cdrom_cd1 = isos/linux/RHEL6-devel-i386.iso
2 changes: 1 addition & 1 deletion shared/cfg/guest-os/Linux/RHEL/6.devel.x86_64.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
initrd = images/rhel6devel-64/initrd.img
syslog_server_proto = udp
unattended_install.cdrom:
cdrom_cd1 = RHEL6-devel-x86_64.iso
cdrom_cd1 = isos/linux/RHEL6-devel-x86_64.iso
12 changes: 10 additions & 2 deletions shared/unattended/RHEL-6.3.ks
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@ lang en_US.UTF-8
keyboard us
key --skip
network --bootproto dhcp
rootpw 123456
rootpw --plaintext 123456
user --name=test --password=123456 --plaintext
firewall --enabled --ssh
selinux --enforcing
timezone --utc America/New_York
firstboot --disable
bootloader --location=mbr --append="console=tty0 console=ttyS0,115200"
zerombr
xconfig --startxonboot
clearpart --all --initlabel
autopart
poweroff
Expand All @@ -37,8 +39,9 @@ virt-viewer
spice-vdagent
usbredir
SDL
%end

%post --interpreter /usr/bin/python
%post --nochroot --interpreter /usr/bin/python
import os
os.system('grubby --remove-args="rhgb quiet" --update-kernel=$(grubby --default-kernel)')
os.system('dhclient')
Expand All @@ -47,3 +50,8 @@ os.system('iptables -F')
os.system('echo 0 > /selinux/enforce')
os.system('echo Post set up finished > /dev/ttyS0')
os.system('echo Post set up finished > /dev/hvc0')
f = open('/mnt/sysimage/etc/gdm/custom.conf','w')
f.write('[daemon]\n'
'AutomaticLogin=test\n'
'AutomaticLoginEnable=True\n')
%end
Loading