ESX(i) : Incorrect machine id parameters in vmx for guest_tool.py

[Arvind Somya]

The guest_tool.py script provided for vmware integration asserts an exact length of 6 on the split machine.id that provides all networking information but the length of machine.id written by vmops is only 4.
  assert len(network_info_list) % 6 == 0

  machine_id_chanfge_spec = \

            vm_util.get_machine_id_change_spec(client_factory, mac_addr,

                                        ip_addr, net_mask, gateway)

The machine.id is missing the broadcast and dns and the guest_tool.py fails everytime it tries to set the network address in the guest.

Additionally the guest_tool.py script is incompatible with python 2.6, it keeps failing with the error message:
Traceback (most recent call last):
  File "guest_tool.py", line 387, in <module>
    _linux_set_networking()
  File "guest_tool.py", line 371, in _linux_set_networking
    check_exit_code=False))
  File "guest_tool.py", line 207, in _execute
    logging.debug(_("Executing command: '%s'") % cmd)
NameError: global name '_' is not defined

The script does not support Ubuntu distributions.

[Arvind Somya (asomya)]

Attaching a diff that fixes the aforementioned issues:

- Write the required 6 length machine.id to the vmx file.
- Added support for the implicit gettext translations ( _() ).
- Added support for Ubuntu distros.

[Thierry Carrez (ttx)]

@Arvind: any chance you could implement your fix in a branch and propose that for merging into trunk ?

[Thierry Carrez (ttx)]

Thanks !