commit 35207b74d7888fc0c0678689380ded260269282b
author Matteo Scandolo <teo@opennetworking.org> Fri May 10 08:46:48 2019 -0700
committer Matteo Scandolo <teo@opennetworking.org> Fri May 10 08:46:48 2019 -0700
tree 5701fe77de8862e802f198bf80e804fae19273e1
parent 778fef79c5203a04902c0bd0f0bd1acc7ce54379

Fixing olt unit tests

Change-Id: I41c7d9e8a9f7c4dbc95dea1a4419f1cee9cd4a1e

xos/synchronizer/model_policies/test_model_policy_voltserviceinstance.py

diff --git a/xos/synchronizer/model_policies/test_model_policy_voltserviceinstance.py b/xos/synchronizer/model_policies/test_model_policy_voltserviceinstance.py
index 1cfdf05..06101d6 100644
--- a/xos/synchronizer/model_policies/test_model_policy_voltserviceinstance.py
+++ b/xos/synchronizer/model_policies/test_model_policy_voltserviceinstance.py
@@ -34,8 +34,7 @@
 
         from xossynchronizer.mock_modelaccessor_build import mock_modelaccessor_config
         mock_modelaccessor_config(test_path, [("olt-service", "volt.xproto"),
-                                                ("vsg", "vsg.xproto"),
-                                                ("rcord", "rcord.xproto"),])
+                                                ("rcord", "rcord.xproto")])
 
         import xossynchronizer.modelaccessor
         import mock_modelaccessor
@@ -52,7 +51,7 @@
         for (k, v) in model_accessor.all_model_classes.items():
             globals()[k] = v
 
-        # Some of the functions we call have side-effects. For example, creating a VSGServiceInstance may lead to creation of
+        # Some of the functions we call have side-effects. For example, creating a ServiceInstance may lead to creation of
         # tags. Ideally, this wouldn't happen, but it does. So make sure we reset the world.
         model_accessor.reset_all_object_stores()
 
@@ -72,12 +71,12 @@
 
     def test_create_vsg(self):
         with patch.object(ServiceInstanceLink, "save", autospec=True) as save_link, \
-            patch.object(VSGServiceInstance, "save", autospec=True) as save_vsg:
+            patch.object(ServiceInstance, "save", autospec=True) as save_vsg:
 
             subscriber_si = Mock()
 
             link = Mock()
-            link.provider_service.get_service_instance_class_name.return_value = "VSGServiceInstance"
+            link.provider_service.get_service_instance_class_name.return_value = "ServiceInstance"
             link.provider_service.name = "FabricCrossconnect"
             link.provider_service.validate_links = Mock(return_value=[])
             link.provider_service.acquire_service_instance = Mock(return_value=subscriber_si)
@@ -94,12 +93,12 @@
 
     def test_create_vsg_already_exists(self):
         with patch.object(ServiceInstanceLink, "save", autospec=True) as save_link, \
-            patch.object(VSGServiceInstance, "save", autospec=True) as save_vsg:
+            patch.object(ServiceInstance, "save", autospec=True) as save_vsg:
 
             subscriber_si = Mock()
 
             link = Mock()
-            link.provider_service.get_service_instance_class_name.return_value = "VSGServiceInstance"
+            link.provider_service.get_service_instance_class_name.return_value = "ServiceInstance"
             link.provider_service.name = "FabricCrossconnect"
             link.provider_service.validate_links = Mock(return_value=subscriber_si)
             link.provider_service.acquire_service_instance = Mock()