Add IP address argument and create instance with the correct IP address

Change-Id: Ifcad63a74ef5a7cb44f9a1c2640ce9e978febd0a
This commit is contained in:
Jonathan Hart 2014-11-11 16:05:29 -08:00
parent 6a7761904d
commit 7b1f5cb529

View File

@ -42,6 +42,7 @@ class ONOS( Controller ):
# add default modules # add default modules
# TODO: consider an ordered set # TODO: consider an ordered set
self.features = Set([ 'webconsole', self.features = Set([ 'webconsole',
'onos-rest',
'onos-api', 'onos-api',
'onos-cli', 'onos-cli',
'onos-openflow' ]) 'onos-openflow' ])
@ -63,6 +64,8 @@ class ONOS( Controller ):
if self.inNamespace: if self.inNamespace:
instanceOpts = ( '-furl mvn:org.onlab.onos/onos-features/1.0.0-SNAPSHOT/xml/features ' instanceOpts = ( '-furl mvn:org.onlab.onos/onos-features/1.0.0-SNAPSHOT/xml/features '
'-s 8101' ) '-s 8101' )
if self.ip is not None:
instanceOpts += (' -a %s' % self.IP() )
self.userCmd( self.karafDir + 'bin/instance create %s %s' % ( instanceOpts, self.name ) ) self.userCmd( self.karafDir + 'bin/instance create %s %s' % ( instanceOpts, self.name ) )
self.instanceDir = self.karafDir + 'instances/%s/' % self.name self.instanceDir = self.karafDir + 'instances/%s/' % self.name
else: else: