Author: fapeeler
Date: Fri Jun 1 13:56:20 2012
New Revision: 1345179
URL: http://svn.apache.org/viewvc?rev=1345179&view=rev
Log:
VCL-576
Fix of 2.3 mess up.
Thanks Cameron Mann for pointing this out.
Modified:
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/vSphere_SDK.pm
Modified:
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm?rev=1345179&r1=1345178&r2=1345179&view=diff
==============================================================================
---
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm
(original)
+++
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm
Fri Jun 1 13:56:20 2012
@@ -463,9 +463,9 @@ sub _get_datastore_info {
# (vim.Datastore.Summary) [
# (vim.Datastore.Summary) {
# dynamicType = <unset>,
- # datastore =
'vim.Datastore:4bcf0efe-c426acc4-c7e2.31a644d1cc0',
+ # datastore =
'vim.Datastore:4bcf0efe-c426acc4-c7e1-001a644d1cc0',
# name = "local-datastore",
- # url =
"/vmfs/volumes/4bcf0efe-c426acc4-c7e2.31a644d1cc0",
+ # url =
"/vmfs/volumes/4bcf0efe-c426acc4-c7e1-001a644d1cc0",
# capacity = 31138512896,
# freeSpace = 26277314560,
# uncommitted = 0,
Modified:
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm?rev=1345179&r1=1345178&r2=1345179&view=diff
==============================================================================
---
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm
(original)
+++
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm
Fri Jun 1 13:56:20 2012
@@ -88,18 +88,18 @@ our %VM_OS_CONFIGURATION = (
},
"linux-x86_64" => {
"guestOS" => "otherlinux-64",
- "ethernet-virtualDev" => "e2.3",
+ "ethernet-virtualDev" => "e1000",
"scsi-virtualDev" => "lsiLogic",
},
# OSX configuration
"osx-x86" => {
"guestOS" => "darwin10-64",
- "ethernet-virtualDev" => "e2.3",
+ "ethernet-virtualDev" => "e1000",
"scsi-virtualDev" => "lsiLogic",
},
"osx-x86_64" => {
"guestOS" => "darwin10-64",
- "ethernet-virtualDev" => "e2.3",
+ "ethernet-virtualDev" => "e1000",
"scsi-virtualDev" => "lsiLogic",
},
# Windows configurations:
@@ -111,34 +111,34 @@ our %VM_OS_CONFIGURATION = (
},
"winxp-x86_64" => {
"guestOS" => "winXPPro-64",
- "ethernet-virtualDev" => "e2.3",
+ "ethernet-virtualDev" => "e1000",
"scsi-virtualDev" => "lsiLogic",
"cpu_socket_limit" => 2,
},
"winvista-x86" => {
"guestOS" => "winvista",
- "ethernet-virtualDev" => "e2.3",
+ "ethernet-virtualDev" => "e1000",
"scsi-virtualDev" => "lsiLogic",
"memsize" => 1024,
"cpu_socket_limit" => 2,
},
"vista-x86_64" => {
"guestOS" => "winvista-64",
- "ethernet-virtualDev" => "e2.3",
+ "ethernet-virtualDev" => "e1000",
"scsi-virtualDev" => "lsiLogic",
"memsize" => 1024,
"cpu_socket_limit" => 2,
},
"win7-x86" => {
"guestOS" => "windows7",
- "ethernet-virtualDev" => "e2.3",
+ "ethernet-virtualDev" => "e1000",
"scsi-virtualDev" => "lsiLogic",
"memsize" => 1024,
"cpu_socket_limit" => 2,
},
"win7-x86_64" => {
"guestOS" => "windows7-64",
- "ethernet-virtualDev" => "e2.3",
+ "ethernet-virtualDev" => "e1000",
"scsi-virtualDev" => "lsiLogic",
"memsize" => 2048,
"cpu_socket_limit" => 2,
@@ -151,20 +151,20 @@ our %VM_OS_CONFIGURATION = (
},
"win2003-x86_64" => {
"guestOS" => "winNetEnterprise-64",
- "ethernet-virtualDev" => "e2.3",
+ "ethernet-virtualDev" => "e1000",
"scsi-virtualDev" => "lsiLogic",
"memsize" => 1024,
"cpu_socket_limit" => 64,
},
"win2008-x86" => {
"guestOS" => "winServer2008Enterprise-32",
- "ethernet-virtualDev" => "e2.3",
+ "ethernet-virtualDev" => "e1000",
"scsi-virtualDev" => "lsiLogic",
"cpu_socket_limit" => 64,
},
"win2008-x86_64" => {
"guestOS" => "winServer2008Enterprise-64",
- "ethernet-virtualDev" => "e2.3",
+ "ethernet-virtualDev" => "e1000",
"scsi-virtualDev" => "lsiLogic",
"cpu_socket_limit" => 64,
},
@@ -176,7 +176,7 @@ our %VM_OS_CONFIGURATION = (
},
"windows-x86_64" => {
"guestOS" => "winXPPro-64",
- "ethernet-virtualDev" => "e2.3",
+ "ethernet-virtualDev" => "e1000",
"scsi-virtualDev" => "lsiLogic",
},
# Default configuration if OS is not Windows or Linux:
@@ -187,7 +187,7 @@ our %VM_OS_CONFIGURATION = (
},
"default-x86_64" => {
"guestOS" => "other-64",
- "ethernet-virtualDev" => "e2.3",
+ "ethernet-virtualDev" => "e1000",
"scsi-virtualDev" => "lsiLogic",
},
);
@@ -5256,7 +5256,7 @@ sub get_vmx_file_paths {
|--{displayname} = 'vm-ark-mcnc-9'
|--{ethernet0.address} = '00:50:56:03:54:11'
|--{ethernet0.addresstype} = 'static'
- |--{ethernet0.virtualdev} = 'e2.3'
+ |--{ethernet0.virtualdev} = 'e1000'
|--{ethernet0.vnet} = 'Private'
|--{guestos} = 'winserver2008enterprise-32'
|--{scsi0.present} = 'TRUE'
Modified:
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/vSphere_SDK.pm
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/vSphere_SDK.pm?rev=1345179&r1=1345178&r2=1345179&view=diff
==============================================================================
---
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/vSphere_SDK.pm
(original)
+++
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/vSphere_SDK.pm
Fri Jun 1 13:56:20 2012
@@ -3217,12 +3217,12 @@ sub _get_datastore_object {
$datastore_info->{datastore1}{accessible} = '1'
$datastore_info->{datastore1}{capacity} = '31138512896'
$datastore_info->{datastore1}{datastore}{type} = 'Datastore'
- $datastore_info->{datastore1}{datastore}{value} =
'4bcf0efe-c426acc4-c7e2.31a644d1cc0'
+ $datastore_info->{datastore1}{datastore}{value} =
'4bcf0efe-c426acc4-c7e1-001a644d1cc0'
$datastore_info->{datastore1}{freeSpace} = '30683430912'
$datastore_info->{datastore1}{name} = 'datastore1'
$datastore_info->{datastore1}{type} = 'VMFS'
$datastore_info->{datastore1}{uncommitted} = '0'
- $datastore_info->{datastore1}{url} =
'/vmfs/volumes/4bcf0efe-c426acc4-c7e2.31a644d1cc0'
+ $datastore_info->{datastore1}{url} =
'/vmfs/volumes/4bcf0efe-c426acc4-c7e1-001a644d1cc0'
=cut
