commit e16f048cc14b7cc574fb1ba8039ddd1b7a106d48
author Brian O'Connor <bocon@onlab.us> Wed Nov 12 17:14:12 2014 -0800
committer Gerrit Code Review <gerrit@onlab.us> Wed Nov 12 17:14:12 2014 -0800
tree 2faa0efdb988d9a5cf89d7d404d9a573597bc0c9
parent 524f2e8cfc89e7302ef7c2f388b8e62a4c180595
parent 7b1f5cb5296fa657583c45b6ef5e205ec2153ad9

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

tools/test/topos/onos.py

diff --git a/tools/test/topos/onos.py b/tools/test/topos/onos.py
index 80a8005..6dca835 100755
--- a/tools/test/topos/onos.py
+++ b/tools/test/topos/onos.py
@@ -42,6 +42,7 @@
         # add default modules
         # TODO: consider an ordered set
         self.features = Set([ 'webconsole',
+                              'onos-rest',
                               'onos-api',
                               'onos-cli',
                               'onos-openflow' ])
@@ -63,6 +64,8 @@
         if self.inNamespace:
             instanceOpts = ( '-furl mvn:org.onlab.onos/onos-features/1.0.0-SNAPSHOT/xml/features '
                              '-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.instanceDir = self.karafDir + 'instances/%s/' % self.name
         else: