commit ca974c815c7fab467b858a2e6ee4b7b3ab3ae51b
author Luca Prete <luca@onlab.us> Tue May 01 18:06:16 2018 -0700
committer Luca Prete <luca@onlab.us> Mon May 07 16:58:29 2018 -0700
tree 6a55b3f0601e9dcba8aa277a7909ce106c504555
parent 508771c2795cca11e68216268da1465ec2286d88

[CORD-3004] Refactor, improve XOS OLT service

Change-Id: I33aedccacde0737b741a113cf3455f90a5902394

xos/synchronizer/steps/test_sync_volt_service_instance.py

diff --git a/xos/synchronizer/steps/test_sync_volt_service_instance.py b/xos/synchronizer/steps/test_sync_volt_service_instance.py
index dfab503..85138d5 100644
--- a/xos/synchronizer/steps/test_sync_volt_service_instance.py
+++ b/xos/synchronizer/steps/test_sync_volt_service_instance.py
@@ -44,7 +44,6 @@
     return prop
 
 class TestSyncOLTDevice(unittest.TestCase):
-
     def setUp(self):
         global DeferredException
 
@@ -78,9 +77,10 @@
         o.tologdict.return_value = {}
 
         volt_service = Mock()
-        volt_service.p_onos_url = "p_onos_url"
-        volt_service.p_onos_user = "p_onos_user"
-        volt_service.p_onos_pass = "p_onos_pass"
+        volt_service.onos_voltha_url = "onos_voltha_url"
+        volt_service.onos_voltha_port = 4321
+        volt_service.onos_voltha_user = "onos_voltha_user"
+        volt_service.onos_voltha_pass = "onos_voltha_pass"
 
         si = Mock()
         si.get_westbound_service_instance_properties = mock_get_westbound_service_instance_properties
@@ -97,11 +97,8 @@
         self.o = None
         sys.path = self.sys_path_save
 
-
-
     @requests_mock.Mocker()
     def test_do_not_sync(self, m):
-
         self.olt_device.dp_id = None
 
         with patch.object(ServiceInstance.objects, "get") as service_instance_mock, \
@@ -119,8 +116,7 @@
 
     @requests_mock.Mocker()
     def test_do_sync(self, m):
-
-        m.post("http://p_onos_url/onos/olt/oltapp/of:dp_id/uni_port_id/c_tag", status_code=200, json={})
+        m.post("http://onos_voltha_url:4321/onos/olt/oltapp/of:dp_id/uni_port_id/c_tag", status_code=200, json={})
 
         self.olt_device.dp_id = "of:dp_id"
 
@@ -136,7 +132,7 @@
 
     @requests_mock.Mocker()
     def test_do_sync_fail(self, m):
-        m.post("http://p_onos_url/onos/olt/oltapp/of:dp_id/uni_port_id/c_tag", status_code=500, text="Mock Error")
+        m.post("http://onos_voltha_url:4321/onos/olt/oltapp/of:dp_id/uni_port_id/c_tag", status_code=500, text="Mock Error")
 
         self.olt_device.dp_id = "of:dp_id"
 
@@ -149,10 +145,8 @@
 
             with self.assertRaises(Exception) as e:
                 self.sync_step().sync_record(self.o)
-
-            self.assertTrue(m.called)
-            self.assertEqual(e.exception.message, "Failed to add subscriber in P_ONOS: Mock Error")
-
+                self.assertTrue(m.called)
+                self.assertEqual(e.exception.message, "Failed to add subscriber in onos voltha: Mock Error")
 
 if __name__ == "__main__":
-    unittest.main()
\ No newline at end of file
+    unittest.main()