Update Cluster Driver
Change-Id: I8a3a57e19637ff210548e57d41178e6f194cf694
diff --git a/TestON/tests/CHOTestMonkey/dependencies/events/AppEvent.py b/TestON/tests/CHOTestMonkey/dependencies/events/AppEvent.py
index d0f154d..45df912 100644
--- a/TestON/tests/CHOTestMonkey/dependencies/events/AppEvent.py
+++ b/TestON/tests/CHOTestMonkey/dependencies/events/AppEvent.py
@@ -130,7 +130,7 @@
main.log.warn( "Host %s does not exist: " % ( args[ 1 ] ) )
return EventStates().ABORT
index = int( args[ 2 ] )
- if index < 1 or index > int( main.numCtrls ):
+ if index < 1 or index > int( main.Cluster.numCtrls ):
main.log.warn( "%s - invalid argument: %s" % ( self.typeString, index ) )
return EventStates().ABORT
if not main.controllers[ index - 1 ].isUp():
@@ -279,7 +279,7 @@
main.log.warn( "Device %s does not exist: " % ( args[ 1 ] ) )
return EventStates().ABORT
index = int( args[ 2 ] )
- if index < 1 or index > int( main.numCtrls ):
+ if index < 1 or index > int( main.Cluster.numCtrls ):
main.log.warn( "%s - invalid argument: %s" % ( self.typeString, index ) )
return EventStates().ABORT
if not main.controllers[ index - 1 ].isUp():
diff --git a/TestON/tests/CHOTestMonkey/dependencies/events/NetworkEvent.py b/TestON/tests/CHOTestMonkey/dependencies/events/NetworkEvent.py
index 82e60ed..4d676cd 100644
--- a/TestON/tests/CHOTestMonkey/dependencies/events/NetworkEvent.py
+++ b/TestON/tests/CHOTestMonkey/dependencies/events/NetworkEvent.py
@@ -306,7 +306,8 @@
intent.setInstalled()
# Re-assign mastership for the device
with main.mininetLock:
- main.Mininet1.assignSwController( sw=self.device.name, ip=main.ONOSip )
+ ips = main.Cluster.getIps()
+ main.Mininet1.assignSwController( sw=self.device.name, ip=ips )
# Re-discover hosts
for host in self.device.hosts:
correspondent = None
diff --git a/TestON/tests/CHOTestMonkey/dependencies/events/ONOSEvent.py b/TestON/tests/CHOTestMonkey/dependencies/events/ONOSEvent.py
index 0df5253..e8b7281 100644
--- a/TestON/tests/CHOTestMonkey/dependencies/events/ONOSEvent.py
+++ b/TestON/tests/CHOTestMonkey/dependencies/events/ONOSEvent.py
@@ -45,7 +45,7 @@
result = EventStates().ABORT
else:
index = int( args[ 0 ] )
- if index < 1 or index > int( main.numCtrls ):
+ if index < 1 or index > int( main.Cluster.numCtrls ):
main.log.warn( "%s - invalid argument: %s" % ( self.typeString, index ) )
result = EventStates().ABORT
else: