Bob Lantz
Committed by Brian O'Connor

Unpack/install all nodes before startup

Madan suggested that this might help vs. the pipelined
startup we were doing before, so let's try it.

We will unpack/install all nodes before we start up,
so that we can start the whole cluster at about the same
instant.

Note that this is probably closer to what we'd see in hardware.

The disadvantage is that we don't get a "clean" environment
with each invocation of start().

Change-Id: I0a45984f50e1ef25a7d8a836e46978fdbdff0bd0
...@@ -217,6 +217,8 @@ class ONOSNode( Controller ): ...@@ -217,6 +217,8 @@ class ONOSNode( Controller ):
217 self.dir = '/tmp/%s' % self.name 217 self.dir = '/tmp/%s' % self.name
218 self.client = self.dir + '/karaf/bin/client' 218 self.client = self.dir + '/karaf/bin/client'
219 self.ONOS_HOME = '/tmp' 219 self.ONOS_HOME = '/tmp'
220 + self.cmd( 'rm -rf', self.dir )
221 + self.ONOS_HOME = unpackONOS( self.dir, run=self.ucmd )
220 222
221 # pylint: disable=arguments-differ 223 # pylint: disable=arguments-differ
222 224
...@@ -225,8 +227,6 @@ class ONOSNode( Controller ): ...@@ -225,8 +227,6 @@ class ONOSNode( Controller ):
225 env: environment var dict 227 env: environment var dict
226 nodes: all nodes in cluster""" 228 nodes: all nodes in cluster"""
227 env = dict( env ) 229 env = dict( env )
228 - self.cmd( 'rm -rf', self.dir )
229 - self.ONOS_HOME = unpackONOS( self.dir, run=self.ucmd )
230 env.update( ONOS_HOME=self.ONOS_HOME ) 230 env.update( ONOS_HOME=self.ONOS_HOME )
231 self.updateEnv( env ) 231 self.updateEnv( env )
232 karafbin = glob( '%s/apache*/bin' % self.ONOS_HOME )[ 0 ] 232 karafbin = glob( '%s/apache*/bin' % self.ONOS_HOME )[ 0 ]
......