Show
Ignore:
Timestamp:
07/01/08 23:42:30 (5 months ago)
Author:
kindlund
Message:

Fixing ticket #173. Had to add a new test_vm-livecd, since our unit tests for getIPaddrVM were failing otherwise.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • honeyclient/trunk/t/honeyclient_manager_vm.t

    r1590 r1649  
    117117use DateTime::HiRes; 
    118118 
    119 # Make sure Fcntl loads. 
    120 BEGIN { use_ok('Fcntl', qw(O_RDONLY)) or diag("Can't load Fcntl package.  Check to make sure the package library is correctly listed within the path."); } 
    121 require_ok('Fcntl'); 
    122 use Fcntl qw(O_RDONLY); 
     119# Make sure Text::DHCPLeases loads. 
     120BEGIN { use_ok('Text::DHCPLeases') or diag("Can't load Text::DHCPLeases package.  Check to make sure the package library is correctly listed within the path."); } 
     121require_ok('Text::DHCPLeases'); 
     122use Text::DHCPLeases; 
     123 
     124# Make sure DateTime::Format::Natural loads. 
     125BEGIN { use_ok('DateTime::Format::Natural') or diag("Can't load DateTime::Format::Natural package.  Check to make sure the package library is correctly listed within the path."); } 
     126require_ok('DateTime::Format::Natural'); 
     127use DateTime::Format::Natural; 
    123128 
    124129# Make sure Config::General loads. 
    …… 
    761766                  namespace => "HoneyClient::Manager::VM"); 
    762767my ($stub, $som, $URL); 
    763 my $testVM = $ENV{PWD} . "/" . getVar(name      => "test_vm_config", 
     768my $testVM = $ENV{PWD} . "/" . getVar(name      => "test_vm_config_livecd", 
    764769                                      namespace => "HoneyClient::Manager::VM::Test"); 
    765770 
    …… 
    777782    $som = $stub->startVM(config => $testVM); 
    778783 
    779     # Wait 10 seconds, for the DHCP server to give the testVM 
     784    # Wait 240 seconds, for the DHCP server to give the testVM 
    780785    # a DHCP lease. 
    781     sleep (10); 
     786    sleep (240); 
    782787 
    783788    # Get the IP address of the test VM. 

  • honeyclient/trunk/t/test_vm-livecd/winXPPro.vmx

    r1008 r1649  
    88ide0:0.mode = "persistent" 
    99ide1:0.present = "TRUE" 
    10 ide1:0.fileName = "auto detect" 
    11 ide1:0.deviceType = "atapi-cdrom" 
     10ide1:0.fileName = "install-x86-minimal-2007.0-r1.iso" 
     11ide1:0.deviceType = "cdrom-image" 
    1212floppy0.fileName = "/dev/fd0" 
    1313usb.present = "FALSE" 
    …… 
    2121powerType.reset = "soft" 
    2222 
    23 ide1:0.startConnected = "FALSE" 
     23ide1:0.startConnected = "TRUE" 
    2424floppy0.startConnected = "FALSE" 
    2525redoLogDir = "." 
    2626 
    27 uuid.location = "56 4d a4 e9 36 ce 79 71-8e bc 38 d2 b8 3e ed ea" 
    28 uuid.bios = "56 4d a4 e9 36 ce 79 71-8e bc 38 d2 b8 3e ed ea" 
     27uuid.location = "56 4d 67 c7 da f3 e5 cd-5a dc c8 79 9d 00 35 81" 
     28uuid.bios = "56 4d 67 c7 da f3 e5 cd-5a dc c8 79 9d 00 35 81" 
    2929 
    3030Ethernet0.present = "TRUE" 
    3131 
    3232Ethernet0.addressType = "generated" 
    33 ethernet0.generatedAddress = "00:0c:29:3e:ed:ea" 
     33ethernet0.generatedAddress = "00:0c:29:00:35:81" 
    3434ethernet0.generatedAddressOffset = "0" 
    3535 
    …… 
    4040 
    4141Ethernet0.connectionType = "hostonly" 
     42 
     43uuid.action = "create" 

  • honeyclient/trunk/t/test_vm/winXPPro.vmx

    r1008 r1649  
    11#!/usr/bin/vmware 
     2 
     3Ethernet0.addressType = "generated" 
     4Ethernet0.connectionType = "hostonly" 
     5Ethernet0.present = "TRUE" 
     6Ethernet0.startConnected = "TRUE" 
    27config.version = "7" 
    3 virtualHW.version = "3" 
    4 scsi0.present = "TRUE" 
    5 memsize = "256" 
    6 ide0:0.present = "TRUE" 
     8displayName = "testVM" 
     9ethernet0.generatedAddress = "00:0c:29:e2:08:e8" 
     10ethernet0.generatedAddressOffset = "0" 
     11floppy0.fileName = "/dev/fd0" 
     12floppy0.startConnected = "FALSE" 
     13guestOS = "winxppro" 
     14ide0:0.deviceType = "ata-hardDisk" 
    715ide0:0.fileName = "winXPPro.vmdk" 
    816ide0:0.mode = "persistent" 
     17ide0:0.present = "TRUE" 
     18ide0:0.redo = "" 
     19ide1:0.deviceType = "atapi-cdrom" 
     20ide1:0.fileName = "auto detect" 
    921ide1:0.present = "TRUE" 
    10 ide1:0.fileName = "auto detect" 
    11 ide1:0.deviceType = "atapi-cdrom" 
    12 floppy0.fileName = "/dev/fd0" 
    13 usb.present = "FALSE" 
    14 displayName = "testVM" 
    15 guestOS = "winxppro" 
     22ide1:0.startConnected = "FALSE" 
     23memsize = "256" 
     24powerType.powerOff = "soft" 
     25powerType.powerOn = "soft" 
     26powerType.reset = "soft" 
     27powerType.suspend = "soft" 
    1628priority.grabbed = "normal" 
    1729priority.ungrabbed = "normal" 
    18 powerType.powerOff = "soft" 
    19 powerType.powerOn = "soft" 
    20 powerType.suspend = "soft" 
    21 powerType.reset = "soft" 
    22  
    23 ide1:0.startConnected = "FALSE" 
    24 floppy0.startConnected = "FALSE" 
    2530redoLogDir = "." 
    26  
    27 uuid.location = "56 4d a4 e9 36 ce 79 71-8e bc 38 d2 b8 3e ed ea" 
    28 uuid.bios = "56 4d a4 e9 36 ce 79 71-8e bc 38 d2 b8 3e ed ea" 
    29  
    30 Ethernet0.present = "TRUE" 
    31  
    32 Ethernet0.addressType = "generated" 
    33 ethernet0.generatedAddress = "00:0c:29:3e:ed:ea" 
    34 ethernet0.generatedAddressOffset = "0" 
    35  
    36 Ethernet0.startConnected = "TRUE" 
    37  
    38 ide0:0.redo = "" 
    39 ide0:0.deviceType = "ata-hardDisk" 
    40  
    41 Ethernet0.connectionType = "hostonly" 
     31scsi0.present = "TRUE" 
     32usb.present = "FALSE" 
     33uuid.bios = "56 4d 32 85 a0 59 c7 f7-64 37 b9 78 9f e2 08 e8" 
     34uuid.location = "56 4d 32 85 a0 59 c7 f7-64 37 b9 78 9f e2 08 e8" 
     35virtualHW.version = "3"