Code review comment for lp:~citrix-openstack/nova/xenapi-vlan-network-manager

I merged with trunk and got a conflict in network/manager.py

<<<<<<< TREE
flags.DEFINE_string('vlan_interface', 'eth0',
                    'network device for vlans')
flags.DEFINE_integer('num_networks', 1000, 'Number of networks to support')
=======
flags.DEFINE_integer('num_networks', 1, 'Number of networks to support')
>>>>>>> MERGE-SOURCE

Also had a unit-test error in one of the test files, so the rest of the XenAPI tests aren't currently running. Forget a bzr add?

======================================================================
ERROR: Failure: ImportError (cannot import name fake_utils)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/local/lib/python2.6/dist-packages/nose/loader.py", line 390, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/local/lib/python2.6/dist-packages/nose/importer.py", line 39, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/local/lib/python2.6/dist-packages/nose/importer.py", line 86, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/root/code/nova/xenapi-vlan-network-manager/nova/tests/test_xenapi.py", line 41, in <module>
    from nova.tests import fake_utils
ImportError: cannot import name fake_utils

----------------------------------------------------------------------

36) Shouldn't this be the citrix copyright?

623-632) this seems really odd to me. What's an example of how we would actually fail into the exception block?

Tiny nits:

116 + "Expected %(vlan_num)d") % locals())

You might want a space before Expected or it will run up against the period from the previous sentence