Bug fixes for CHO test

Change-Id: I19c25e4469f8b28f1cfa47f8fa5c5738d7801dea
diff --git a/TestON/tests/CHOTestMonkey/dependencies/elements/ONOSElement.py b/TestON/tests/CHOTestMonkey/dependencies/elements/ONOSElement.py
index e9dff29..aa3a7a3 100644
--- a/TestON/tests/CHOTestMonkey/dependencies/elements/ONOSElement.py
+++ b/TestON/tests/CHOTestMonkey/dependencies/elements/ONOSElement.py
@@ -8,7 +8,7 @@
     def __init__( self, index ):
         self.default = ''
         self.index = index
-        self.ip = main.onosIPs[ index - 1 ]
+        self.ip = main.ONOSip[ index - 1 ]
         self.CLI = None
         self.CLILock = Lock()
         self.status = 'up'
diff --git a/TestON/tests/CHOTestMonkey/dependencies/events/NetworkEvent.py b/TestON/tests/CHOTestMonkey/dependencies/events/NetworkEvent.py
index ccab8a1..f6e13cc 100644
--- a/TestON/tests/CHOTestMonkey/dependencies/events/NetworkEvent.py
+++ b/TestON/tests/CHOTestMonkey/dependencies/events/NetworkEvent.py
@@ -273,7 +273,7 @@
                             intent.setInstalled()
         # Re-assign mastership for the device
         with main.mininetLock:
-            main.Mininet1.assignSwController( sw=self.device.name, ip=main.onosIPs )
+            main.Mininet1.assignSwController( sw=self.device.name, ip=main.ONOSip )
         # Re-discover hosts
         for host in self.device.hosts:
             correspondent = None