Merge "Update unit tests for service monitor"

Juniper · Jul 17, 2015 · 7285554 · 7285554
2 parents 02715ef + 7e75450
commit 7285554
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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()