Revision 87737a70 bin/mn

View differences:

bin/mn
176 176
                        ' controller]' )
177 177
        opts.add_option( '--innamespace', action='store_true',
178 178
                        default=False, help='sw and ctrl in namespace?' )
179
<<<<<<< HEAD:bin/mn
180
=======
181 179
        opts.add_option( '--listenport', type='int', default=6634,
182 180
                        help='[base port for passive switch listening'
183 181
                        ' controller]' )
184 182
        opts.add_option( '--nolistenport', action='store_true',
185 183
                        default=False, help="don't use passive listening port")
186
>>>>>>> of1.0:bin/mn
187 184
        opts.add_option( '--pre', type='string', default=None,
188 185
                        help='[CLI script to run before tests]' )
189 186
        opts.add_option( '--post', type='string', default=None,
190 187
                        help='[CLI script to run after tests]' )
191
<<<<<<< HEAD:bin/mn
192

  
193
=======
194 188
        opts.add_option( '--prefixlen', type='int', default=8,
195 189
                        help='[prefix length (e.g. /8) for automatic '
196 190
                        'network configuration]' )
197
>>>>>>> of1.0:bin/mn
191

  
198 192
        self.options, self.args = opts.parse_args()
199 193

  
200 194
    def setup( self ):
......
231 225
        if self.validate:
232 226
            self.validate( self.options )
233 227

  
234
<<<<<<< HEAD:bin/mn
235
        controllerParams = ControllerParams( '10.0.0.0', 8 )
236
=======
237 228
        # We should clarify what this is actually for...
238 229
        # It seems like it should be default values for the
239 230
        # *data* network, so it may be misnamed.
240 231
        controllerParams = ControllerParams( '10.0.0.0',
241 232
            self.options.prefixlen)
242 233

  
243
>>>>>>> of1.0:bin/mn
244 234
        inNamespace = self.options.innamespace
245 235
        xterms = self.options.xterms
246 236
        mac = self.options.mac
......
251 241
        mn = Mininet( topo, switch, host, controller, controllerParams,
252 242
                     inNamespace=inNamespace,
253 243
                     xterms=xterms, autoSetMacs=mac,
254
<<<<<<< HEAD:bin/mn
255
                     autoStaticArp=arp )
256
=======
257 244
                     autoStaticArp=arp, listenPort=listenPort )
258
>>>>>>> of1.0:bin/mn
245

  
259 246
        if self.options.pre:
260 247
            CLI( mn, script=self.options.pre )
261 248

  

Also available in: Unified diff