[virt-who] satellite: use proper hypervisor type in VM name

[Radek Novacek]

commit 2a44c5e74487f454ee3140231edcab9c946522d2
Author: Radek Novacek <rnovacek(a)redhat.com&gt;
Date:   Wed Nov 26 09:18:30 2014 +0100

    satellite: use proper hypervisor type in VM name
    
    virt-who reported this as name of VM:
    VM from None hypervisor ad58b739-5288-4cbc-a984-bd771612d670
    
    Now fixed to correct string:
    VM from esx hypervisor ad58b739-5288-4cbc-a984-bd771612d670

 tests/test_manager.py |    6 +++---
 virtwho.py            |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/tests/test_manager.py b/tests/test_manager.py
index 8f777ae..6bbdebb 100644
--- a/tests/test_manager.py
+++ b/tests/test_manager.py
@@ -121,7 +121,7 @@ class TestSatellite(TestManager):
         manager = Manager.fromOptions(self.logger, options)
         options.env = "ENV"
         options.owner = "OWNER"
-        manager.hypervisorCheckIn(options, self.mapping)
+        manager.hypervisorCheckIn(options, self.mapping, 'ABC')
         manager.server.registration.virt_notify.assert_called_with(ANY, [
             [
                 0, 'exists', 'system', {'uuid':
'0000000000000000', 'identity': 'host'}
@@ -131,7 +131,7 @@ class TestSatellite(TestManager):
                 0, 'exists', 'domain', {
                     'state': 'running',
                     'memory_size': 0,
-                    'name': 'VM from None hypervisor
ad58b739-5288-4cbc-a984-bd771612d670',
+                    'name': 'VM from ABC hypervisor
ad58b739-5288-4cbc-a984-bd771612d670',
                     'virt_type': 'fully_virtualized',
                     'vcpus': 1,
                     'uuid': '2147647e6f064ac0982d6902c259f9d6'
@@ -140,7 +140,7 @@ class TestSatellite(TestManager):
                 0, 'exists', 'domain', {
                     'state': 'running',
                     'memory_size': 0,
-                    'name': 'VM from None hypervisor
ad58b739-5288-4cbc-a984-bd771612d670',
+                    'name': 'VM from ABC hypervisor
ad58b739-5288-4cbc-a984-bd771612d670',
                     'virt_type': 'fully_virtualized',
                     'vcpus': 1,
                     'uuid': 'd5ffceb5f79d41bea4c1204f836e144a'
diff --git a/virtwho.py b/virtwho.py
index 9b826f2..85ff3ee 100644
--- a/virtwho.py
+++ b/virtwho.py
@@ -151,7 +151,7 @@ class VirtWho(object):
         if not virt.isHypervisor():
             manager.sendVirtGuests(virtualGuests)
         else:
-            result = manager.hypervisorCheckIn(virt.config, virtualGuests)
+            result = manager.hypervisorCheckIn(virt.config, virtualGuests,
virt.config.type)
 
             # Show the result of hypervisorCheckIn
             for fail in result['failedUpdate']: