commit 0d756f2a14f1ec2c0094d7f7b9be50298cd442ec
author Matteo Scandolo <teo@opennetworking.org> Mon Jun 10 14:55:55 2019 -0700
committer Matteo Scandolo <teo@opennetworking.org> Wed Jun 12 00:48:34 2019 +0000
tree 9bb8760a26e20c1c7c9a7e0d9a7111f72edc6ac5
parent 2e713b7764c207d08d1d760acdae9a551b5d7675

[SEBA-723] Removing ONOS parameters from vOLT Service

Change-Id: I18a44dace5aa7b7c26f06d0b320631cc23114b71

xos/synchronizer/steps/test_sync_olt_device.py

diff --git a/xos/synchronizer/steps/test_sync_olt_device.py b/xos/synchronizer/steps/test_sync_olt_device.py
index 1ecb04f..307cae1 100644
--- a/xos/synchronizer/steps/test_sync_olt_device.py
+++ b/xos/synchronizer/steps/test_sync_olt_device.py
@@ -56,6 +56,14 @@
         pon_port = Mock()
         pon_port.port_id = "00ff00"
 
+        # create a mock ONOS Service
+        onos = Mock()
+        onos.name = "ONOS"
+        onos.leaf_model.rest_hostname = "onos"
+        onos.leaf_model.rest_port = 4321
+        onos.leaf_model.rest_username = "karaf"
+        onos.leaf_model.rest_password = "karaf"
+
         # Create a mock OLTDevice
         o = Mock()
         o.volt_service.voltha_url = "voltha_url"
@@ -63,10 +71,7 @@
         o.volt_service.voltha_user = "voltha_user"
         o.volt_service.voltha_pass = "voltha_pass"
 
-        o.volt_service.onos_voltha_port = 4321
-        o.volt_service.onos_voltha_url = "onos"
-        o.volt_service.onos_voltha_user = "karaf"
-        o.volt_service.onos_voltha_pass = "karaf"
+        o.volt_service.provider_services = [onos]
 
         o.device_type = "ponsim_olt"
         o.host = "172.17.0.1"

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 492b4fc..8bbdf6f 100644
--- a/xos/synchronizer/steps/test_sync_volt_service_instance.py
+++ b/xos/synchronizer/steps/test_sync_volt_service_instance.py
@@ -53,11 +53,16 @@
 
         self.sync_step = SyncVOLTServiceInstance
 
+        # create a mock ONOS Service
+        onos = Mock()
+        onos.name = "ONOS"
+        onos.leaf_model.rest_hostname = "onos_voltha_url"
+        onos.leaf_model.rest_port = 4321
+        onos.leaf_model.rest_username = "onos_voltha_user"
+        onos.leaf_model.rest_password = "onos_voltha_pass"
+
         volt_service = Mock()
-        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"
+        volt_service.provider_services = [onos]
 
         uni_port = Mock()
         uni_port.port_no = "uni_port_id"