홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Jonathan Hart
7b1f5cb5 1 parent 6a776190

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

Change-Id: Ifcad63a74ef5a7cb44f9a1c2640ce9e978febd0a
Inline Side-by-side
Showing 1 changed file with 3 additions and 0 deletions
...@@ -42,6 +42,7 @@ class ONOS( Controller ): ...@@ -42,6 +42,7 @@ class ONOS( Controller ):
42 # add default modules 42 # add default modules
43 # TODO: consider an ordered set 43 # TODO: consider an ordered set
44 self.features = Set([ 'webconsole', 44 self.features = Set([ 'webconsole',
45 + 'onos-rest',
45 'onos-api', 46 'onos-api',
46 'onos-cli', 47 'onos-cli',
47 'onos-openflow' ]) 48 'onos-openflow' ])
...@@ -63,6 +64,8 @@ class ONOS( Controller ): ...@@ -63,6 +64,8 @@ class ONOS( Controller ):
63 if self.inNamespace: 64 if self.inNamespace:
64 instanceOpts = ( '-furl mvn:org.onlab.onos/onos-features/1.0.0-SNAPSHOT/xml/features ' 65 instanceOpts = ( '-furl mvn:org.onlab.onos/onos-features/1.0.0-SNAPSHOT/xml/features '
65 '-s 8101' ) 66 '-s 8101' )
67 + if self.ip is not None:
68 + instanceOpts += (' -a %s' % self.IP() )
66 self.userCmd( self.karafDir + 'bin/instance create %s %s' % ( instanceOpts, self.name ) ) 69 self.userCmd( self.karafDir + 'bin/instance create %s %s' % ( instanceOpts, self.name ) )
67 self.instanceDir = self.karafDir + 'instances/%s/' % self.name 70 self.instanceDir = self.karafDir + 'instances/%s/' % self.name
68 else: 71 else:
......