From 7e75450a50dd71fc6e6571248dbf689bf98cec33 Mon Sep 17 00:00:00 2001 From: Rudra Rugge Date: Thu, 16 Jul 2015 10:32:08 -0700 Subject: [PATCH] Update unit tests for service monitor Update unit tests for service monitor Change-Id: I39e50df3d6593ba168a2b2ed92688a2511d4e86b Partial-Bug: #1427863 --- src/config/svc-monitor/svc_monitor/tests/test_snat.py | 5 +++++ .../svc_monitor/tests/test_virtual_machine_manager.py | 5 +++++ .../svc_monitor/tests/test_vrouter_instance_manager.py | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/src/config/svc-monitor/svc_monitor/tests/test_snat.py b/src/config/svc-monitor/svc_monitor/tests/test_snat.py index 050eb224a0a..d8c342b1dfd 100644 --- a/src/config/svc-monitor/svc_monitor/tests/test_snat.py +++ b/src/config/svc-monitor/svc_monitor/tests/test_snat.py @@ -45,6 +45,10 @@ def vn_create(vn_obj): vn_obj.uuid = 'fake-vn-uuid' return + def iip_create(iip_obj): + iip_obj.uuid = 'fake-iip-uuid' + return + def vn_read(vn_id): vn_obj = {} vn_obj['uuid'] = 'fake-vn-uuid' @@ -86,6 +90,7 @@ def vr_read(vm_id): self.mocked_vnc.fq_name_to_id = get_vn_id self.mocked_vnc.virtual_machine_interface_create = vmi_create self.mocked_vnc.virtual_network_create = vn_create + self.mocked_vnc.instance_ip_create = iip_create self.nova_mock = mock.MagicMock() self.mocked_db = mock.MagicMock() diff --git a/src/config/svc-monitor/svc_monitor/tests/test_virtual_machine_manager.py b/src/config/svc-monitor/svc_monitor/tests/test_virtual_machine_manager.py index 60dae8a212a..4eb38767ca9 100644 --- a/src/config/svc-monitor/svc_monitor/tests/test_virtual_machine_manager.py +++ b/src/config/svc-monitor/svc_monitor/tests/test_virtual_machine_manager.py @@ -58,10 +58,15 @@ def vmi_create(vmi_obj): vmi_obj.uuid = 'fake-vmi-uuid' return + def iip_create(iip_obj): + iip_obj.uuid = 'fake-iip-uuid' + return + self.mocked_vnc = mock.MagicMock() self.mocked_vnc.fq_name_to_id = get_vn_id self.mocked_vnc.virtual_network_create = vn_create self.mocked_vnc.virtual_machine_interface_create = vmi_create + self.mocked_vnc.instance_ip_create = iip_create self.nova_mock = mock.MagicMock() self.mocked_db = mock.MagicMock() diff --git a/src/config/svc-monitor/svc_monitor/tests/test_vrouter_instance_manager.py b/src/config/svc-monitor/svc_monitor/tests/test_vrouter_instance_manager.py index 7f5dbe42e4a..0901f381951 100644 --- a/src/config/svc-monitor/svc_monitor/tests/test_vrouter_instance_manager.py +++ b/src/config/svc-monitor/svc_monitor/tests/test_vrouter_instance_manager.py @@ -58,6 +58,10 @@ def vmi_create(vmi_obj): vmi_obj.uuid = 'fake-vmi-uuid' return + def iip_create(iip_obj): + iip_obj.uuid = 'fake-iip-uuid' + return + def vm_read(vm_id): class SI(object): def __init__(self, name, fq_name): @@ -89,6 +93,7 @@ def vr_read(vm_id): self.mocked_vnc = mock.MagicMock() self.mocked_vnc.fq_name_to_id = get_vn_id self.mocked_vnc.virtual_machine_interface_create = vmi_create + self.mocked_vnc.instance_ip_create = iip_create self.nova_mock = mock.MagicMock() self.mocked_db = mock.MagicMock()