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_helpers.py

diff --git a/xos/synchronizer/steps/test_helpers.py b/xos/synchronizer/steps/test_helpers.py
index 2820d9e..f97625e 100644
--- a/xos/synchronizer/steps/test_helpers.py
+++ b/xos/synchronizer/steps/test_helpers.py
@@ -19,14 +19,16 @@
 class TestHelpers(unittest.TestCase):
 
     def setUp(self):
-        # create a mock service instance
+        # Create a mock service instance
         o = Mock()
         o.voltha_url = "voltha_url"
+        o.voltha_port = 1234
         o.voltha_user = "voltha_user"
         o.voltha_pass = "voltha_pass"
-        o.p_onos_url = "p_onos_url"
-        o.p_onos_user = "p_onos_user"
-        o.p_onos_pass = "p_onos_pass"
+        o.onos_voltha_url = "onos_voltha_url"
+        o.onos_voltha_port = 4321
+        o.onos_voltha_user = "onos_voltha_user"
+        o.onos_voltha_pass = "onos_voltha_pass"
 
         self.o = o
 
@@ -40,15 +42,17 @@
         voltha_dict = Helpers.get_voltha_info(self.o)
 
         self.assertEqual(voltha_dict["url"], "http://voltha_url")
+        self.assertEqual(voltha_dict["port"], 1234)
         self.assertEqual(voltha_dict["user"], "voltha_user")
         self.assertEqual(voltha_dict["pass"], "voltha_pass")
 
     def test_get_onos_info(self):
-        p_onos_dict = Helpers.get_p_onos_info(self.o)
+        onos_voltha_dict = Helpers.get_onos_voltha_info(self.o)
 
-        self.assertEqual(p_onos_dict["url"], "http://p_onos_url")
-        self.assertEqual(p_onos_dict["user"], "p_onos_user")
-        self.assertEqual(p_onos_dict["pass"], "p_onos_pass")
+        self.assertEqual(onos_voltha_dict["url"], "http://onos_voltha_url")
+        self.assertEqual(onos_voltha_dict["port"], 4321)
+        self.assertEqual(onos_voltha_dict["user"], "onos_voltha_user")
+        self.assertEqual(onos_voltha_dict["pass"], "onos_voltha_pass")
 
     def test_datapath_id_to_hex(self):
         hex = Helpers.datapath_id_to_hex(55334486016)