From 1aadd5e961a6f1983454f5f49f077f0be0d6cba8 Mon Sep 17 00:00:00 2001
From: Lvov Maxim <usrleon@gmail.com>
Date: Fri, 20 May 2011 12:53:49 +0400
Subject: added support for reserving certain network for certain project

---
 bin/nova-manage         | 7 ++++---
 nova/network/manager.py | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/nova-manage b/bin/nova-manage
index db964064d..c64f25c23 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -515,11 +515,11 @@ class NetworkCommands(object):
     """Class for managing networks."""
 
     def create(self, fixed_range=None, num_networks=None,
-               network_size=None, vlan_start=None,
+               network_size=None, vlan_start=None, project_id=None,
                vpn_start=None, fixed_range_v6=None, label='public'):
         """Creates fixed ips for host by range
         arguments: fixed_range=FLAG, [num_networks=FLAG],
-                   [network_size=FLAG], [vlan_start=FLAG],
+                   [network_size=FLAG], [vlan_start=FLAG], [project_id=None],
                    [vpn_start=FLAG], [fixed_range_v6=FLAG]"""
         if not fixed_range:
             msg = _('Fixed range in the form of 10.0.0.0/8 is '
@@ -545,7 +545,8 @@ class NetworkCommands(object):
                                         vlan_start=int(vlan_start),
                                         vpn_start=int(vpn_start),
                                         cidr_v6=fixed_range_v6,
-                                        label=label)
+                                        label=label,
+                                        project_id=project_id)
         except ValueError, e:
             print e
             raise e
diff --git a/nova/network/manager.py b/nova/network/manager.py
index 5a6fdde5a..3422b72c1 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -564,6 +564,8 @@ class VlanManager(NetworkManager):
             net['dhcp_start'] = str(project_net[3])
             net['vlan'] = vlan
             net['bridge'] = 'br%s' % vlan
+            if kwargs.has_key('project_id'):
+                net['project_id'] = kwargs['project_id']
             if(FLAGS.use_ipv6):
                 cidr_v6 = '%s/%s' % (fixed_net_v6[start_v6],
                                      significant_bits_v6)
-- 
cgit 


From 4c1fd8a303a8eb1287fd83b04bd767171221d117 Mon Sep 17 00:00:00 2001
From: Lvov Maxim <usrleon@gmail.com>
Date: Mon, 30 May 2011 11:25:21 +0400
Subject: add support for keyword arguments

---
 bin/nova-manage | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/bin/nova-manage b/bin/nova-manage
index c64f25c23..3d09f9064 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -1132,9 +1132,18 @@ def main():
     action = argv.pop(0)
     matches = lazy_match(action, actions)
     action, fn = matches[0]
+
+    fn_args, fn_kwargs = [], {}
+    for arg in argv:
+        if '=' in arg:
+            key, value = arg.split('=')
+            fn_kwargs[key] = value
+        else:
+            fn_args.append(arg)
+
     # call the action with the remaining arguments
     try:
-        fn(*argv)
+        fn(*fn_args, **fn_kwargs)
         sys.exit(0)
     except TypeError:
         print _("Possible wrong number of arguments supplied")
-- 
cgit 


From b85e089f807249eacc66172e56a1a69d450fafba Mon Sep 17 00:00:00 2001
From: Lvov Maxim <usrleon@gmail.com>
Date: Mon, 30 May 2011 11:30:22 +0400
Subject: project_id moved to be last

---
 bin/nova-manage | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/nova-manage b/bin/nova-manage
index 3d09f9064..8faf072bc 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -515,12 +515,12 @@ class NetworkCommands(object):
     """Class for managing networks."""
 
     def create(self, fixed_range=None, num_networks=None,
-               network_size=None, vlan_start=None, project_id=None,
-               vpn_start=None, fixed_range_v6=None, label='public'):
+               network_size=None, vlan_start=None, vpn_start=None, 
+               fixed_range_v6=None, label='public', project_id=None):
         """Creates fixed ips for host by range
         arguments: fixed_range=FLAG, [num_networks=FLAG],
-                   [network_size=FLAG], [vlan_start=FLAG], [project_id=None],
-                   [vpn_start=FLAG], [fixed_range_v6=FLAG]"""
+                   [network_size=FLAG], [vlan_start=FLAG], [vpn_start=FLAG], 
+                   [fixed_range_v6=FLAG], [project_id=None]"""
         if not fixed_range:
             msg = _('Fixed range in the form of 10.0.0.0/8 is '
                     'required to create networks.')
-- 
cgit 


From f53e7d16181e0a7141956d835f71c09d76508c2d Mon Sep 17 00:00:00 2001
From: Lvov Maxim <usrleon@gmail.com>
Date: Thu, 9 Jun 2011 22:02:01 +0400
Subject: parse options with optparse, options prepended '--'

---
 bin/nova-manage | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/bin/nova-manage b/bin/nova-manage
index 8faf072bc..76bed16f7 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -62,6 +62,8 @@ import sys
 import time
 
 import IPy
+from inspect import getargspec
+from optparse import OptionParser
 
 # If ../nova/__init__.py exists, add ../ to Python search path, so that
 # it will override what happens to be installed in /usr/(local/)lib/python...
@@ -1133,14 +1135,18 @@ def main():
     matches = lazy_match(action, actions)
     action, fn = matches[0]
 
-    fn_args, fn_kwargs = [], {}
-    for arg in argv:
-        if '=' in arg:
-            key, value = arg.split('=')
-            fn_kwargs[key] = value
-        else:
-            fn_args.append(arg)
-
+    func_args = getargspec(fn).args
+    parser = OptionParser()
+    for arg in func_args:
+        dasharg = "--%s" % arg
+        parser.add_option(dasharg)
+    
+    (opts, fn_args) = parser.parse_args(argv)
+    fn_kwargs = vars(opts)
+    for k, v in fn_kwargs.items():
+        if v is None:
+            del fn_kwargs[k]
+            
     # call the action with the remaining arguments
     try:
         fn(*fn_args, **fn_kwargs)
-- 
cgit 


From 3f69522284833a52373ccf1e1006d9b2f20ccb06 Mon Sep 17 00:00:00 2001
From: Lvov Maxim <usrleon@gmail.com>
Date: Fri, 10 Jun 2011 17:33:54 +0400
Subject: decorators for action methods added

---
 .bzrignore      |  3 +++
 bin/nova-manage | 37 ++++++++++++++++++++++++++++---------
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/.bzrignore b/.bzrignore
index 14d8028f7..351b2bef7 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -13,3 +13,6 @@ nova/vcsversion.py
 clean.sqlite
 run_tests.log
 tests.sqlite
+nova/tests/instance-*
+tags
+
diff --git a/bin/nova-manage b/bin/nova-manage
index 76bed16f7..2903e411c 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -105,6 +105,21 @@ flags.DEFINE_flag(flags.HelpshortFlag())
 flags.DEFINE_flag(flags.HelpXMLFlag())
 
 
+# Decorators for actions
+def positionargs(*args, **kwargs):
+    def _decorator(func):
+        req = args[-1]
+        func.__dict__['arguments'] = ' '.join("%s" % i for i in args[:req])
+        func.__dict__['optargs'] =  ' '.join("%s" % i for i in args[req:-1])
+        return func
+    return _decorator
+
+def optionargs(*args, **kwargs):
+    def _decorator(func):
+        func.__dict__.setdefault('options', []).insert(0, (args, kwargs))
+        return func
+    return _decorator
+
 def param2id(object_id):
     """Helper function to convert various id types to internal id.
     args: [object_id], e.g. 'vol-0000000a' or 'volume-0000000a' or '10'
@@ -515,7 +530,11 @@ class FloatingIpCommands(object):
 
 class NetworkCommands(object):
     """Class for managing networks."""
-
+    @optionargs('--project', dest="project_id", help='Project for network')
+    @optionargs('--vlan', dest="vlan_start", help='VLAN ID')
+    @positionargs('fixed_range', 'num_networks',
+               'network_size', 'vlan_start', 'vpn_start', 
+               'fixed_range_v6', 'label', 'project_id', 1)
     def create(self, fixed_range=None, num_networks=None,
                network_size=None, vlan_start=None, vpn_start=None, 
                fixed_range_v6=None, label='public', project_id=None):
@@ -1135,25 +1154,25 @@ def main():
     matches = lazy_match(action, actions)
     action, fn = matches[0]
 
-    func_args = getargspec(fn).args
-    parser = OptionParser()
-    for arg in func_args:
-        dasharg = "--%s" % arg
-        parser.add_option(dasharg)
-    
+    usage = "%prog " + "%s %s %s [%s] [options]" % (sys.argv[2],
+                        sys.argv[3], fn.arguments, fn.optargs)
+    parser = OptionParser(usage=usage)
+    for ar, kw in fn.options:
+        parser.add_option(*ar, **kw)
     (opts, fn_args) = parser.parse_args(argv)
     fn_kwargs = vars(opts)
+
     for k, v in fn_kwargs.items():
         if v is None:
             del fn_kwargs[k]
-            
+
     # call the action with the remaining arguments
     try:
         fn(*fn_args, **fn_kwargs)
         sys.exit(0)
     except TypeError:
         print _("Possible wrong number of arguments supplied")
-        print "%s %s: %s" % (category, action, fn.__doc__)
+        print ""
         raise
     except Exception:
         print _("Command failed, please check log for more info")
-- 
cgit 


From 8de8ed78c2d3d6ca8342134234e0cc361611de54 Mon Sep 17 00:00:00 2001
From: Lvov Maxim <usrleon@gmail.com>
Date: Sat, 11 Jun 2011 00:30:30 +0400
Subject: removed posargs decorator, all methods decorated

---
 bin/nova-manage | 146 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 126 insertions(+), 20 deletions(-)

diff --git a/bin/nova-manage b/bin/nova-manage
index ce9f07f56..0b92c349a 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -61,7 +61,6 @@ import sys
 import time
 
 import IPy
-from inspect import getargspec
 from optparse import OptionParser
 
 # If ../nova/__init__.py exists, add ../ to Python search path, so that
@@ -107,15 +106,7 @@ flags.DEFINE_flag(flags.HelpXMLFlag())
 
 
 # Decorators for actions
-def positionargs(*args, **kwargs):
-    def _decorator(func):
-        req = args[-1]
-        func.__dict__['arguments'] = ' '.join("%s" % i for i in args[:req])
-        func.__dict__['optargs'] =  ' '.join("%s" % i for i in args[req:-1])
-        return func
-    return _decorator
-
-def optionargs(*args, **kwargs):
+def args(*args, **kwargs):
     def _decorator(func):
         func.__dict__.setdefault('options', []).insert(0, (args, kwargs))
         return func
@@ -138,6 +129,7 @@ class VpnCommands(object):
         self.manager = manager.AuthManager()
         self.pipe = pipelib.CloudPipe()
 
+    @args('--project', dest="project", metavar='<Project name>', help='Project name')
     def list(self, project=None):
         """Print a listing of the VPN data for one or all projects.
 
@@ -183,10 +175,12 @@ class VpnCommands(object):
                 self.pipe.launch_vpn_instance(p.id)
                 time.sleep(10)
 
+    @args('--project', dest="project_id", metavar='<Project name>', help='Project name')
     def run(self, project_id):
         """Start the VPN for a given project."""
         self.pipe.launch_vpn_instance(project_id)
 
+    @args('--project', dest="project_id", metavar='<Project name>', help='Project name')
     def change(self, project_id, ip, port):
         """Change the ip and port for a vpn.
 
@@ -222,6 +216,7 @@ class ShellCommands(object):
         Falls back to Python shell if unavailable"""
         self.run('python')
 
+    @args('--shell', dest="shell", metavar='<bpython|ipython|python >', help='Python shell')
     def run(self, shell=None):
         """Runs a Python interactive interpreter.
 
@@ -259,6 +254,7 @@ class ShellCommands(object):
                 readline.parse_and_bind("tab:complete")
             code.interact()
 
+    @args('--path', dest='path', metavar='<path>', help='Script path')
     def script(self, path):
         """Runs the script from the specifed path with flags set properly.
         arguments: path"""
@@ -271,12 +267,18 @@ class RoleCommands(object):
     def __init__(self):
         self.manager = manager.AuthManager()
 
+    @args('--user', dest="user", metavar='<user name>', help='User name')
+    @args('--role', dest="role", metavar='<user role>', help='User role')
+    @args('--project', dest="project", metavar='<Project name>', help='Project name')
     def add(self, user, role, project=None):
         """adds role to user
         if project is specified, adds project specific role
         arguments: user, role [project]"""
         self.manager.add_role(user, role, project)
 
+    @args('--user', dest="user", metavar='<user name>', help='User name')
+    @args('--role', dest="role", metavar='<user role>', help='User role')
+    @args('--project', dest="project", metavar='<Project name>', help='Project name')
     def has(self, user, role, project=None):
         """checks to see if user has role
         if project is specified, returns True if user has
@@ -284,6 +286,9 @@ class RoleCommands(object):
         arguments: user, role [project]"""
         print self.manager.has_role(user, role, project)
 
+    @args('--user', dest="user", metavar='<user name>', help='User name')
+    @args('--role', dest="role", metavar='<user role>', help='User role')
+    @args('--project', dest="project", metavar='<Project name>', help='Project name')
     def remove(self, user, role, project=None):
         """removes role from user
         if project is specified, removes project specific role
@@ -311,6 +316,9 @@ class UserCommands(object):
     def __init__(self):
         self.manager = manager.AuthManager()
 
+    @args('--name', dest="name", metavar='<admin name>', help='Admin name')
+    @args('--access', dest="access", metavar='<access>', help='Access')
+    @args('--secret', dest="secret", metavar='<secret>', help='Secret')
     def admin(self, name, access=None, secret=None):
         """creates a new admin and prints exports
         arguments: name [access] [secret]"""
@@ -320,6 +328,9 @@ class UserCommands(object):
             _db_error(e)
         self._print_export(user)
 
+    @args('--name', dest="name", metavar='<name>', help='User name')
+    @args('--access', dest="access", metavar='<access>', help='Access')
+    @args('--secret', dest="secret", metavar='<secret>', help='Secret')
     def create(self, name, access=None, secret=None):
         """creates a new user and prints exports
         arguments: name [access] [secret]"""
@@ -329,11 +340,13 @@ class UserCommands(object):
             _db_error(e)
         self._print_export(user)
 
+    @args('--name', dest="name", metavar='<name>', help='User name')
     def delete(self, name):
         """deletes an existing user
         arguments: name"""
         self.manager.delete_user(name)
 
+    @args('--name', dest="name", metavar='<admin name>', help='User name')
     def exports(self, name):
         """prints access and secrets for user in export format
         arguments: name"""
@@ -349,6 +362,10 @@ class UserCommands(object):
         for user in self.manager.get_users():
             print user.name
 
+    @args('--name', dest="name", metavar='<name>', help='User name')
+    @args('--access', dest="access_key", metavar='<access>', help='Access key')
+    @args('--secret', dest="secret_key", metavar='<secret>', help='Secret key')
+    @args('--is_admin', dest='is_admin', metavar="<'T'|'F'>", help='Is admin?')
     def modify(self, name, access_key, secret_key, is_admin):
         """update a users keys & admin flag
         arguments: accesskey secretkey admin
@@ -362,6 +379,8 @@ class UserCommands(object):
             is_admin = False
         self.manager.modify_user(name, access_key, secret_key, is_admin)
 
+    @args('--name', dest="user_id", metavar='<name>', help='User name')
+    @args('--project', dest="project_id", metavar='<Project name>', help='Project name')
     def revoke(self, user_id, project_id=None):
         """revoke certs for a user
         arguments: user_id [project_id]"""
@@ -377,6 +396,8 @@ class ProjectCommands(object):
     def __init__(self):
         self.manager = manager.AuthManager()
 
+    @args('--project', dest="project_id", metavar='<Project name>', help='Project name')
+    @args('--user', dest="user_id", metavar='<name>', help='User name')
     def add(self, project_id, user_id):
         """Adds user to project
         arguments: project_id user_id"""
@@ -386,6 +407,9 @@ class ProjectCommands(object):
             print ex
             raise
 
+    @args('--project', dest="name", metavar='<Project name>', help='Project name')
+    @args('--user', dest="project_manager", metavar='<user>', help='Project manager')
+    @args('--desc', dest="description", metavar='<description>', help='Description')
     def create(self, name, project_manager, description=None):
         """Creates a new project
         arguments: name project_manager [description]"""
@@ -395,6 +419,9 @@ class ProjectCommands(object):
             print ex
             raise
 
+    @args('--project', dest="name", metavar='<Project name>', help='Project name')
+    @args('--user', dest="project_manager", metavar='<user>', help='Project manager')
+    @args('--desc', dest="description", metavar='<description>', help='Description')
     def modify(self, name, project_manager, description=None):
         """Modifies a project
         arguments: name project_manager [description]"""
@@ -404,6 +431,7 @@ class ProjectCommands(object):
             print ex
             raise
 
+    @args('--project', dest="name", metavar='<Project name>', help='Project name')
     def delete(self, name):
         """Deletes an existing project
         arguments: name"""
@@ -413,6 +441,9 @@ class ProjectCommands(object):
             print ex
             raise
 
+    @args('--project', dest="project_id", metavar='<Project name>', help='Project name')
+    @args('--user', dest="user_id", metavar='<name>', help='User name')
+    @args('--file', dest="filename", metavar='<filename>', help='File name(Default: novarc)')
     def environment(self, project_id, user_id, filename='novarc'):
         """Exports environment variables to an sourcable file
         arguments: project_id user_id [filename='novarc]"""
@@ -424,12 +455,16 @@ class ProjectCommands(object):
         with open(filename, 'w') as f:
             f.write(rc)
 
+    @args('--user', dest="username", metavar='<username>', help='User name')
     def list(self, username=None):
         """Lists all projects
         arguments: [username]"""
         for project in self.manager.get_projects(username):
             print project.name
 
+    @args('--project', dest="project_id", metavar='<Project name>', help='Project name')
+    @args('--key', dest="key", metavar='<key>', help='Key')
+    @args('--value', dest="value", metavar='<value>', help='Value')
     def quota(self, project_id, key=None, value=None):
         """Set or display quotas for project
         arguments: project_id [key] [value]"""
@@ -447,6 +482,8 @@ class ProjectCommands(object):
                 value = 'unlimited'
             print '%s: %s' % (key, value)
 
+    @args('--project', dest="project_id", metavar='<Project name>', help='Project name')
+    @args('--user', dest="user_id", metavar='<name>', help='User name')
     def remove(self, project_id, user_id):
         """Removes user from project
         arguments: project_id user_id"""
@@ -456,6 +493,7 @@ class ProjectCommands(object):
             print ex
             raise
 
+    @args('--project', dest="project_id", metavar='<Project name>', help='Project name')
     def scrub(self, project_id):
         """Deletes data associated with project
         arguments: project_id"""
@@ -466,6 +504,9 @@ class ProjectCommands(object):
         for group in groups:
             db.security_group_destroy(ctxt, group['id'])
 
+    @args('--project', dest="project_id", metavar='<Project name>', help='Project name')
+    @args('--user', dest="user_id", metavar='<name>', help='User name')
+    @args('--file', dest="filename", metavar='<filename>', help='File name(Default: nova.zip)')
     def zipfile(self, project_id, user_id, filename='nova.zip'):
         """Exports credentials for project to a zip file
         arguments: project_id user_id [filename='nova.zip]"""
@@ -492,6 +533,7 @@ AccountCommands = ProjectCommands
 class FixedIpCommands(object):
     """Class for managing fixed ip."""
 
+    @args('--host', dest="host", metavar='<host>', help='Host')
     def list(self, host=None):
         """Lists all fixed ips (optionally by host) arguments: [host]"""
         ctxt = context.get_admin_context()
@@ -528,6 +570,8 @@ class FixedIpCommands(object):
 class FloatingIpCommands(object):
     """Class for managing floating ip."""
 
+    @args('--host', dest="host", metavar='<host>', help='Host')
+    @args('--ip_range', dest="range", metavar='<range>', help='IP range')
     def create(self, host, range):
         """Creates floating ips for host by range
         arguments: host ip_range"""
@@ -536,6 +580,7 @@ class FloatingIpCommands(object):
                                   {'address': str(address),
                                    'host': host})
 
+    @args('--ip_range', dest="ip_range", metavar='<range>', help='IP range')
     def delete(self, ip_range):
         """Deletes floating ips by range
         arguments: range"""
@@ -543,6 +588,7 @@ class FloatingIpCommands(object):
             db.floating_ip_destroy(context.get_admin_context(),
                                    str(address))
 
+    @args('--host', dest="host", metavar='<host>', help='Host')
     def list(self, host=None):
         """Lists all floating ips (optionally by host)
         arguments: [host]"""
@@ -563,11 +609,14 @@ class FloatingIpCommands(object):
 class NetworkCommands(object):
     """Class for managing networks."""
 
-    @optionargs('--project', dest="project_id", help='Project for network')
-    @optionargs('--vlan', dest="vlan_start", help='VLAN ID')
-    @positionargs('fixed_range', 'num_networks',
-               'network_size', 'vlan_start', 'vpn_start', 
-               'fixed_range_v6', 'gateway_v6', 'label', 'project_id', 1)
+    @args('--network', dest="fixed_range", metavar='<x.x.x.x/yy>', help='Network')
+    @args('--num_networks', dest="num_networks", metavar='<number>', help='How many networks create')
+    @args('--network_size', dest="network_size", metavar='<number>', help='How many hosts in network')
+    @args('--vlan', dest="vlan_start", metavar='<vlan id>', help='vlan id')
+    @args('--vpn', dest="vpn_start", help='vpn start')
+    @args('--fixed_range_v6', dest="fixed_range_v6", help='fixed ipv6 range')
+    @args('--gateway_v6', dest="gateway_v6", help='ipv6 gateway')
+    @args('--project', dest="project_id", metavar='<Project name>', help='Project for network')
     def create(self, fixed_range=None, num_networks=None, network_size=None,
             vlan_start=None, vpn_start=None, fixed_range_v6=None,
             gateway_v6=None, label='public', project_id=None):
@@ -618,6 +667,7 @@ class NetworkCommands(object):
                                 network.dhcp_start,
                                 network.dns)
 
+    @args('--network', dest="fixed_range", metavar='<x.x.x.x/yy>', help='Network to delete')
     def delete(self, fixed_range):
         """Deletes a network"""
         network = db.network_get_by_cidr(context.get_admin_context(), \
@@ -631,6 +681,7 @@ class NetworkCommands(object):
 class VmCommands(object):
     """Class for mangaging VM instances."""
 
+    @args('--host', dest="host", metavar='<host>', help='Host')
     def list(self, host=None):
         """Show a list of all instances
 
@@ -674,6 +725,8 @@ class VmCommands(object):
                 instance['availability_zone'],
                 instance['launch_index'])
 
+    @args('--ec2_id', dest='ec2_id', metavar='<ec2 id>', help='EC2 ID')
+    @args('--dest', dest='dest', metavar='<Destanation>', help='destanation node')
     def live_migration(self, ec2_id, dest):
         """Migrates a running instance to a new machine.
 
@@ -710,6 +763,8 @@ class VmCommands(object):
 class ServiceCommands(object):
     """Enable and disable running services"""
 
+    @args('--host', dest='host', metavar='<host>', help='Host')
+    @args('--service', dest='service', metavar='<service>', help='Nova service')
     def list(self, host=None, service=None):
         """Show a list of all running services. Filter by host & service name.
         args: [host] [service]"""
@@ -731,6 +786,8 @@ class ServiceCommands(object):
                                               active, art,
                                               svc['updated_at'])
 
+    @args('--host', dest='host', metavar='<host>', help='Host')
+    @args('--service', dest='service', metavar='<service>', help='Nova service')
     def enable(self, host, service):
         """Enable scheduling for a service
         args: host service"""
@@ -741,6 +798,8 @@ class ServiceCommands(object):
             return
         db.service_update(ctxt, svc['id'], {'disabled': False})
 
+    @args('--host', dest='host', metavar='<host>', help='Host')
+    @args('--service', dest='service', metavar='<service>', help='Nova service')
     def disable(self, host, service):
         """Disable scheduling for a service
         args: host service"""
@@ -751,6 +810,7 @@ class ServiceCommands(object):
             return
         db.service_update(ctxt, svc['id'], {'disabled': True})
 
+    @args('--host', dest='host', metavar='<host>', help='Host')
     def describe_resource(self, host):
         """Describes cpu/memory/hdd info for host.
 
@@ -784,6 +844,7 @@ class ServiceCommands(object):
                                                   val['memory_mb'],
                                                   val['local_gb'])
 
+    @args('--host', dest='host', metavar='<host>', help='Host')
     def update_resource(self, host):
         """Updates available vcpu/memory/disk info for host.
 
@@ -811,6 +872,7 @@ class DbCommands(object):
     def __init__(self):
         pass
 
+    @args('--version', dest='version', metavar='<version>', help='Database version')
     def sync(self, version=None):
         """Sync the database up to the most recent version."""
         return migration.db_sync(version)
@@ -834,10 +896,11 @@ class VersionCommands(object):
 class VolumeCommands(object):
     """Methods for dealing with a cloud in an odd state"""
 
+    @args('--volume', dest='volume_id', metavar='<volume id>', help='Volume ID')
     def delete(self, volume_id):
         """Delete a volume, bypassing the check that it
         must be available.
-        args: volume_id_id"""
+        args: volume_id"""
         ctxt = context.get_admin_context()
         volume = db.volume_get(ctxt, param2id(volume_id))
         host = volume['host']
@@ -858,6 +921,7 @@ class VolumeCommands(object):
                  {"method": "delete_volume",
                   "args": {"volume_id": volume['id']}})
 
+    @args('--volume', dest='volume_id', metavar='<volume id>', help='Volume ID')
     def reattach(self, volume_id):
         """Re-attach a volume that has previously been attached
         to an instance.  Typically called after a compute host
@@ -889,6 +953,14 @@ class InstanceTypeCommands(object):
             val["flavorid"], val["swap"], val["rxtx_quota"],
             val["rxtx_cap"], deleted)
 
+    @args('--name', dest='name', metavar='<name>', help='Name of instance type/flavor')
+    @args('--memory', dest='memory', metavar='<memory size>', help='Memory size')
+    @args('--cpu', dest='vcpus', metavar='<num cores>', help='Number cpus')
+    @args('--local_gb', dest='local_gb', metavar='<local_gb>', help='local_gb')
+    @args('--flavor', dest='flavorid', metavar='<flavor  id>', help='Flavor ID')
+    @args('--swap', dest='swap', metavar='<swap>', help='Swap')
+    @args('--rxtx_quota', dest='rxtx_quota', metavar='<rxtx_quota>', help='rxtx_quota')
+    @args('--rxtx_cap', dest='rxtx_cap', metavar='<rxtx_cap>', help='rxtx_cap')
     def create(self, name, memory, vcpus, local_gb, flavorid,
                swap=0, rxtx_quota=0, rxtx_cap=0):
         """Creates instance types / flavors
@@ -917,6 +989,7 @@ class InstanceTypeCommands(object):
         else:
             print "%s created" % name
 
+    @args('--name', dest='name', metavar='<name>', help='Name of instance type/flavor')
     def delete(self, name, purge=None):
         """Marks instance types / flavors as deleted
         arguments: name"""
@@ -938,6 +1011,7 @@ class InstanceTypeCommands(object):
         else:
             print "%s %s" % (name, verb)
 
+    @args('--name', dest='name', metavar='<name>', help='Name of instance type/flavor')
     def list(self, name=None):
         """Lists all active or specific instance types / flavors
         arguments: [name]"""
@@ -988,6 +1062,13 @@ class ImageCommands(object):
         except Exception as exc:
             print _("Failed to register %(path)s: %(exc)s") % locals()
 
+    @args('--image', dest='image', metavar='<image>', help='Image')
+    @args('--kernel', dest='kernel', metavar='<kernel>', help='Kernel')
+    @args('--ram', dest='ramdisk', metavar='<ramdisk>', help='RAM disk')
+    @args('--owner', dest='owner', metavar='<owner>', help='Image owner')
+    @args('--name', dest='name', metavar='<name>', help='Image name')
+    @args('--public', dest='is_public', metavar="<'T'|'F'>", help='Image public or not')
+    @args('--arch', dest='architecture', metavar='<arch>', help='Architecture')
     def all_register(self, image, kernel, ramdisk, owner, name=None,
                  is_public='T', architecture='x86_64'):
         """Uploads an image, kernel, and ramdisk into the image_service
@@ -1001,6 +1082,15 @@ class ImageCommands(object):
                             architecture, 'ami', 'ami',
                             kernel_id, ramdisk_id)
 
+    @args('--path', dest='path', metavar='<path>', help='Image path')
+    @args('--owner', dest='owner', metavar='<owner>', help='Image owner')
+    @args('--name', dest='name', metavar='<name>', help='Image name')
+    @args('--public', dest='is_public', metavar="<'T'|'F'>", help='Image public or not')
+    @args('--arch', dest='architecture', metavar='<arch>', help='Architecture')
+    @args('--cont_format', dest='container_format', metavar='<container format>', help='Container format(default: bare)')
+    @args('--disk_format', dest='disk_format', metavar='<disk format>', help='Disk format(default: raw)')
+    @args('--kernel', dest='kernel_id', metavar='<kernel>', help='Kernel')
+    @args('--ram', dest='ramdisk_id', metavar='<ramdisk>', help='RAM disk')
     def image_register(self, path, owner, name=None, is_public='T',
                        architecture='x86_64', container_format='bare',
                        disk_format='raw', kernel_id=None, ramdisk_id=None):
@@ -1013,6 +1103,11 @@ class ImageCommands(object):
                               owner, name, is_public, architecture,
                               kernel_id, ramdisk_id)
 
+    @args('--path', dest='path', metavar='<path>', help='Image path')
+    @args('--owner', dest='owner', metavar='<owner>', help='Image owner')
+    @args('--name', dest='name', metavar='<name>', help='Image name')
+    @args('--public', dest='is_public', metavar="<'T'|'F'>", help='Image public or not')
+    @args('--arch', dest='architecture', metavar='<arch>', help='Architecture')
     def kernel_register(self, path, owner, name=None, is_public='T',
                architecture='x86_64'):
         """Uploads a kernel into the image_service
@@ -1021,6 +1116,11 @@ class ImageCommands(object):
         return self._register('aki', 'aki', path, owner, name,
                               is_public, architecture)
 
+    @args('--path', dest='path', metavar='<path>', help='Image path')
+    @args('--owner', dest='owner', metavar='<owner>', help='Image owner')
+    @args('--name', dest='name', metavar='<name>', help='Image name')
+    @args('--public', dest='is_public', metavar="<'T'|'F'>", help='Image public or not')
+    @args('--arch', dest='architecture', metavar='<arch>', help='Architecture')
     def ramdisk_register(self, path, owner, name=None, is_public='T',
                 architecture='x86_64'):
         """Uploads a ramdisk into the image_service
@@ -1074,6 +1174,7 @@ class ImageCommands(object):
             except Exception as exc:
                 print _("Failed to convert %(old)s: %(exc)s") % locals()
 
+    @args('--dir', dest='directory', metavar='<path>', help='Images directory')
     def convert(self, directory):
         """Uploads old objectstore images in directory to new service
         arguments: directory"""
@@ -1199,10 +1300,14 @@ def main():
     matches = lazy_match(action, actions)
     action, fn = matches[0]
 
-    usage = "%prog " + "%s %s %s [%s] [options]" % (sys.argv[2],
-                        sys.argv[3], fn.arguments, fn.optargs)
+    # For not decorated methods
+    arguments = getattr(fn ,'arguments', '')
+    optargs = getattr(fn ,'optargs', '')
+    options = getattr(fn ,'options', '')
+
+    usage = "%prog " + "%s %s <args> [options]" % (sys.argv[2], sys.argv[3])
     parser = OptionParser(usage=usage)
-    for ar, kw in fn.options:
+    for ar, kw in options:
         parser.add_option(*ar, **kw)
     (opts, fn_args) = parser.parse_args(argv)
     fn_kwargs = vars(opts)
@@ -1217,7 +1322,8 @@ def main():
         sys.exit(0)
     except TypeError:
         print _("Possible wrong number of arguments supplied")
-        print ""
+        print fn.__doc__
+        parser.print_help()
         raise
     except Exception:
         print _("Command failed, please check log for more info")
-- 
cgit 


From 8ded8e4bde3825efc8a886aad40d54d0c9d126dc Mon Sep 17 00:00:00 2001
From: Lvov Maxim <usrleon@gmail.com>
Date: Sat, 11 Jun 2011 00:42:44 +0400
Subject: small pep8 fixes

---
 bin/nova-manage         | 6 +++---
 nova/network/manager.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/nova-manage b/bin/nova-manage
index 0b92c349a..23ebe3c93 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -1301,9 +1301,9 @@ def main():
     action, fn = matches[0]
 
     # For not decorated methods
-    arguments = getattr(fn ,'arguments', '')
-    optargs = getattr(fn ,'optargs', '')
-    options = getattr(fn ,'options', '')
+    arguments = getattr(fn, 'arguments', '')
+    optargs = getattr(fn, 'optargs', '')
+    options = getattr(fn, 'options', '')
 
     usage = "%prog " + "%s %s <args> [options]" % (sys.argv[2], sys.argv[3])
     parser = OptionParser(usage=usage)
diff --git a/nova/network/manager.py b/nova/network/manager.py
index ad93114fe..a7f5aac60 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -571,7 +571,7 @@ class VlanManager(NetworkManager):
             net['dhcp_start'] = str(project_net[3])
             net['vlan'] = vlan
             net['bridge'] = 'br%s' % vlan
-            if kwargs.has_key('project_id'):
+            if 'project_id' in kwargs:
                 net['project_id'] = kwargs['project_id']
             if(FLAGS.use_ipv6):
                 cidr_v6 = '%s/%s' % (fixed_net_v6[start_v6],
-- 
cgit 


From 3a83aaf4f14ac25dee8b5a84779a61ca4633012a Mon Sep 17 00:00:00 2001
From: Lvov Maxim <usrleon@gmail.com>
Date: Sat, 11 Jun 2011 00:49:03 +0400
Subject: 'network list' prints project id

---
 bin/nova-manage | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/bin/nova-manage b/bin/nova-manage
index 23ebe3c93..67cf0bd51 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -657,15 +657,17 @@ class NetworkCommands(object):
 
     def list(self):
         """List all created networks"""
-        print "%-18s\t%-15s\t%-15s\t%-15s" % (_('network'),
+        print "%-18s\t%-15s\t%-15s\t%-15s\t%-15s" % (_('network'),
                                               _('netmask'),
                                               _('start address'),
-                                              'DNS')
+                                              'DNS',
+                                              'project')
         for network in db.network_get_all(context.get_admin_context()):
-            print "%-18s\t%-15s\t%-15s\t%-15s" % (network.cidr,
+            print "%-18s\t%-15s\t%-15s\t%-15s\t%-15s" % (network.cidr,
                                 network.netmask,
                                 network.dhcp_start,
-                                network.dns)
+                                network.dns,
+                                network.project_id)
 
     @args('--network', dest="fixed_range", metavar='<x.x.x.x/yy>', help='Network to delete')
     def delete(self, fixed_range):
-- 
cgit 


From ff195162d97f4a1ffaa6127f92cca102705b023b Mon Sep 17 00:00:00 2001
From: Lvov Maxim <usrleon@gmail.com>
Date: Tue, 28 Jun 2011 16:46:50 +0400
Subject: remove network to project bind

---
 bin/nova-manage         | 5 ++---
 nova/network/manager.py | 2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/bin/nova-manage b/bin/nova-manage
index 67cf0bd51..a4b221b8c 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -619,7 +619,7 @@ class NetworkCommands(object):
     @args('--project', dest="project_id", metavar='<Project name>', help='Project for network')
     def create(self, fixed_range=None, num_networks=None, network_size=None,
             vlan_start=None, vpn_start=None, fixed_range_v6=None,
-            gateway_v6=None, label='public', project_id=None):
+            gateway_v6=None, label='public'):
         """Creates fixed ips for host by range"""
 
         if not fixed_range:
@@ -649,8 +649,7 @@ class NetworkCommands(object):
                                         vpn_start=int(vpn_start),
                                         cidr_v6=fixed_range_v6,
                                         gateway_v6=gateway_v6,
-                                        label=label,
-                                        project_id=project_id)
+                                        label=label)
         except ValueError, e:
             print e
             raise e
diff --git a/nova/network/manager.py b/nova/network/manager.py
index a7f5aac60..b5352ca0f 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -571,8 +571,6 @@ class VlanManager(NetworkManager):
             net['dhcp_start'] = str(project_net[3])
             net['vlan'] = vlan
             net['bridge'] = 'br%s' % vlan
-            if 'project_id' in kwargs:
-                net['project_id'] = kwargs['project_id']
             if(FLAGS.use_ipv6):
                 cidr_v6 = '%s/%s' % (fixed_net_v6[start_v6],
                                      significant_bits_v6)
-- 
cgit 


From f568d9345d19064c0024523195b17eb9e7d036ef Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Thu, 7 Jul 2011 01:03:00 +0900
Subject: Added a L2 network driver for bridge/vlan creation

---
 Authors                    |  1 +
 nova/network/l2_drivers.py | 56 ++++++++++++++++++++++++++++++++++++++++++++++
 nova/network/manager.py    | 32 ++++++++++++++++----------
 3 files changed, 77 insertions(+), 12 deletions(-)
 create mode 100644 nova/network/l2_drivers.py

diff --git a/Authors b/Authors
index c3a65f1b4..e0119d63e 100644
--- a/Authors
+++ b/Authors
@@ -77,6 +77,7 @@ Rick Harris <rconradharris@gmail.com>
 Rob Kost <kost@isi.edu>
 Ryan Lane <rlane@wikimedia.org>
 Ryan Lucio <rlucio@internap.com>
+Ryu Ishimoto <ryu@midokura.jp>
 Salvatore Orlando <salvatore.orlando@eu.citrix.com>
 Sandy Walsh <sandy.walsh@rackspace.com>
 Sateesh Chodapuneedi <sateesh.chodapuneedi@citrix.com>
diff --git a/nova/network/l2_drivers.py b/nova/network/l2_drivers.py
new file mode 100644
index 000000000..1e66dcd26
--- /dev/null
+++ b/nova/network/l2_drivers.py
@@ -0,0 +1,56 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright (C) 2011 Midokura KK
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""Drivers responsible for managing L2 connectivity for Nova."""
+
+from nova.network import linux_net
+
+class L2Driver(object):
+    """Base class that defines interfaces for L2 drivers."""
+
+    def ensure_bridge(bridge, interface, net_attrs=None):
+        """Create a bridge unless it already exists."""
+        raise NotImplementedError()
+
+    def ensure_vlan(vlan_num, bridge_interface):
+        """Create a vlan unless it already exists."""
+        raise NotImplementedError()
+
+
+class LinuxBridgeDriver(L2Driver):
+    """L2 driver based on Linux Bridge."""
+    
+    def ensure_bridge(bridge, interface, net_attrs=None):
+        """Create a Linux bridge unless it already eixsts."""
+        linux_net.ensure_bridge(bridge, interface, net_attrs)
+
+    def ensure_vlan(vlan_num, bridge_interface):
+        """Create a vlan unless it already exists."""
+        return linux_net.ensure_vlan(vlan_num, bridge_interface)
+
+
+class QuantumDriver(L2Driver):
+    """L2 driver based on Quantum network service."""
+
+    def ensure_bridge(bridge, interface, net_attrs=None):
+        """Do nothing."""
+        pass
+
+    def ensure_vlan(vlan_num, bridge_interface):
+        """Return None."""
+        return None
+    
diff --git a/nova/network/manager.py b/nova/network/manager.py
index d42bc8c4e..3d6388259 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -111,6 +111,8 @@ flags.DEFINE_string('network_host', socket.gethostname(),
                     'Network host to use for ip allocation in flat modes')
 flags.DEFINE_bool('fake_call', False,
                   'If True, skip using the queue and make local calls')
+flags.DEFINE_string('l2_driver', 'nova.network.l2_drivers.LinuxBridgeDriver',
+                    'L2 network connectivity driver.')
 
 
 class AddressAlreadyAllocated(exception.Error):
@@ -294,6 +296,7 @@ class NetworkManager(manager.SchedulerDependentManager):
         if not network_driver:
             network_driver = FLAGS.network_driver
         self.driver = utils.import_object(network_driver)
+        self.l2_driver = utils.import_object(FLAGS.l2_driver)
         self.network_api = network_api.API()
         super(NetworkManager, self).__init__(service_name='network',
                                                 *args, **kwargs)
@@ -738,8 +741,8 @@ class FlatDHCPManager(FloatingIP, RPCAllocateFixedIP, NetworkManager):
         """
         networks = db.network_get_all_by_instance(context, instance_id)
         for network in networks:
-            self.driver.ensure_bridge(network['bridge'],
-                                      network['bridge_interface'])
+            self.l2_driver.ensure_bridge(network['bridge'],
+                                         network['bridge_interface'])
 
     def allocate_fixed_ip(self, context, instance_id, network):
         """Allocate flat_network fixed_ip, then setup dhcp for this network."""
@@ -755,9 +758,9 @@ class FlatDHCPManager(FloatingIP, RPCAllocateFixedIP, NetworkManager):
         net['dhcp_start'] = FLAGS.flat_network_dhcp_start
         self.db.network_update(context, network_id, net)
         network = db.network_get(context, network_id)
-        self.driver.ensure_bridge(network['bridge'],
-                                  network['bridge_interface'],
-                                  network)
+        self.l2_driver.ensure_bridge(network['bridge'],
+                                     network['bridge_interface'],
+                                     network)
         if not FLAGS.fake_network:
             self.driver.update_dhcp(context, network_id)
             if(FLAGS.use_ipv6):
@@ -822,9 +825,11 @@ class VlanManager(RPCAllocateFixedIP, FloatingIP, NetworkManager):
         """
         networks = self.db.network_get_all_by_instance(context, instance_id)
         for network in networks:
-            self.driver.ensure_vlan_bridge(network['vlan'],
-                                           network['bridge'],
-                                           network['bridge_interface'])
+            interface = self.l2_driver.ensure_vlan(network['vlan'],
+                                                   network['bridge_interface'])
+            if interface:
+                self.l2_driver.ensure_bridge(network['bridge'], interface,
+                                             network['bridge_interface'])
 
     def _get_networks_for_instance(self, context, instance_id, project_id):
         """Determine which networks an instance should connect to."""
@@ -861,10 +866,13 @@ class VlanManager(RPCAllocateFixedIP, FloatingIP, NetworkManager):
             db.network_update(context, network_id, net)
         else:
             address = network['vpn_public_address']
-        self.driver.ensure_vlan_bridge(network['vlan'],
-                                       network['bridge'],
-                                       network['bridge_interface'],
-                                       network)
+
+        interface = self.l2_driver.ensure_vlan(network['vlan'],
+                                               network['bridge_interface'])
+        if interface:
+            self.l2_driver.ensure_bridge(network['bridge'], interface,
+                                         network['bridge_interface'],
+                                         network)
 
         # NOTE(vish): only ensure this forward if the address hasn't been set
         #             manually.
-- 
cgit 


From 2b553a89b34d7a3691c0952c5debda6b5ea1bb79 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Thu, 7 Jul 2011 01:04:56 +0900
Subject: Added net_attrs argument for ensure_bridge/vlan methods

---
 nova/network/l2_drivers.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nova/network/l2_drivers.py b/nova/network/l2_drivers.py
index 1e66dcd26..e1de5cc5b 100644
--- a/nova/network/l2_drivers.py
+++ b/nova/network/l2_drivers.py
@@ -26,7 +26,7 @@ class L2Driver(object):
         """Create a bridge unless it already exists."""
         raise NotImplementedError()
 
-    def ensure_vlan(vlan_num, bridge_interface):
+    def ensure_vlan(vlan_num, bridge_interface, net_attrs=None):
         """Create a vlan unless it already exists."""
         raise NotImplementedError()
 
@@ -38,9 +38,9 @@ class LinuxBridgeDriver(L2Driver):
         """Create a Linux bridge unless it already eixsts."""
         linux_net.ensure_bridge(bridge, interface, net_attrs)
 
-    def ensure_vlan(vlan_num, bridge_interface):
+    def ensure_vlan(vlan_num, bridge_interface, net_attrs=None):
         """Create a vlan unless it already exists."""
-        return linux_net.ensure_vlan(vlan_num, bridge_interface)
+        return linux_net.ensure_vlan(vlan_num, bridge_interface, net_attrs)
 
 
 class QuantumDriver(L2Driver):
@@ -50,7 +50,7 @@ class QuantumDriver(L2Driver):
         """Do nothing."""
         pass
 
-    def ensure_vlan(vlan_num, bridge_interface):
+    def ensure_vlan(vlan_num, bridge_interface, net_attrs=None):
         """Return None."""
         return None
     
-- 
cgit 


From 23a5775d6dbd5f11ff0adb67dd6b5bceb96b8030 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Thu, 7 Jul 2011 02:12:03 +0900
Subject: Added the missing 'self' parameter

---
 nova/network/l2_drivers.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nova/network/l2_drivers.py b/nova/network/l2_drivers.py
index e1de5cc5b..23d05cda4 100644
--- a/nova/network/l2_drivers.py
+++ b/nova/network/l2_drivers.py
@@ -22,11 +22,11 @@ from nova.network import linux_net
 class L2Driver(object):
     """Base class that defines interfaces for L2 drivers."""
 
-    def ensure_bridge(bridge, interface, net_attrs=None):
+    def ensure_bridge(self, bridge, interface, net_attrs=None):
         """Create a bridge unless it already exists."""
         raise NotImplementedError()
 
-    def ensure_vlan(vlan_num, bridge_interface, net_attrs=None):
+    def ensure_vlan(self, vlan_num, bridge_interface, net_attrs=None):
         """Create a vlan unless it already exists."""
         raise NotImplementedError()
 
@@ -34,11 +34,11 @@ class L2Driver(object):
 class LinuxBridgeDriver(L2Driver):
     """L2 driver based on Linux Bridge."""
     
-    def ensure_bridge(bridge, interface, net_attrs=None):
+    def ensure_bridge(self, bridge, interface, net_attrs=None):
         """Create a Linux bridge unless it already eixsts."""
         linux_net.ensure_bridge(bridge, interface, net_attrs)
 
-    def ensure_vlan(vlan_num, bridge_interface, net_attrs=None):
+    def ensure_vlan(self, vlan_num, bridge_interface, net_attrs=None):
         """Create a vlan unless it already exists."""
         return linux_net.ensure_vlan(vlan_num, bridge_interface, net_attrs)
 
@@ -46,11 +46,11 @@ class LinuxBridgeDriver(L2Driver):
 class QuantumDriver(L2Driver):
     """L2 driver based on Quantum network service."""
 
-    def ensure_bridge(bridge, interface, net_attrs=None):
+    def ensure_bridge(self, bridge, interface, net_attrs=None):
         """Do nothing."""
         pass
 
-    def ensure_vlan(vlan_num, bridge_interface, net_attrs=None):
+    def ensure_vlan(self, vlan_num, bridge_interface, net_attrs=None):
         """Return None."""
         return None
     
-- 
cgit 


From a05b0325a76dea16a2d5f7d1931a5cbc922e0364 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Thu, 7 Jul 2011 02:13:18 +0900
Subject: Added VIF driver concept

---
 nova/virt/libvirt.xml.template   | 18 ++++++++++
 nova/virt/libvirt/connection.py  | 48 +++++--------------------
 nova/virt/libvirt/vif_drivers.py | 76 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 103 insertions(+), 39 deletions(-)
 create mode 100644 nova/virt/libvirt/vif_drivers.py

diff --git a/nova/virt/libvirt.xml.template b/nova/virt/libvirt.xml.template
index e1a683da8..ea27e5fd7 100644
--- a/nova/virt/libvirt.xml.template
+++ b/nova/virt/libvirt.xml.template
@@ -92,6 +92,22 @@
 #end if
 
 #for $nic in $nics
+    #if $vif_type='ethernet'
+        <interface type='ethernet'>
+            <target dev='${nic.name}' />
+            <mac address='${nic.mac_address}' />
+            <script path='${nic.script}' />
+        </interface>
+    #else if $vif_type='802.1Qbh'
+        <interface type='direct'>
+             <mac address=${nic.mac_address}/>
+             <source dev=${nic.device_name} mode='private'/>
+             <virtualport type='802.1Qbh'>
+                 <parameters profileid=${nic.profile_name}/>
+             </virtualport>
+             <model type='virtio'/>
+        </interface>
+    #else
         <interface type='bridge'>
             <source bridge='${nic.bridge_name}'/>
             <mac address='${nic.mac_address}'/>
@@ -107,6 +123,8 @@
 #end if
             </filterref>
         </interface>
+    #end if
+
 #end for
         <!-- The order is significant here.  File must be defined first -->
         <serial type="file">
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 0c6eaab84..224ad89a6 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -1,4 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
+o# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
@@ -96,9 +96,6 @@ flags.DEFINE_string('libvirt_uri',
                     '',
                     'Override the default libvirt URI (which is dependent'
                     ' on libvirt_type)')
-flags.DEFINE_bool('allow_project_net_traffic',
-                  True,
-                  'Whether to allow in project network traffic')
 flags.DEFINE_bool('use_cow_images',
                   True,
                   'Whether to use cow images')
@@ -123,6 +120,11 @@ flags.DEFINE_string('qemu_img', 'qemu-img',
                     'binary to use for qemu-img commands')
 flags.DEFINE_bool('start_guests_on_host_boot', False,
                   'Whether to restart guests when the host reboots')
+flags.DEFINE_string('libvirt_vif_type', 'bridge',
+                    'Type of VIF to create.')
+flags.DEFINE_string('libvirt_vif_driver',
+                    'nova.virt.libvirt.vif_drivers.BridgeDriver',
+                    'The VIF driver to configure the VIFs.')
 
 
 def get_connection(read_only):
@@ -165,6 +167,7 @@ class LibvirtConnection(driver.ComputeDriver):
 
         fw_class = utils.import_class(FLAGS.firewall_driver)
         self.firewall_driver = fw_class(get_connection=self._get_connection)
+        self.vif_driver = utils.import_object(FLAGS.libvirt_vif_driver)
 
     def init_host(self, host):
         # Adopt existing VM's running here
@@ -926,40 +929,6 @@ class LibvirtConnection(driver.ComputeDriver):
         if FLAGS.libvirt_type == 'uml':
             utils.execute('sudo', 'chown', 'root', basepath('disk'))
 
-    def _get_nic_for_xml(self, network, mapping):
-        # Assume that the gateway also acts as the dhcp server.
-        dhcp_server = mapping['gateway']
-        gateway6 = mapping.get('gateway6')
-        mac_id = mapping['mac'].replace(':', '')
-
-        if FLAGS.allow_project_net_traffic:
-            template = "<parameter name=\"%s\"value=\"%s\" />\n"
-            net, mask = netutils.get_net_and_mask(network['cidr'])
-            values = [("PROJNET", net), ("PROJMASK", mask)]
-            if FLAGS.use_ipv6:
-                net_v6, prefixlen_v6 = netutils.get_net_and_prefixlen(
-                                           network['cidr_v6'])
-                values.extend([("PROJNETV6", net_v6),
-                               ("PROJMASKV6", prefixlen_v6)])
-
-            extra_params = "".join([template % value for value in values])
-        else:
-            extra_params = "\n"
-
-        result = {
-            'id': mac_id,
-            'bridge_name': network['bridge'],
-            'mac_address': mapping['mac'],
-            'ip_address': mapping['ips'][0]['ip'],
-            'dhcp_server': dhcp_server,
-            'extra_params': extra_params,
-        }
-
-        if gateway6:
-            result['gateway6'] = gateway6 + "/128"
-
-        return result
-
     root_mount_device = 'vda'  # FIXME for now. it's hard coded.
     local_mount_device = 'vdb'  # FIXME for now. it's hard coded.
 
@@ -981,7 +950,7 @@ class LibvirtConnection(driver.ComputeDriver):
 
         nics = []
         for (network, mapping) in network_info:
-            nics.append(self._get_nic_for_xml(network, mapping))
+            nics.append(self.vif_driver(instance, network, mapping))
         # FIXME(vish): stick this in db
         inst_type_id = instance['instance_type_id']
         inst_type = instance_types.get_instance_type(inst_type_id)
@@ -1010,6 +979,7 @@ class LibvirtConnection(driver.ComputeDriver):
                     'rescue': rescue,
                     'local': local_gb,
                     'driver_type': driver_type,
+                    'vif_type': FLAGS.libvirt_vif_type,
                     'nics': nics,
                     'ebs_root': ebs_root,
                     'volumes': block_device_mapping}
diff --git a/nova/virt/libvirt/vif_drivers.py b/nova/virt/libvirt/vif_drivers.py
new file mode 100644
index 000000000..9ef218a21
--- /dev/null
+++ b/nova/virt/libvirt/vif_drivers.py
@@ -0,0 +1,76 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright (C) 2011 Midokura KK
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
+# Copyright (c) 2010 Citrix Systems, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""Drivers responsible for VIF creation in libvirt."""
+
+from nova import flags
+from nova.virt.libvirt import netutils
+
+FLAGS = flags.FLAGS
+flags.DEFINE_bool('allow_project_net_traffic',
+                  True,
+                  'Whether to allow in project network traffic')
+
+
+class VIFDriver(object):
+    """Base class that defines generic interfaces for VIF drivers."""
+
+    def get_configuration(self, instance, network, mapping):
+        """Get a dictionary of VIF configuration for libvirt interfaces."""
+        raise NotImplementedError()
+
+
+class BridgeDriver(VIFDriver):
+    """Class that generates VIF configuration of bridge interface type."""
+
+    def get_configuration(self, instance, network, mapping):
+        """Get a dictionary of VIF configurations for bridge type."""
+        # Assume that the gateway also acts as the dhcp server.
+        dhcp_server = mapping['gateway']
+        gateway6 = mapping.get('gateway6')
+        mac_id = mapping['mac'].replace(':', '')
+
+        if FLAGS.allow_project_net_traffic:
+            template = "<parameter name=\"%s\"value=\"%s\" />\n"
+            net, mask = netutils.get_net_and_mask(network['cidr'])
+            values = [("PROJNET", net), ("PROJMASK", mask)]
+            if FLAGS.use_ipv6:
+                net_v6, prefixlen_v6 = netutils.get_net_and_prefixlen(
+                                           network['cidr_v6'])
+                values.extend([("PROJNETV6", net_v6),
+                               ("PROJMASKV6", prefixlen_v6)])
+
+            extra_params = "".join([template % value for value in values])
+        else:
+            extra_params = "\n"
+
+        result = {
+            'id': mac_id,
+            'bridge_name': network['bridge'],
+            'mac_address': mapping['mac'],
+            'ip_address': mapping['ips'][0]['ip'],
+            'dhcp_server': dhcp_server,
+            'extra_params': extra_params,
+        }
+
+        if gateway6:
+            result['gateway6'] = gateway6 + "/128"
+
+        return result
+        
-- 
cgit 


From e71cf10dcf88f4a2f695285b25af75d8a0df2b3e Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Thu, 7 Jul 2011 03:16:28 +0900
Subject: Removed a typo error in libvirt connection.py

---
 nova/virt/libvirt/connection.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 224ad89a6..606bc18bc 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -1,4 +1,4 @@
-o# vim: tabstop=4 shiftwidth=4 softtabstop=4
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
-- 
cgit 


From 1da51f7b07f0080c44063a355c84fafd1fdf02bc Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Mon, 11 Jul 2011 04:38:27 +0900
Subject: Moved 'setup_compute_network' logic into the virt layer

---
 nova/compute/manager.py          | 11 ++---
 nova/network/l2_drivers.py       | 56 -----------------------
 nova/network/linux_net.py        |  1 +
 nova/network/manager.py          | 56 +++--------------------
 nova/virt/libvirt/connection.py  | 13 ++++--
 nova/virt/libvirt/vif.py         | 99 ++++++++++++++++++++++++++++++++++++++++
 nova/virt/libvirt/vif_drivers.py | 76 ------------------------------
 nova/virt/vif.py                 | 29 ++++++++++++
 8 files changed, 150 insertions(+), 191 deletions(-)
 delete mode 100644 nova/network/l2_drivers.py
 create mode 100644 nova/virt/libvirt/vif.py
 delete mode 100644 nova/virt/libvirt/vif_drivers.py
 create mode 100644 nova/virt/vif.py

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index bbbddde0a..753240614 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -293,8 +293,7 @@ class ComputeManager(manager.SchedulerDependentManager):
                 network_info = self.network_api.allocate_for_instance(context,
                                                          instance, vpn=is_vpn)
                 LOG.debug(_("instance network_info: |%s|"), network_info)
-                self.network_manager.setup_compute_network(context,
-                                                           instance_id)
+                self.driver.setup_vif_network(context, instance, network_info)
             else:
                 # TODO(tr3buchet) not really sure how this should be handled.
                 # virt requires network_info to be passed in but stub_network
@@ -444,7 +443,6 @@ class ComputeManager(manager.SchedulerDependentManager):
                                    instance_id,
                                    power_state.NOSTATE,
                                    'rebooting')
-        self.network_manager.setup_compute_network(context, instance_id)
         self.driver.reboot(instance_ref)
         self._update_state(context, instance_id)
 
@@ -635,7 +633,7 @@ class ComputeManager(manager.SchedulerDependentManager):
                                    instance_id,
                                    power_state.NOSTATE,
                                    'rescuing')
-        self.network_manager.setup_compute_network(context, instance_id)
+        self.driver.setup_vif_network(context, instance_id)
         _update_state = lambda result: self._update_state_callback(
                 self, context, instance_id, result)
         self.driver.rescue(instance_ref, _update_state)
@@ -1176,14 +1174,13 @@ class ComputeManager(manager.SchedulerDependentManager):
         max_retry = FLAGS.live_migration_retry_count
         for cnt in range(max_retry):
             try:
-                self.network_manager.setup_compute_network(context,
-                                                           instance_id)
+                self.driver.setup_vif_network(context, instance_id)
                 break
             except exception.ProcessExecutionError:
                 if cnt == max_retry - 1:
                     raise
                 else:
-                    LOG.warn(_("setup_compute_network() failed %(cnt)d."
+                    LOG.warn(_("setup_vif_network() failed %(cnt)d."
                                "Retry up to %(max_retry)d for %(hostname)s.")
                                % locals())
                     time.sleep(1)
diff --git a/nova/network/l2_drivers.py b/nova/network/l2_drivers.py
deleted file mode 100644
index 23d05cda4..000000000
--- a/nova/network/l2_drivers.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (C) 2011 Midokura KK
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-"""Drivers responsible for managing L2 connectivity for Nova."""
-
-from nova.network import linux_net
-
-class L2Driver(object):
-    """Base class that defines interfaces for L2 drivers."""
-
-    def ensure_bridge(self, bridge, interface, net_attrs=None):
-        """Create a bridge unless it already exists."""
-        raise NotImplementedError()
-
-    def ensure_vlan(self, vlan_num, bridge_interface, net_attrs=None):
-        """Create a vlan unless it already exists."""
-        raise NotImplementedError()
-
-
-class LinuxBridgeDriver(L2Driver):
-    """L2 driver based on Linux Bridge."""
-    
-    def ensure_bridge(self, bridge, interface, net_attrs=None):
-        """Create a Linux bridge unless it already eixsts."""
-        linux_net.ensure_bridge(bridge, interface, net_attrs)
-
-    def ensure_vlan(self, vlan_num, bridge_interface, net_attrs=None):
-        """Create a vlan unless it already exists."""
-        return linux_net.ensure_vlan(vlan_num, bridge_interface, net_attrs)
-
-
-class QuantumDriver(L2Driver):
-    """L2 driver based on Quantum network service."""
-
-    def ensure_bridge(self, bridge, interface, net_attrs=None):
-        """Do nothing."""
-        pass
-
-    def ensure_vlan(self, vlan_num, bridge_interface, net_attrs=None):
-        """Return None."""
-        return None
-    
diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py
index 283a5aca1..4e39a57c4 100644
--- a/nova/network/linux_net.py
+++ b/nova/network/linux_net.py
@@ -455,6 +455,7 @@ def ensure_vlan_bridge(vlan_num, bridge, bridge_interface, net_attrs=None):
     """Create a vlan and bridge unless they already exist."""
     interface = ensure_vlan(vlan_num, bridge_interface)
     ensure_bridge(bridge, interface, net_attrs)
+    return interface
 
 
 @utils.synchronized('ensure_vlan', external=True)
diff --git a/nova/network/manager.py b/nova/network/manager.py
index 3d6388259..0689759d7 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -111,8 +111,6 @@ flags.DEFINE_string('network_host', socket.gethostname(),
                     'Network host to use for ip allocation in flat modes')
 flags.DEFINE_bool('fake_call', False,
                   'If True, skip using the queue and make local calls')
-flags.DEFINE_string('l2_driver', 'nova.network.l2_drivers.LinuxBridgeDriver',
-                    'L2 network connectivity driver.')
 
 
 class AddressAlreadyAllocated(exception.Error):
@@ -296,7 +294,6 @@ class NetworkManager(manager.SchedulerDependentManager):
         if not network_driver:
             network_driver = FLAGS.network_driver
         self.driver = utils.import_object(network_driver)
-        self.l2_driver = utils.import_object(FLAGS.l2_driver)
         self.network_api = network_api.API()
         super(NetworkManager, self).__init__(service_name='network',
                                                 *args, **kwargs)
@@ -648,14 +645,6 @@ class NetworkManager(manager.SchedulerDependentManager):
         """Called when this host becomes the host for a network."""
         raise NotImplementedError()
 
-    def setup_compute_network(self, context, instance_id):
-        """Sets up matching network for compute hosts.
-
-        this code is run on and by the compute host, not on network
-        hosts
-        """
-        raise NotImplementedError()
-
 
 class FlatManager(NetworkManager):
     """Basic network where no vlans are used.
@@ -698,13 +687,6 @@ class FlatManager(NetworkManager):
                                                               **kwargs)
         self.db.fixed_ip_disassociate(context, address)
 
-    def setup_compute_network(self, context, instance_id):
-        """Network is created manually.
-
-        this code is run on and by the compute host, not on network hosts
-        """
-        pass
-
     def _on_set_network_host(self, context, network_id):
         """Called when this host becomes the host for a network."""
         net = {}
@@ -734,16 +716,6 @@ class FlatDHCPManager(FloatingIP, RPCAllocateFixedIP, NetworkManager):
 
         self.driver.metadata_forward()
 
-    def setup_compute_network(self, context, instance_id):
-        """Sets up matching networks for compute hosts.
-
-        this code is run on and by the compute host, not on network hosts
-        """
-        networks = db.network_get_all_by_instance(context, instance_id)
-        for network in networks:
-            self.l2_driver.ensure_bridge(network['bridge'],
-                                         network['bridge_interface'])
-
     def allocate_fixed_ip(self, context, instance_id, network):
         """Allocate flat_network fixed_ip, then setup dhcp for this network."""
         address = super(FlatDHCPManager, self).allocate_fixed_ip(context,
@@ -758,9 +730,9 @@ class FlatDHCPManager(FloatingIP, RPCAllocateFixedIP, NetworkManager):
         net['dhcp_start'] = FLAGS.flat_network_dhcp_start
         self.db.network_update(context, network_id, net)
         network = db.network_get(context, network_id)
-        self.l2_driver.ensure_bridge(network['bridge'],
-                                     network['bridge_interface'],
-                                     network)
+        self.driver.ensure_bridge(network['bridge'],
+                                  network['bridge_interface'],
+                                  network)
         if not FLAGS.fake_network:
             self.driver.update_dhcp(context, network_id)
             if(FLAGS.use_ipv6):
@@ -819,18 +791,6 @@ class VlanManager(RPCAllocateFixedIP, FloatingIP, NetworkManager):
         """Force adds another network to a project."""
         self.db.network_associate(context, project_id, force=True)
 
-    def setup_compute_network(self, context, instance_id):
-        """Sets up matching network for compute hosts.
-        this code is run on and by the compute host, not on network hosts
-        """
-        networks = self.db.network_get_all_by_instance(context, instance_id)
-        for network in networks:
-            interface = self.l2_driver.ensure_vlan(network['vlan'],
-                                                   network['bridge_interface'])
-            if interface:
-                self.l2_driver.ensure_bridge(network['bridge'], interface,
-                                             network['bridge_interface'])
-
     def _get_networks_for_instance(self, context, instance_id, project_id):
         """Determine which networks an instance should connect to."""
         # get networks associated with project
@@ -867,12 +827,10 @@ class VlanManager(RPCAllocateFixedIP, FloatingIP, NetworkManager):
         else:
             address = network['vpn_public_address']
 
-        interface = self.l2_driver.ensure_vlan(network['vlan'],
-                                               network['bridge_interface'])
-        if interface:
-            self.l2_driver.ensure_bridge(network['bridge'], interface,
-                                         network['bridge_interface'],
-                                         network)
+        self.driver.ensure_vlan_bridge(network['vlan'],
+                                       network['bridge'],
+                                       network['bridge_interface'],
+                                       network)
 
         # NOTE(vish): only ensure this forward if the address hasn't been set
         #             manually.
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 606bc18bc..15ad85176 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -123,8 +123,8 @@ flags.DEFINE_bool('start_guests_on_host_boot', False,
 flags.DEFINE_string('libvirt_vif_type', 'bridge',
                     'Type of VIF to create.')
 flags.DEFINE_string('libvirt_vif_driver',
-                    'nova.virt.libvirt.vif_drivers.BridgeDriver',
-                    'The VIF driver to configure the VIFs.')
+                    'nova.virt.libvirt.vif.LibvirtVlanBridgeDriver',
+                    'The libvirt VIF driver to configure the VIFs.')
 
 
 def get_connection(read_only):
@@ -259,6 +259,12 @@ class LibvirtConnection(driver.ComputeDriver):
             infos.append(info)
         return infos
 
+    def setup_vif_network(self, ctxt, instance_id):
+        """Set up VIF networking on the host."""
+        networks = db.network_get_all_by_instance(ctxt, instance_id)
+        for network in networks:
+            self.vif_driver.plug(network)
+
     def destroy(self, instance, cleanup=True):
         instance_name = instance['name']
 
@@ -950,7 +956,8 @@ class LibvirtConnection(driver.ComputeDriver):
 
         nics = []
         for (network, mapping) in network_info:
-            nics.append(self.vif_driver(instance, network, mapping))
+            nics.append(self.vif_driver.get_configurations(instance, network,
+                                                           mapping))
         # FIXME(vish): stick this in db
         inst_type_id = instance['instance_type_id']
         inst_type = instance_types.get_instance_type(inst_type_id)
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
new file mode 100644
index 000000000..50c2d444c
--- /dev/null
+++ b/nova/virt/libvirt/vif.py
@@ -0,0 +1,99 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright (C) 2011 Midokura KK
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""VIF drivers for libvirt."""
+
+from nova import flags
+from nova.network import linux_net
+from nova.virt.libvirt import netutils
+from nova.virt.vif import VIFDriver
+
+FLAGS = flags.FLAGS
+flags.DEFINE_bool('allow_project_net_traffic',
+                  True,
+                  'Whether to allow in project network traffic')
+
+
+class LibvirtVIF(object):
+    """VIF class for libvirt"""
+
+    def get_configurations(self, instance, network, mapping):
+        """Get a dictionary of VIF configuration for libvirt interfaces."""
+        raise NotImplementedError()
+
+
+class LibvirtBridge(LibvirtVIF):
+    """Linux bridge VIF for Libvirt."""
+
+    def get_configurations(self, instance, network, mapping):
+        """Get a dictionary of VIF configurations for bridge type."""
+        # Assume that the gateway also acts as the dhcp server.
+        dhcp_server = mapping['gateway']
+        gateway6 = mapping.get('gateway6')
+        mac_id = mapping['mac'].replace(':', '')
+
+        if FLAGS.allow_project_net_traffic:
+            template = "<parameter name=\"%s\"value=\"%s\" />\n"
+            net, mask = netutils.get_net_and_mask(network['cidr'])
+            values = [("PROJNET", net), ("PROJMASK", mask)]
+            if FLAGS.use_ipv6:
+                net_v6, prefixlen_v6 = netutils.get_net_and_prefixlen(
+                                           network['cidr_v6'])
+                values.extend([("PROJNETV6", net_v6),
+                               ("PROJMASKV6", prefixlen_v6)])
+
+            extra_params = "".join([template % value for value in values])
+        else:
+            extra_params = "\n"
+
+        result = {
+            'id': mac_id,
+            'bridge_name': network['bridge'],
+            'mac_address': mapping['mac'],
+            'ip_address': mapping['ips'][0]['ip'],
+            'dhcp_server': dhcp_server,
+            'extra_params': extra_params,
+        }
+
+        if gateway6:
+            result['gateway6'] = gateway6 + "/128"
+
+        return result
+
+    
+class LibvirtBridgeDriver(VIFDriver, LibvirtBridge):
+    """VIF driver for Linux bridge."""
+
+    def plug(self, network):
+        """Ensure that the bridge exists, and add VIF to it."""
+        linux_net.ensure_bridge(network['bridge'],
+                                network['bridge_interface'])
+
+    def unplug(self, network):
+        pass
+
+
+class LibvirtVlanBridgeDriver(VIFDriver, LibvirtBridge):
+    """VIF driver for Linux bridge with VLAN."""
+
+    def plug(self, network):
+        """Ensure that VLAN and bridge exist and add VIF to the bridge."""
+        linux_net.ensure_vlan_bridge(network['vlan'], network['bridge'],
+                                     network['bridge_interface'])
+
+    def unplug(self, network):
+        pass
diff --git a/nova/virt/libvirt/vif_drivers.py b/nova/virt/libvirt/vif_drivers.py
deleted file mode 100644
index 9ef218a21..000000000
--- a/nova/virt/libvirt/vif_drivers.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (C) 2011 Midokura KK
-# Administrator of the National Aeronautics and Space Administration.
-# All Rights Reserved.
-# Copyright (c) 2010 Citrix Systems, Inc.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-"""Drivers responsible for VIF creation in libvirt."""
-
-from nova import flags
-from nova.virt.libvirt import netutils
-
-FLAGS = flags.FLAGS
-flags.DEFINE_bool('allow_project_net_traffic',
-                  True,
-                  'Whether to allow in project network traffic')
-
-
-class VIFDriver(object):
-    """Base class that defines generic interfaces for VIF drivers."""
-
-    def get_configuration(self, instance, network, mapping):
-        """Get a dictionary of VIF configuration for libvirt interfaces."""
-        raise NotImplementedError()
-
-
-class BridgeDriver(VIFDriver):
-    """Class that generates VIF configuration of bridge interface type."""
-
-    def get_configuration(self, instance, network, mapping):
-        """Get a dictionary of VIF configurations for bridge type."""
-        # Assume that the gateway also acts as the dhcp server.
-        dhcp_server = mapping['gateway']
-        gateway6 = mapping.get('gateway6')
-        mac_id = mapping['mac'].replace(':', '')
-
-        if FLAGS.allow_project_net_traffic:
-            template = "<parameter name=\"%s\"value=\"%s\" />\n"
-            net, mask = netutils.get_net_and_mask(network['cidr'])
-            values = [("PROJNET", net), ("PROJMASK", mask)]
-            if FLAGS.use_ipv6:
-                net_v6, prefixlen_v6 = netutils.get_net_and_prefixlen(
-                                           network['cidr_v6'])
-                values.extend([("PROJNETV6", net_v6),
-                               ("PROJMASKV6", prefixlen_v6)])
-
-            extra_params = "".join([template % value for value in values])
-        else:
-            extra_params = "\n"
-
-        result = {
-            'id': mac_id,
-            'bridge_name': network['bridge'],
-            'mac_address': mapping['mac'],
-            'ip_address': mapping['ips'][0]['ip'],
-            'dhcp_server': dhcp_server,
-            'extra_params': extra_params,
-        }
-
-        if gateway6:
-            result['gateway6'] = gateway6 + "/128"
-
-        return result
-        
diff --git a/nova/virt/vif.py b/nova/virt/vif.py
new file mode 100644
index 000000000..1ff41ed7e
--- /dev/null
+++ b/nova/virt/vif.py
@@ -0,0 +1,29 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright (C) 2011 Midokura KK
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""VIF module common to all virt layers."""
+
+class VIFDriver(object):
+    """Abstract class that defines generic interfaces for all VIF drivers."""
+
+    def plug(self, network):
+        """Plug VIF into network."""
+        raise NotImplementedError()
+
+    def unplug(self, network):
+        """Unplug VIF from network."""
+        raise NotImplementedError()
-- 
cgit 


From dea12df6165c3417efb0a3959462b9080be1bbca Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Mon, 11 Jul 2011 05:21:06 +0900
Subject: Added vif OS API extension to get started on it

---
 nova/api/openstack/contrib/vifs.py | 86 ++++++++++++++++++++++++++++++++++++++
 nova/network/api.py                |  4 ++
 2 files changed, 90 insertions(+)
 create mode 100644 nova/api/openstack/contrib/vifs.py

diff --git a/nova/api/openstack/contrib/vifs.py b/nova/api/openstack/contrib/vifs.py
new file mode 100644
index 000000000..5c8492aa3
--- /dev/null
+++ b/nova/api/openstack/contrib/vifs.py
@@ -0,0 +1,86 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright (C) 2011 Midokura KK
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License
+from webob import exc
+
+from nova import exception
+from nova import network
+from nova.api.openstack import extensions
+
+
+def _translate_vif_view(vif):
+    result = {'id': vif['id'],
+              'mac': vif['address'],
+              'network_id': vif['network_id']}
+    return {'vif': result}
+
+
+def _translate_vifs_view(vifs):
+    return {'vifs': [_translate_vif_view(vif) for vif in vifs]}
+
+
+class ServerVIFController(object):
+    """The controller for VIFs attached to servers.
+
+    A child resource of the server.
+    """
+
+    _serialization_metadata = {
+        'application/xml': {
+            "attributes": {
+                "vif": [
+                    "id",
+                    "mac",
+                    "network_id",
+                    ]}}}
+
+    def __init__(self):
+        self.network_api = network.API()
+        super(ServerVIFController, self).__init__()
+
+    def index(self, req, server_id):
+        """Return data about the vifs of the server."""
+        context = req.environ['nova.context']
+
+        vifs = self.network_api.get_vifs_by_instance(context, server_id)
+
+        return _translate_vifs_view(vifs)
+
+
+
+class VIFs(extensions.ExtensionDescriptor):
+    def get_name(self):
+        return "VIFs"
+
+    def get_alias(self):
+        return "os-vifs"
+
+    def get_description(self):
+        return "VIF support"
+
+    def get_namespace(self):
+        return "http://docs.openstack.org/ext/vifs/api/v1.1"
+
+    def get_updated(self):
+        return "2011-07-11T00:00:00+00:00"
+
+    def get_resources(self):
+        resources = []
+
+        res = extensions.ResourceExtension('os-server_vifs',
+                         ServerVIFController())
+        resources.append(res)
+
+        return resources
diff --git a/nova/network/api.py b/nova/network/api.py
index b2b96082b..e1bd0f845 100644
--- a/nova/network/api.py
+++ b/nova/network/api.py
@@ -46,6 +46,10 @@ class API(base.Base):
                                                      context.project_id)
         return ips
 
+    def get_vifs_by_instance(self, context, instance_id):
+        vifs = self.db.virtual_interface_get_by_instance(context, instance_id)
+        return vifs
+
     def allocate_floating_ip(self, context):
         """Adds a floating ip to a project."""
         # NOTE(vish): We don't know which network host should get the ip
-- 
cgit 


From 8a9c8bdc0cf6a79ed37090e595d2290fc900537c Mon Sep 17 00:00:00 2001
From: Lvov Maxim <usrleon@gmail.com>
Date: Fri, 15 Jul 2011 08:27:16 +0400
Subject: fix redundency

---
 bin/nova-manage | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bin/nova-manage b/bin/nova-manage
index 7b78a0b5c..a845ab7a9 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -1389,8 +1389,6 @@ def main():
     action, fn = matches[0]
 
     # For not decorated methods
-    arguments = getattr(fn, 'arguments', '')
-    optargs = getattr(fn, 'optargs', '')
     options = getattr(fn, 'options', '')
 
     usage = "%prog " + "%s %s <args> [options]" % (sys.argv[2], sys.argv[3])
-- 
cgit 


From 2d645197eb21a783de57cf10366db58fd41866fe Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yorik.sar@gmail.com>
Date: Fri, 15 Jul 2011 10:39:23 +0400
Subject: Add possibility to call commands without subcommands.

---
 bin/nova-manage | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/bin/nova-manage b/bin/nova-manage
index a845ab7a9..da285042f 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -925,6 +925,9 @@ class VersionCommands(object):
         print _("%s (%s)") %\
                 (version.version_string(), version.version_string_with_vcs())
 
+    def __call__(self):
+        self.list()
+
 
 class VolumeCommands(object):
     """Methods for dealing with a cloud in an odd state"""
@@ -1379,14 +1382,19 @@ def main():
     command_object = fn()
     actions = methods_of(command_object)
     if len(argv) < 1:
-        print script_name + " category action [<args>]"
-        print _("Available actions for %s category:") % category
-        for k, _v in actions:
-            print "\t%s" % k
-        sys.exit(2)
-    action = argv.pop(0)
-    matches = lazy_match(action, actions)
-    action, fn = matches[0]
+        if hasattr(command_object, '__call__'):
+            action = '__call__'
+            fn = command_object.__call__
+        else:
+            print script_name + " category action [<args>]"
+            print _("Available actions for %s category:") % category
+            for k, _v in actions:
+                print "\t%s" % k
+            sys.exit(2)
+    else:
+        action = argv.pop(0)
+        matches = lazy_match(action, actions)
+        action, fn = matches[0]
 
     # For not decorated methods
     options = getattr(fn, 'options', '')
-- 
cgit 


From bfb4a870e44a90c004cd7d568eb35a50221c7bd5 Mon Sep 17 00:00:00 2001
From: Lvov Maxim <usrleon@gmail.com>
Date: Fri, 15 Jul 2011 11:13:21 +0400
Subject: remove argument help from docstrings + minor fix

---
 bin/nova-manage | 163 +++++++++++++++++---------------------------------------
 1 file changed, 48 insertions(+), 115 deletions(-)

diff --git a/bin/nova-manage b/bin/nova-manage
index da285042f..f5c140fa9 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -131,9 +131,8 @@ class VpnCommands(object):
 
     @args('--project', dest="project", metavar='<Project name>', help='Project name')
     def list(self, project=None):
-        """Print a listing of the VPN data for one or all projects.
+        """Print a listing of the VPN data for one or all projects."""
 
-        args: [project=all]"""
         print "%-12s\t" % 'project',
         print "%-20s\t" % 'ip:port',
         print "%-20s\t" % 'private_ip',
@@ -181,13 +180,15 @@ class VpnCommands(object):
         self.pipe.launch_vpn_instance(project_id)
 
     @args('--project', dest="project_id", metavar='<Project name>', help='Project name')
+    @args('--ip', dest="ip", metavar='<IP Address>', help='IP Address')
+    @args('--port', dest="port", metavar='<Port>', help='Port')
     def change(self, project_id, ip, port):
         """Change the ip and port for a vpn.
 
         this will update all networks associated with a project
         not sure if that's the desired behavior or not, patches accepted
 
-        args: project, ip, port"""
+        """
         # TODO(tr3buchet): perhaps this shouldn't update all networks
         # associated with a project in the future
         project = self.manager.get_project(project_id)
@@ -224,9 +225,7 @@ class ShellCommands(object):
 
     @args('--shell', dest="shell", metavar='<bpython|ipython|python >', help='Python shell')
     def run(self, shell=None):
-        """Runs a Python interactive interpreter.
-
-        args: [shell=bpython]"""
+        """Runs a Python interactive interpreter."""
         if not shell:
             shell = 'bpython'
 
@@ -278,8 +277,7 @@ class RoleCommands(object):
     @args('--project', dest="project", metavar='<Project name>', help='Project name')
     def add(self, user, role, project=None):
         """adds role to user
-        if project is specified, adds project specific role
-        arguments: user, role [project]"""
+        if project is specified, adds project specific role"""
         if project:
             projobj = self.manager.get_project(project)
             if not projobj.has_member(user):
@@ -293,8 +291,7 @@ class RoleCommands(object):
     def has(self, user, role, project=None):
         """checks to see if user has role
         if project is specified, returns True if user has
-        the global role and the project role
-        arguments: user, role [project]"""
+        the global role and the project role"""
         print self.manager.has_role(user, role, project)
 
     @args('--user', dest="user", metavar='<user name>', help='User name')
@@ -302,8 +299,7 @@ class RoleCommands(object):
     @args('--project', dest="project", metavar='<Project name>', help='Project name')
     def remove(self, user, role, project=None):
         """removes role from user
-        if project is specified, removes project specific role
-        arguments: user, role [project]"""
+        if project is specified, removes project specific role"""
         self.manager.remove_role(user, role, project)
 
 
@@ -331,8 +327,7 @@ class UserCommands(object):
     @args('--access', dest="access", metavar='<access>', help='Access')
     @args('--secret', dest="secret", metavar='<secret>', help='Secret')
     def admin(self, name, access=None, secret=None):
-        """creates a new admin and prints exports
-        arguments: name [access] [secret]"""
+        """creates a new admin and prints exports"""
         try:
             user = self.manager.create_user(name, access, secret, True)
         except exception.DBError, e:
@@ -343,8 +338,7 @@ class UserCommands(object):
     @args('--access', dest="access", metavar='<access>', help='Access')
     @args('--secret', dest="secret", metavar='<secret>', help='Secret')
     def create(self, name, access=None, secret=None):
-        """creates a new user and prints exports
-        arguments: name [access] [secret]"""
+        """creates a new user and prints exports"""
         try:
             user = self.manager.create_user(name, access, secret, False)
         except exception.DBError, e:
@@ -359,8 +353,7 @@ class UserCommands(object):
 
     @args('--name', dest="name", metavar='<admin name>', help='User name')
     def exports(self, name):
-        """prints access and secrets for user in export format
-        arguments: name"""
+        """prints access and secrets for user in export format"""
         user = self.manager.get_user(name)
         if user:
             self._print_export(user)
@@ -368,8 +361,7 @@ class UserCommands(object):
             print "User %s doesn't exist" % name
 
     def list(self):
-        """lists all users
-        arguments: <none>"""
+        """lists all users"""
         for user in self.manager.get_users():
             print user.name
 
@@ -393,8 +385,7 @@ class UserCommands(object):
     @args('--name', dest="user_id", metavar='<name>', help='User name')
     @args('--project', dest="project_id", metavar='<Project name>', help='Project name')
     def revoke(self, user_id, project_id=None):
-        """revoke certs for a user
-        arguments: user_id [project_id]"""
+        """revoke certs for a user"""
         if project_id:
             crypto.revoke_certs_by_user_and_project(user_id, project_id)
         else:
@@ -410,8 +401,7 @@ class ProjectCommands(object):
     @args('--project', dest="project_id", metavar='<Project name>', help='Project name')
     @args('--user', dest="user_id", metavar='<name>', help='User name')
     def add(self, project_id, user_id):
-        """Adds user to project
-        arguments: project_id user_id"""
+        """Adds user to project"""
         try:
             self.manager.add_to_project(user_id, project_id)
         except exception.UserNotFound as ex:
@@ -422,8 +412,7 @@ class ProjectCommands(object):
     @args('--user', dest="project_manager", metavar='<user>', help='Project manager')
     @args('--desc', dest="description", metavar='<description>', help='Description')
     def create(self, name, project_manager, description=None):
-        """Creates a new project
-        arguments: name project_manager [description]"""
+        """Creates a new project"""
         try:
             self.manager.create_project(name, project_manager, description)
         except exception.UserNotFound as ex:
@@ -434,8 +423,7 @@ class ProjectCommands(object):
     @args('--user', dest="project_manager", metavar='<user>', help='Project manager')
     @args('--desc', dest="description", metavar='<description>', help='Description')
     def modify(self, name, project_manager, description=None):
-        """Modifies a project
-        arguments: name project_manager [description]"""
+        """Modifies a project"""
         try:
             self.manager.modify_project(name, project_manager, description)
         except exception.UserNotFound as ex:
@@ -444,8 +432,7 @@ class ProjectCommands(object):
 
     @args('--project', dest="name", metavar='<Project name>', help='Project name')
     def delete(self, name):
-        """Deletes an existing project
-        arguments: name"""
+        """Deletes an existing project"""
         try:
             self.manager.delete_project(name)
         except exception.ProjectNotFound as ex:
@@ -456,8 +443,7 @@ class ProjectCommands(object):
     @args('--user', dest="user_id", metavar='<name>', help='User name')
     @args('--file', dest="filename", metavar='<filename>', help='File name(Default: novarc)')
     def environment(self, project_id, user_id, filename='novarc'):
-        """Exports environment variables to an sourcable file
-        arguments: project_id user_id [filename='novarc]"""
+        """Exports environment variables to an sourcable file"""
         try:
             rc = self.manager.get_environment_rc(user_id, project_id)
         except (exception.UserNotFound, exception.ProjectNotFound) as ex:
@@ -468,8 +454,7 @@ class ProjectCommands(object):
 
     @args('--user', dest="username", metavar='<username>', help='User name')
     def list(self, username=None):
-        """Lists all projects
-        arguments: [username]"""
+        """Lists all projects"""
         for project in self.manager.get_projects(username):
             print project.name
 
@@ -477,8 +462,7 @@ class ProjectCommands(object):
     @args('--key', dest="key", metavar='<key>', help='Key')
     @args('--value', dest="value", metavar='<value>', help='Value')
     def quota(self, project_id, key=None, value=None):
-        """Set or display quotas for project
-        arguments: project_id [key] [value]"""
+        """Set or display quotas for project"""
         ctxt = context.get_admin_context()
         if key:
             if value.lower() == 'unlimited':
@@ -496,8 +480,7 @@ class ProjectCommands(object):
     @args('--project', dest="project_id", metavar='<Project name>', help='Project name')
     @args('--user', dest="user_id", metavar='<name>', help='User name')
     def remove(self, project_id, user_id):
-        """Removes user from project
-        arguments: project_id user_id"""
+        """Removes user from project"""
         try:
             self.manager.remove_from_project(user_id, project_id)
         except (exception.UserNotFound, exception.ProjectNotFound) as ex:
@@ -506,8 +489,7 @@ class ProjectCommands(object):
 
     @args('--project', dest="project_id", metavar='<Project name>', help='Project name')
     def scrub(self, project_id):
-        """Deletes data associated with project
-        arguments: project_id"""
+        """Deletes data associated with project"""
         admin_context = context.get_admin_context()
         networks = db.project_get_networks(admin_context, project_id)
         for network in networks:
@@ -520,8 +502,7 @@ class ProjectCommands(object):
     @args('--user', dest="user_id", metavar='<name>', help='User name')
     @args('--file', dest="filename", metavar='<filename>', help='File name(Default: nova.zip)')
     def zipfile(self, project_id, user_id, filename='nova.zip'):
-        """Exports credentials for project to a zip file
-        arguments: project_id user_id [filename='nova.zip]"""
+        """Exports credentials for project to a zip file"""
         try:
             zip_file = self.manager.get_credentials(user_id, project_id)
             with open(filename, 'w') as f:
@@ -547,7 +528,7 @@ class FixedIpCommands(object):
 
     @args('--host', dest="host", metavar='<host>', help='Host')
     def list(self, host=None):
-        """Lists all fixed ips (optionally by host) arguments: [host]"""
+        """Lists all fixed ips (optionally by host)"""
         ctxt = context.get_admin_context()
 
         try:
@@ -584,16 +565,14 @@ class FloatingIpCommands(object):
 
     @args('--ip_range', dest="range", metavar='<range>', help='IP range')
     def create(self, range):
-        """Creates floating ips for zone by range
-        arguments: ip_range"""
+        """Creates floating ips for zone by range"""
         for address in netaddr.IPNetwork(range):
             db.floating_ip_create(context.get_admin_context(),
                                   {'address': str(address)})
 
     @args('--ip_range', dest="ip_range", metavar='<range>', help='IP range')
     def delete(self, ip_range):
-        """Deletes floating ips by range
-        arguments: range"""
+        """Deletes floating ips by range"""
         for address in netaddr.IPNetwork(ip_range):
             db.floating_ip_destroy(context.get_admin_context(),
                                    str(address))
@@ -601,7 +580,6 @@ class FloatingIpCommands(object):
     @args('--host', dest="host", metavar='<host>', help='Host')
     def list(self, host=None):
         """Lists all floating ips (optionally by host)
-        arguments: [host]
         Note: if host is given, only active floating IPs are returned"""
         ctxt = context.get_admin_context()
         if host is None:
@@ -635,10 +613,6 @@ class NetworkCommands(object):
                vpn_start=None, fixed_range_v6=None, gateway_v6=None,
                flat_network_bridge=None, bridge_interface=None):
         """Creates fixed ips for host by range
-        arguments: label, fixed_range, [num_networks=FLAG],
-                   [network_size=FLAG], [vlan_start=FLAG],
-                   [vpn_start=FLAG], [fixed_range_v6=FLAG], [gateway_v6=FLAG],
-                   [flat_network_bridge=FLAG], [bridge_interface=FLAG]
         If you wish to use a later argument fill in the gaps with 0s
         Ex: network create private 10.0.0.0/8 1 15 0 0 0 0 xenbr1 eth1
             network create private 10.0.0.0/8 1 15
@@ -716,11 +690,8 @@ class VmCommands(object):
 
     @args('--host', dest="host", metavar='<host>', help='Host')
     def list(self, host=None):
-        """Show a list of all instances
+        """Show a list of all instances"""
 
-        :param host: show all instance on specified host.
-        :param instance: show specificed instance.
-        """
         print "%-10s %-15s %-10s %-10s %-26s %-9s %-9s %-9s" \
               "  %-10s %-10s %-10s %-5s" % (
             _('instance'),
@@ -761,12 +732,7 @@ class VmCommands(object):
     @args('--ec2_id', dest='ec2_id', metavar='<ec2 id>', help='EC2 ID')
     @args('--dest', dest='dest', metavar='<Destanation>', help='destanation node')
     def live_migration(self, ec2_id, dest):
-        """Migrates a running instance to a new machine.
-
-        :param ec2_id: instance id which comes from euca-describe-instance.
-        :param dest: destination host name.
-
-        """
+        """Migrates a running instance to a new machine."""
 
         ctxt = context.get_admin_context()
         instance_id = ec2utils.ec2_id_to_id(ec2_id)
@@ -799,8 +765,7 @@ class ServiceCommands(object):
     @args('--host', dest='host', metavar='<host>', help='Host')
     @args('--service', dest='service', metavar='<service>', help='Nova service')
     def list(self, host=None, service=None):
-        """Show a list of all running services. Filter by host & service name.
-        args: [host] [service]"""
+        """Show a list of all running services. Filter by host & service name."""
         ctxt = context.get_admin_context()
         now = utils.utcnow()
         services = db.service_get_all(ctxt)
@@ -822,8 +787,7 @@ class ServiceCommands(object):
     @args('--host', dest='host', metavar='<host>', help='Host')
     @args('--service', dest='service', metavar='<service>', help='Nova service')
     def enable(self, host, service):
-        """Enable scheduling for a service
-        args: host service"""
+        """Enable scheduling for a service"""
         ctxt = context.get_admin_context()
         svc = db.service_get_by_args(ctxt, host, service)
         if not svc:
@@ -834,8 +798,7 @@ class ServiceCommands(object):
     @args('--host', dest='host', metavar='<host>', help='Host')
     @args('--service', dest='service', metavar='<service>', help='Nova service')
     def disable(self, host, service):
-        """Disable scheduling for a service
-        args: host service"""
+        """Disable scheduling for a service"""
         ctxt = context.get_admin_context()
         svc = db.service_get_by_args(ctxt, host, service)
         if not svc:
@@ -845,11 +808,7 @@ class ServiceCommands(object):
 
     @args('--host', dest='host', metavar='<host>', help='Host')
     def describe_resource(self, host):
-        """Describes cpu/memory/hdd info for host.
-
-        :param host: hostname.
-
-        """
+        """Describes cpu/memory/hdd info for host."""
 
         result = rpc.call(context.get_admin_context(),
                      FLAGS.scheduler_topic,
@@ -879,11 +838,7 @@ class ServiceCommands(object):
 
     @args('--host', dest='host', metavar='<host>', help='Host')
     def update_resource(self, host):
-        """Updates available vcpu/memory/disk info for host.
-
-        :param host: hostname.
-
-        """
+        """Updates available vcpu/memory/disk info for host."""
 
         ctxt = context.get_admin_context()
         service_refs = db.service_get_all_by_host(ctxt, host)
@@ -935,8 +890,7 @@ class VolumeCommands(object):
     @args('--volume', dest='volume_id', metavar='<volume id>', help='Volume ID')
     def delete(self, volume_id):
         """Delete a volume, bypassing the check that it
-        must be available.
-        args: volume_id"""
+        must be available."""
         ctxt = context.get_admin_context()
         volume = db.volume_get(ctxt, param2id(volume_id))
         host = volume['host']
@@ -961,8 +915,7 @@ class VolumeCommands(object):
     def reattach(self, volume_id):
         """Re-attach a volume that has previously been attached
         to an instance.  Typically called after a compute host
-        has been rebooted.
-        args: volume_id_id"""
+        has been rebooted."""
         ctxt = context.get_admin_context()
         volume = db.volume_get(ctxt, param2id(volume_id))
         if not volume['instance_id']:
@@ -999,10 +952,7 @@ class InstanceTypeCommands(object):
     @args('--rxtx_cap', dest='rxtx_cap', metavar='<rxtx_cap>', help='rxtx_cap')
     def create(self, name, memory, vcpus, local_gb, flavorid,
                swap=0, rxtx_quota=0, rxtx_cap=0):
-        """Creates instance types / flavors
-           arguments: name memory vcpus local_gb flavorid [swap] [rxtx_quota]
-                      [rxtx_cap]
-        """
+        """Creates instance types / flavors"""
         try:
             instance_types.create(name, memory, vcpus, local_gb,
                                   flavorid, swap, rxtx_quota, rxtx_cap)
@@ -1027,8 +977,7 @@ class InstanceTypeCommands(object):
 
     @args('--name', dest='name', metavar='<name>', help='Name of instance type/flavor')
     def delete(self, name, purge=None):
-        """Marks instance types / flavors as deleted
-        arguments: name"""
+        """Marks instance types / flavors as deleted"""
         try:
             if purge == "--purge":
                 instance_types.purge(name)
@@ -1049,8 +998,7 @@ class InstanceTypeCommands(object):
 
     @args('--name', dest='name', metavar='<name>', help='Name of instance type/flavor')
     def list(self, name=None):
-        """Lists all active or specific instance types / flavors
-        arguments: [name]"""
+        """Lists all active or specific instance types / flavors"""
         try:
             if name is None:
                 inst_types = instance_types.get_all_types()
@@ -1107,9 +1055,7 @@ class ImageCommands(object):
     @args('--arch', dest='architecture', metavar='<arch>', help='Architecture')
     def all_register(self, image, kernel, ramdisk, owner, name=None,
                  is_public='T', architecture='x86_64'):
-        """Uploads an image, kernel, and ramdisk into the image_service
-        arguments: image kernel ramdisk owner [name] [is_public='T']
-                   [architecture='x86_64']"""
+        """Uploads an image, kernel, and ramdisk into the image_service"""
         kernel_id = self.kernel_register(kernel, owner, None,
                                    is_public, architecture)
         ramdisk_id = self.ramdisk_register(ramdisk, owner, None,
@@ -1130,11 +1076,7 @@ class ImageCommands(object):
     def image_register(self, path, owner, name=None, is_public='T',
                        architecture='x86_64', container_format='bare',
                        disk_format='raw', kernel_id=None, ramdisk_id=None):
-        """Uploads an image into the image_service
-        arguments: path owner [name] [is_public='T'] [architecture='x86_64']
-                   [container_format='bare'] [disk_format='raw']
-                   [kernel_id=None] [ramdisk_id=None]
-        """
+        """Uploads an image into the image_service"""
         return self._register(container_format, disk_format, path,
                               owner, name, is_public, architecture,
                               kernel_id, ramdisk_id)
@@ -1146,9 +1088,7 @@ class ImageCommands(object):
     @args('--arch', dest='architecture', metavar='<arch>', help='Architecture')
     def kernel_register(self, path, owner, name=None, is_public='T',
                architecture='x86_64'):
-        """Uploads a kernel into the image_service
-        arguments: path owner [name] [is_public='T'] [architecture='x86_64']
-        """
+        """Uploads a kernel into the image_service"""
         return self._register('aki', 'aki', path, owner, name,
                               is_public, architecture)
 
@@ -1159,9 +1099,7 @@ class ImageCommands(object):
     @args('--arch', dest='architecture', metavar='<arch>', help='Architecture')
     def ramdisk_register(self, path, owner, name=None, is_public='T',
                 architecture='x86_64'):
-        """Uploads a ramdisk into the image_service
-        arguments: path owner [name] [is_public='T'] [architecture='x86_64']
-        """
+        """Uploads a ramdisk into the image_service"""
         return self._register('ari', 'ari', path, owner, name,
                               is_public, architecture)
 
@@ -1212,8 +1150,7 @@ class ImageCommands(object):
 
     @args('--dir', dest='directory', metavar='<path>', help='Images directory')
     def convert(self, directory):
-        """Uploads old objectstore images in directory to new service
-        arguments: directory"""
+        """Uploads old objectstore images in directory to new service"""
         machine_images = {}
         other_images = {}
         directory = os.path.abspath(directory)
@@ -1238,8 +1175,7 @@ class AgentBuildCommands(object):
 
     def create(self, os, architecture, version, url, md5hash,
                 hypervisor='xen'):
-        """Creates a new agent build.
-        arguments: os architecture version url md5hash [hypervisor='xen']"""
+        """Creates a new agent build."""
         ctxt = context.get_admin_context()
         agent_build = db.agent_build_create(ctxt,
                                             {'hypervisor': hypervisor,
@@ -1250,8 +1186,7 @@ class AgentBuildCommands(object):
                                              'md5hash': md5hash})
 
     def delete(self, os, architecture, hypervisor='xen'):
-        """Deletes an existing agent build.
-        arguments: os architecture [hypervisor='xen']"""
+        """Deletes an existing agent build."""
         ctxt = context.get_admin_context()
         agent_build_ref = db.agent_build_get_by_triple(ctxt,
                                   hypervisor, os, architecture)
@@ -1285,9 +1220,7 @@ class AgentBuildCommands(object):
 
     def modify(self, os, architecture, version, url, md5hash,
                hypervisor='xen'):
-        """Update an existing agent build.
-        arguments: os architecture version url md5hash [hypervisor='xen']
-        """
+        """Update an existing agent build."""
         ctxt = context.get_admin_context()
         agent_build_ref = db.agent_build_get_by_triple(ctxt,
                                   hypervisor, os, architecture)
@@ -1397,9 +1330,9 @@ def main():
         action, fn = matches[0]
 
     # For not decorated methods
-    options = getattr(fn, 'options', '')
+    options = getattr(fn, 'options', [])
 
-    usage = "%prog " + "%s %s <args> [options]" % (sys.argv[2], sys.argv[3])
+    usage = "%%prog %s %s <args> [options]" % (sys.argv[2], sys.argv[3])
     parser = OptionParser(usage=usage)
     for ar, kw in options:
         parser.add_option(*ar, **kw)
-- 
cgit 


From 7e4a23c489946eb5e6a1568d197cab34367d8078 Mon Sep 17 00:00:00 2001
From: Dan Wendlandt <dan@nicira.com>
Date: Tue, 19 Jul 2011 00:26:58 -0700
Subject: merge of ovs L2 branch

---
 nova/compute/manager.py         | 20 +++++++++++++++-----
 nova/network/manager.py         |  2 ++
 nova/virt/libvirt.xml.template  |  4 ++--
 nova/virt/libvirt/connection.py | 23 ++++++++++++++++++-----
 nova/virt/libvirt/vif.py        | 41 ++++++++++++++++++++++++++++++++++++++---
 nova/virt/xenapi_conn.py        |  2 +-
 6 files changed, 76 insertions(+), 16 deletions(-)

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 753240614..863e6bc18 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -293,7 +293,7 @@ class ComputeManager(manager.SchedulerDependentManager):
                 network_info = self.network_api.allocate_for_instance(context,
                                                          instance, vpn=is_vpn)
                 LOG.debug(_("instance network_info: |%s|"), network_info)
-                self.driver.setup_vif_network(context, instance, network_info)
+                self.driver.setup_vif_network(context, instance)
             else:
                 # TODO(tr3buchet) not really sure how this should be handled.
                 # virt requires network_info to be passed in but stub_network
@@ -348,7 +348,10 @@ class ComputeManager(manager.SchedulerDependentManager):
                   {'action_str': action_str, 'instance_id': instance_id},
                   context=context)
 
+        network_info = None
         if not FLAGS.stub_network:
+            network_info = self.network_api.get_instance_nw_info(context,
+                                                                instance)
             self.network_api.deallocate_for_instance(context, instance)
 
         volumes = instance.get('volumes') or []
@@ -360,7 +363,7 @@ class ComputeManager(manager.SchedulerDependentManager):
             self.db.instance_destroy(context, instance_id)
             raise exception.Error(_('trying to destroy already destroyed'
                                     ' instance: %s') % instance_id)
-        self.driver.destroy(instance)
+        self.driver.destroy(instance,network_info)
 
         if action_str == 'Terminating':
             terminate_volumes(self.db, context, instance_id)
@@ -406,7 +409,9 @@ class ComputeManager(manager.SchedulerDependentManager):
 
         self._update_state(context, instance_id, power_state.BUILDING)
 
-        self.driver.destroy(instance_ref)
+        network_info = self.network_api.get_instance_nw_info(context,
+                                                        instance_ref)
+        self.driver.destroy(instance_ref,network_info)
         image_ref = kwargs.get('image_ref')
         instance_ref.image_ref = image_ref
         instance_ref.injected_files = kwargs.get('injected_files', [])
@@ -666,7 +671,10 @@ class ComputeManager(manager.SchedulerDependentManager):
         """Destroys the source instance."""
         context = context.elevated()
         instance_ref = self.db.instance_get(context, instance_id)
-        self.driver.destroy(instance_ref)
+
+        network_info = self.network_api.get_instance_nw_info(context,
+                                                        instance_ref)
+        self.driver.destroy(instance_ref,network_info)
         usage_info = utils.usage_from_instance(instance_ref)
         notifier_api.notify('compute.%s' % self.host,
                             'compute.instance.resize.confirm',
@@ -685,7 +693,9 @@ class ComputeManager(manager.SchedulerDependentManager):
         instance_ref = self.db.instance_get(context, instance_id)
         migration_ref = self.db.migration_get(context, migration_id)
 
-        self.driver.destroy(instance_ref)
+        network_info = self.network_api.get_instance_nw_info(context,
+                                                        instance_ref)
+        self.driver.destroy(instance_ref,network_info)
         topic = self.db.queue_get_for(context, FLAGS.compute_topic,
                 instance_ref['host'])
         rpc.cast(context, topic,
diff --git a/nova/network/manager.py b/nova/network/manager.py
index 0689759d7..b64afae5c 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -351,6 +351,8 @@ class NetworkManager(manager.SchedulerDependentManager):
         networks = self.db.network_get_all(context)
 
         # return only networks which are not vlan networks and have host set
+        for n in networks:
+            print "net: host = %s vlan = %s" % (n['host'],n['vlan'])
         return [network for network in networks if
                 not network['vlan'] and network['host']]
 
diff --git a/nova/virt/libvirt.xml.template b/nova/virt/libvirt.xml.template
index ea27e5fd7..efcb96d15 100644
--- a/nova/virt/libvirt.xml.template
+++ b/nova/virt/libvirt.xml.template
@@ -92,13 +92,13 @@
 #end if
 
 #for $nic in $nics
-    #if $vif_type='ethernet'
+    #if $vif_type=='ethernet'
         <interface type='ethernet'>
             <target dev='${nic.name}' />
             <mac address='${nic.mac_address}' />
             <script path='${nic.script}' />
         </interface>
-    #else if $vif_type='802.1Qbh'
+    #else if $vif_type=='802.1Qbh'
         <interface type='direct'>
              <mac address=${nic.mac_address}/>
              <source dev=${nic.device_name} mode='private'/>
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 15ad85176..36a6d62fe 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -261,11 +261,13 @@ class LibvirtConnection(driver.ComputeDriver):
 
     def setup_vif_network(self, ctxt, instance_id):
         """Set up VIF networking on the host."""
-        networks = db.network_get_all_by_instance(ctxt, instance_id)
-        for network in networks:
-            self.vif_driver.plug(network)
+        # FIXME: this is dying because DB has no networks for instances
+        #networks = db.network_get_all_by_instance(ctxt, instance_id)
+        #for network in networks:
+        #    self.vif_driver.plug(network)
+        pass
 
-    def destroy(self, instance, cleanup=True):
+    def destroy(self, instance, network_info, cleanup=True):
         instance_name = instance['name']
 
         try:
@@ -309,6 +311,14 @@ class LibvirtConnection(driver.ComputeDriver):
                             locals())
                 raise
 
+            try:
+                for (network, mapping) in network_info:
+                            self.vif_driver.unplug(instance, network, mapping)
+            except:
+                LOG.warning("Failed while unplugging vif of instance '%s'" % \
+                    instance['name'])
+                raise
+
         def _wait_for_destroy():
             """Called at an interval until the VM is gone."""
             instance_name = instance['name']
@@ -890,9 +900,12 @@ class LibvirtConnection(driver.ComputeDriver):
             address = mapping['ips'][0]['ip']
             netmask = mapping['ips'][0]['netmask']
             address_v6 = None
+            gateway_v6 = None
+            netmask_v6 = None
             if FLAGS.use_ipv6:
                 address_v6 = mapping['ip6s'][0]['ip']
                 netmask_v6 = mapping['ip6s'][0]['netmask']
+                gateway_v6 = mapping['gateway6']
             net_info = {'name': 'eth%d' % ifc_num,
                    'address': address,
                    'netmask': netmask,
@@ -900,7 +913,7 @@ class LibvirtConnection(driver.ComputeDriver):
                    'broadcast': mapping['broadcast'],
                    'dns': mapping['dns'],
                    'address_v6': address_v6,
-                   'gateway6': mapping['gateway6'],
+                   'gateway6': gateway_v6,
                    'netmask_v6': netmask_v6}
             nets.append(net_info)
 
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index 50c2d444c..8ce1f1f7e 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -1,6 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright (C) 2011 Midokura KK
+# Copyright (C) 2011 Nicira, Inc
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -20,6 +21,7 @@
 from nova import flags
 from nova.network import linux_net
 from nova.virt.libvirt import netutils
+from nova import utils
 from nova.virt.vif import VIFDriver
 
 FLAGS = flags.FLAGS
@@ -74,7 +76,7 @@ class LibvirtBridge(LibvirtVIF):
 
         return result
 
-    
+
 class LibvirtBridgeDriver(VIFDriver, LibvirtBridge):
     """VIF driver for Linux bridge."""
 
@@ -83,7 +85,7 @@ class LibvirtBridgeDriver(VIFDriver, LibvirtBridge):
         linux_net.ensure_bridge(network['bridge'],
                                 network['bridge_interface'])
 
-    def unplug(self, network):
+    def unplug(self, instance, network, mapping):
         pass
 
 
@@ -95,5 +97,38 @@ class LibvirtVlanBridgeDriver(VIFDriver, LibvirtBridge):
         linux_net.ensure_vlan_bridge(network['vlan'], network['bridge'],
                                      network['bridge_interface'])
 
-    def unplug(self, network):
+    def unplug(self, instance, network, mapping):
         pass
+
+class LibvirtOpenVswitchDriver(VIFDriver):
+    """VIF driver for Open vSwitch."""
+
+    def get_configurations(self, instance, network, mapping):
+        vif_id = str(instance['id']) + "-" + str(network['id'])
+        dev = "tap-%s" % vif_id
+        utils.execute('sudo','ip','tuntap','add', dev, 'mode','tap')
+        utils.execute('sudo','ip','link','set', dev, 'up')
+        utils.execute('sudo', 'ovs-vsctl','--', '--may-exist', 'add-port',
+           FLAGS.flat_network_bridge, dev,
+           '--', 'set', 'Interface', dev, "external-ids:iface-id=%s" % vif_id,
+           '--', 'set', 'Interface', dev, "external-ids:iface-status=active",
+           '--', 'set', 'Interface', dev, "external-ids:attached-mac=%s" % \
+                mapping['mac'])
+
+        result = {
+            'script': '',
+            'name': dev,
+            'mac_address' : mapping['mac']
+        }
+        print "using result = %s" % str(result)
+        return result
+
+
+    def plug(self, network):
+        pass
+
+    def unplug(self, instance, network, mapping):
+        vif_id = str(instance['id']) + "-" + str(network['id'])
+        dev = "tap-%s" % vif_id
+        utils.execute('sudo', 'ovs-vsctl','del-port', FLAGS.flat_network_bridge, dev)
+        utils.execute('sudo','ip','link','delete', dev)
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index cd4dc1b60..09914bc1c 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -224,7 +224,7 @@ class XenAPIConnection(driver.ComputeDriver):
         """
         self._vmops.inject_file(instance, b64_path, b64_contents)
 
-    def destroy(self, instance):
+    def destroy(self, instance, network_info):
         """Destroy VM instance"""
         self._vmops.destroy(instance)
 
-- 
cgit 


From 9fe72ac7b0ed0f8e294b97e267393f352c4af97f Mon Sep 17 00:00:00 2001
From: Dan Wendlandt <dan@nicira.com>
Date: Tue, 19 Jul 2011 00:40:05 -0700
Subject: cleanup

---
 nova/api/openstack/contrib/vifs.py |  1 -
 nova/compute/manager.py            |  8 ++++----
 nova/network/manager.py            |  2 --
 nova/virt/libvirt/connection.py    |  2 +-
 nova/virt/libvirt/vif.py           | 16 ++++++++--------
 nova/virt/vif.py                   |  1 +
 6 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/nova/api/openstack/contrib/vifs.py b/nova/api/openstack/contrib/vifs.py
index 5c8492aa3..a54f412a6 100644
--- a/nova/api/openstack/contrib/vifs.py
+++ b/nova/api/openstack/contrib/vifs.py
@@ -59,7 +59,6 @@ class ServerVIFController(object):
         return _translate_vifs_view(vifs)
 
 
-
 class VIFs(extensions.ExtensionDescriptor):
     def get_name(self):
         return "VIFs"
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 863e6bc18..8670465c4 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -363,7 +363,7 @@ class ComputeManager(manager.SchedulerDependentManager):
             self.db.instance_destroy(context, instance_id)
             raise exception.Error(_('trying to destroy already destroyed'
                                     ' instance: %s') % instance_id)
-        self.driver.destroy(instance,network_info)
+        self.driver.destroy(instance, network_info)
 
         if action_str == 'Terminating':
             terminate_volumes(self.db, context, instance_id)
@@ -411,7 +411,7 @@ class ComputeManager(manager.SchedulerDependentManager):
 
         network_info = self.network_api.get_instance_nw_info(context,
                                                         instance_ref)
-        self.driver.destroy(instance_ref,network_info)
+        self.driver.destroy(instance_ref, network_info)
         image_ref = kwargs.get('image_ref')
         instance_ref.image_ref = image_ref
         instance_ref.injected_files = kwargs.get('injected_files', [])
@@ -674,7 +674,7 @@ class ComputeManager(manager.SchedulerDependentManager):
 
         network_info = self.network_api.get_instance_nw_info(context,
                                                         instance_ref)
-        self.driver.destroy(instance_ref,network_info)
+        self.driver.destroy(instance_ref, network_info)
         usage_info = utils.usage_from_instance(instance_ref)
         notifier_api.notify('compute.%s' % self.host,
                             'compute.instance.resize.confirm',
@@ -695,7 +695,7 @@ class ComputeManager(manager.SchedulerDependentManager):
 
         network_info = self.network_api.get_instance_nw_info(context,
                                                         instance_ref)
-        self.driver.destroy(instance_ref,network_info)
+        self.driver.destroy(instance_ref, network_info)
         topic = self.db.queue_get_for(context, FLAGS.compute_topic,
                 instance_ref['host'])
         rpc.cast(context, topic,
diff --git a/nova/network/manager.py b/nova/network/manager.py
index b64afae5c..0689759d7 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -351,8 +351,6 @@ class NetworkManager(manager.SchedulerDependentManager):
         networks = self.db.network_get_all(context)
 
         # return only networks which are not vlan networks and have host set
-        for n in networks:
-            print "net: host = %s vlan = %s" % (n['host'],n['vlan'])
         return [network for network in networks if
                 not network['vlan'] and network['host']]
 
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 36a6d62fe..d7f7d8980 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -313,7 +313,7 @@ class LibvirtConnection(driver.ComputeDriver):
 
             try:
                 for (network, mapping) in network_info:
-                            self.vif_driver.unplug(instance, network, mapping)
+                    self.vif_driver.unplug(instance, network, mapping)
             except:
                 LOG.warning("Failed while unplugging vif of instance '%s'" % \
                     instance['name'])
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index 8ce1f1f7e..4f7bb0b4d 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -100,15 +100,16 @@ class LibvirtVlanBridgeDriver(VIFDriver, LibvirtBridge):
     def unplug(self, instance, network, mapping):
         pass
 
+
 class LibvirtOpenVswitchDriver(VIFDriver):
     """VIF driver for Open vSwitch."""
 
     def get_configurations(self, instance, network, mapping):
         vif_id = str(instance['id']) + "-" + str(network['id'])
         dev = "tap-%s" % vif_id
-        utils.execute('sudo','ip','tuntap','add', dev, 'mode','tap')
-        utils.execute('sudo','ip','link','set', dev, 'up')
-        utils.execute('sudo', 'ovs-vsctl','--', '--may-exist', 'add-port',
+        utils.execute('sudo', 'ip', 'tuntap', 'add', dev, 'mode', 'tap')
+        utils.execute('sudo', 'ip', 'link', 'set', dev, 'up')
+        utils.execute('sudo', 'ovs-vsctl', '--', '--may-exist', 'add-port',
            FLAGS.flat_network_bridge, dev,
            '--', 'set', 'Interface', dev, "external-ids:iface-id=%s" % vif_id,
            '--', 'set', 'Interface', dev, "external-ids:iface-status=active",
@@ -118,17 +119,16 @@ class LibvirtOpenVswitchDriver(VIFDriver):
         result = {
             'script': '',
             'name': dev,
-            'mac_address' : mapping['mac']
-        }
+            'mac_address': mapping['mac']}
         print "using result = %s" % str(result)
         return result
 
-
     def plug(self, network):
         pass
 
     def unplug(self, instance, network, mapping):
         vif_id = str(instance['id']) + "-" + str(network['id'])
         dev = "tap-%s" % vif_id
-        utils.execute('sudo', 'ovs-vsctl','del-port', FLAGS.flat_network_bridge, dev)
-        utils.execute('sudo','ip','link','delete', dev)
+        utils.execute('sudo', 'ovs-vsctl', 'del-port',
+                FLAGS.flat_network_bridge, dev)
+        utils.execute('sudo', 'ip', 'link', 'delete', dev)
diff --git a/nova/virt/vif.py b/nova/virt/vif.py
index 1ff41ed7e..bab1bdac9 100644
--- a/nova/virt/vif.py
+++ b/nova/virt/vif.py
@@ -17,6 +17,7 @@
 
 """VIF module common to all virt layers."""
 
+
 class VIFDriver(object):
     """Abstract class that defines generic interfaces for all VIF drivers."""
 
-- 
cgit 


From f55a362c0893c464055b125f6ef2853a8d26a4b5 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Wed, 20 Jul 2011 00:57:35 +0900
Subject: Fixed bad parameters to setup_vif_networks

---
 nova/compute/manager.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 753240614..2bda5b409 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -293,7 +293,7 @@ class ComputeManager(manager.SchedulerDependentManager):
                 network_info = self.network_api.allocate_for_instance(context,
                                                          instance, vpn=is_vpn)
                 LOG.debug(_("instance network_info: |%s|"), network_info)
-                self.driver.setup_vif_network(context, instance, network_info)
+                self.driver.setup_vif_network(context, instance['id'])
             else:
                 # TODO(tr3buchet) not really sure how this should be handled.
                 # virt requires network_info to be passed in but stub_network
-- 
cgit 


From 09c14af77b5fbb721316ca18abe4b93bd8bf6fdf Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Wed, 20 Jul 2011 00:58:19 +0900
Subject: Fixed equality comparison bug in libvirt XML

---
 nova/virt/libvirt.xml.template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nova/virt/libvirt.xml.template b/nova/virt/libvirt.xml.template
index ea27e5fd7..619d69523 100644
--- a/nova/virt/libvirt.xml.template
+++ b/nova/virt/libvirt.xml.template
@@ -92,13 +92,13 @@
 #end if
 
 #for $nic in $nics
-    #if $vif_type='ethernet'
+    #if $vif_type == 'ethernet'
         <interface type='ethernet'>
             <target dev='${nic.name}' />
             <mac address='${nic.mac_address}' />
             <script path='${nic.script}' />
         </interface>
-    #else if $vif_type='802.1Qbh'
+    #else if $vif_type == '802.1Qbh'
         <interface type='direct'>
              <mac address=${nic.mac_address}/>
              <source dev=${nic.device_name} mode='private'/>
-- 
cgit 


From 22b54cf790a60ecf255ce6eb8161105d81761fc6 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Wed, 20 Jul 2011 04:12:37 +0900
Subject: Removed blank lines

---
 nova/api/openstack/contrib/vifs.py | 1 -
 nova/virt/libvirt/vif.py           | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/nova/api/openstack/contrib/vifs.py b/nova/api/openstack/contrib/vifs.py
index 5c8492aa3..a54f412a6 100644
--- a/nova/api/openstack/contrib/vifs.py
+++ b/nova/api/openstack/contrib/vifs.py
@@ -59,7 +59,6 @@ class ServerVIFController(object):
         return _translate_vifs_view(vifs)
 
 
-
 class VIFs(extensions.ExtensionDescriptor):
     def get_name(self):
         return "VIFs"
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index 50c2d444c..5974f0570 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -74,7 +74,7 @@ class LibvirtBridge(LibvirtVIF):
 
         return result
 
-    
+
 class LibvirtBridgeDriver(VIFDriver, LibvirtBridge):
     """VIF driver for Linux bridge."""
 
-- 
cgit 


From aa3df15fa304894d9e62e3282956fe406a89b136 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Wed, 20 Jul 2011 05:41:09 +0900
Subject: Added detroy_vif_network

---
 nova/virt/libvirt/connection.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 2d654ddaf..85fffb14f 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -265,6 +265,12 @@ class LibvirtConnection(driver.ComputeDriver):
         for network in networks:
             self.vif_driver.plug(network)
 
+    def destroy_vif_network(self, ctxt, instance_id):
+        """Clean up VIF networking on the host."""
+        networks = db.network_get_all_by_instance(ctxt, instance_id)
+        for network in networks:
+            self.vif_driver.unplug(network)
+
     def destroy(self, instance, cleanup=True):
         instance_name = instance['name']
 
@@ -323,6 +329,8 @@ class LibvirtConnection(driver.ComputeDriver):
         timer = utils.LoopingCall(_wait_for_destroy)
         timer.start(interval=0.5, now=True)
 
+        ctxt = context.get_admin_context()
+        self.destroy_vif_network(ctxt, instance['id'])
         self.firewall_driver.unfilter_instance(instance)
 
         if cleanup:
-- 
cgit 


From 6fafda1ffbf2838ef33a4948303f24ed075c292d Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Wed, 20 Jul 2011 06:42:49 +0900
Subject: Renamed setup_vif_network to plug_vif

---
 nova/compute/manager.py         | 20 ++++++++++++--------
 nova/network/manager.py         |  4 +++-
 nova/virt/libvirt/connection.py | 11 ++++-------
 nova/virt/libvirt/vif.py        | 16 ++++------------
 nova/virt/vif.py                |  4 ++--
 5 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index eb52995be..0894052ce 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -299,7 +299,7 @@ class ComputeManager(manager.SchedulerDependentManager):
                 network_info = self.network_api.allocate_for_instance(context,
                                                          instance, vpn=is_vpn)
                 LOG.debug(_("instance network_info: |%s|"), network_info)
-                self.driver.setup_vif_network(context, instance['id'])
+                self.driver.plug_vifs(context, instance, network_info)
             else:
                 # TODO(tr3buchet) not really sure how this should be handled.
                 # virt requires network_info to be passed in but stub_network
@@ -356,7 +356,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         network_info = None
         if not FLAGS.stub_network:
             network_info = self.network_api.get_instance_nw_info(context,
-                                                                instance)
+                                                                 instance)
             self.network_api.deallocate_for_instance(context, instance)
 
         volumes = instance.get('volumes') or []
@@ -414,7 +414,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         self._update_state(context, instance_id, power_state.BUILDING)
 
         network_info = self.network_api.get_instance_nw_info(context,
-                                                        instance_ref)
+                                                             instance_ref)
         self.driver.destroy(instance_ref, network_info)
         image_ref = kwargs.get('image_ref')
         instance_ref.image_ref = image_ref
@@ -642,7 +642,9 @@ class ComputeManager(manager.SchedulerDependentManager):
                                    instance_id,
                                    power_state.NOSTATE,
                                    'rescuing')
-        self.driver.setup_vif_network(context, instance_id)
+        network_info = self.network_api.get_instance_nw_info(context,
+                                                             instance_ref)
+        self.driver.plug_vifs(context, instance_ref, network_info)
         _update_state = lambda result: self._update_state_callback(
                 self, context, instance_id, result)
         self.driver.rescue(instance_ref, _update_state)
@@ -677,7 +679,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         instance_ref = self.db.instance_get(context, instance_id)
 
         network_info = self.network_api.get_instance_nw_info(context,
-                                                        instance_ref)
+                                                             instance_ref)
         self.driver.destroy(instance_ref, network_info)
         usage_info = utils.usage_from_instance(instance_ref)
         notifier.notify('compute.%s' % self.host,
@@ -698,7 +700,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         migration_ref = self.db.migration_get(context, migration_id)
 
         network_info = self.network_api.get_instance_nw_info(context,
-                                                        instance_ref)
+                                                             instance_ref)
         self.driver.destroy(instance_ref, network_info)
         topic = self.db.queue_get_for(context, FLAGS.compute_topic,
                 instance_ref['host'])
@@ -1203,16 +1205,18 @@ class ComputeManager(manager.SchedulerDependentManager):
         #
         # Retry operation is necessary because continuously request comes,
         # concorrent request occurs to iptables, then it complains.
+        network_info = self.network_api.get_instance_nw_info(context,
+                                                             instance_ref)
         max_retry = FLAGS.live_migration_retry_count
         for cnt in range(max_retry):
             try:
-                self.driver.setup_vif_network(context, instance_id)
+                self.driver.plug_vifs(context, instance_ref, network_info)
                 break
             except exception.ProcessExecutionError:
                 if cnt == max_retry - 1:
                     raise
                 else:
-                    LOG.warn(_("setup_vif_network() failed %(cnt)d."
+                    LOG.warn(_("plug_vifs() failed %(cnt)d."
                                "Retry up to %(max_retry)d for %(hostname)s.")
                                % locals())
                     time.sleep(1)
diff --git a/nova/network/manager.py b/nova/network/manager.py
index d5b8cf8dc..bf83bf4e6 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -444,7 +444,9 @@ class NetworkManager(manager.SchedulerDependentManager):
                 'id': network['id'],
                 'cidr': network['cidr'],
                 'cidr_v6': network['cidr_v6'],
-                'injected': network['injected']}
+                'injected': network['injected'],
+                'vlan': network['vlan'],
+                'bridge_interface': network['bridge_interface']}
             info = {
                 'label': network['label'],
                 'gateway': network['gateway'],
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 936e1b171..572503311 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -259,13 +259,10 @@ class LibvirtConnection(driver.ComputeDriver):
             infos.append(info)
         return infos
 
-    def setup_vif_network(self, ctxt, instance_id):
-        """Set up VIF networking on the host."""
-        # FIXME: this is dying because DB has no networks for instances
-        #networks = db.network_get_all_by_instance(ctxt, instance_id)
-        #for network in networks:
-        #    self.vif_driver.plug(network)
-        pass
+    def plug_vifs(self, ctxt, instance, network_info):
+        """Plugin VIFs into networks."""
+        for (network, mapping) in network_info:
+            self.vif_driver.plug(instance, network, mapping)
 
     def destroy(self, instance, network_info, cleanup=True):
         instance_name = instance['name']
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index 4f7bb0b4d..820055cf0 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -30,15 +30,7 @@ flags.DEFINE_bool('allow_project_net_traffic',
                   'Whether to allow in project network traffic')
 
 
-class LibvirtVIF(object):
-    """VIF class for libvirt"""
-
-    def get_configurations(self, instance, network, mapping):
-        """Get a dictionary of VIF configuration for libvirt interfaces."""
-        raise NotImplementedError()
-
-
-class LibvirtBridge(LibvirtVIF):
+class LibvirtBridge(object):
     """Linux bridge VIF for Libvirt."""
 
     def get_configurations(self, instance, network, mapping):
@@ -80,7 +72,7 @@ class LibvirtBridge(LibvirtVIF):
 class LibvirtBridgeDriver(VIFDriver, LibvirtBridge):
     """VIF driver for Linux bridge."""
 
-    def plug(self, network):
+    def plug(self, instance, network, mapping):
         """Ensure that the bridge exists, and add VIF to it."""
         linux_net.ensure_bridge(network['bridge'],
                                 network['bridge_interface'])
@@ -92,7 +84,7 @@ class LibvirtBridgeDriver(VIFDriver, LibvirtBridge):
 class LibvirtVlanBridgeDriver(VIFDriver, LibvirtBridge):
     """VIF driver for Linux bridge with VLAN."""
 
-    def plug(self, network):
+    def plug(self, instance, network, mapping):
         """Ensure that VLAN and bridge exist and add VIF to the bridge."""
         linux_net.ensure_vlan_bridge(network['vlan'], network['bridge'],
                                      network['bridge_interface'])
@@ -123,7 +115,7 @@ class LibvirtOpenVswitchDriver(VIFDriver):
         print "using result = %s" % str(result)
         return result
 
-    def plug(self, network):
+    def plug(self, instance, network, mapping):
         pass
 
     def unplug(self, instance, network, mapping):
diff --git a/nova/virt/vif.py b/nova/virt/vif.py
index bab1bdac9..b78689957 100644
--- a/nova/virt/vif.py
+++ b/nova/virt/vif.py
@@ -21,10 +21,10 @@
 class VIFDriver(object):
     """Abstract class that defines generic interfaces for all VIF drivers."""
 
-    def plug(self, network):
+    def plug(self, instance, network, mapping):
         """Plug VIF into network."""
         raise NotImplementedError()
 
-    def unplug(self, network):
+    def unplug(self, instance, network, mapping):
         """Unplug VIF from network."""
         raise NotImplementedError()
-- 
cgit 


From 979282fba8b9dc20bc6345a3b3c017d6339662fa Mon Sep 17 00:00:00 2001
From: danwent <danwent@dan-xs3-cs>
Date: Wed, 20 Jul 2011 00:41:26 -0700
Subject: first cut of xenserver vif-plugging, some minor tweaks to libvirt
 plugging

---
 nova/virt/libvirt/connection.py |  8 +++-----
 nova/virt/libvirt/vif.py        |  5 +++--
 nova/virt/xenapi/vm_utils.py    | 22 ----------------------
 nova/virt/xenapi/vmops.py       | 34 ++++++++++++++++++++++++----------
 nova/virt/xenapi_conn.py        |  3 +++
 5 files changed, 33 insertions(+), 39 deletions(-)

diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 936e1b171..1fa6e5c2f 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -261,11 +261,9 @@ class LibvirtConnection(driver.ComputeDriver):
 
     def setup_vif_network(self, ctxt, instance_id):
         """Set up VIF networking on the host."""
-        # FIXME: this is dying because DB has no networks for instances
-        #networks = db.network_get_all_by_instance(ctxt, instance_id)
-        #for network in networks:
-        #    self.vif_driver.plug(network)
-        pass
+        networks = db.network_get_all_by_instance(ctxt, instance_id)
+        for network in networks:
+            self.vif_driver.plug(network)
 
     def destroy(self, instance, network_info, cleanup=True):
         instance_name = instance['name']
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index 4f7bb0b4d..2188251f0 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -28,6 +28,8 @@ FLAGS = flags.FLAGS
 flags.DEFINE_bool('allow_project_net_traffic',
                   True,
                   'Whether to allow in project network traffic')
+flags.DEFINE_string('libvirt_ovs_integration_bridge', 'br-int',
+			'Name of Integration Bridge used by Open vSwitch')
 
 
 class LibvirtVIF(object):
@@ -110,7 +112,7 @@ class LibvirtOpenVswitchDriver(VIFDriver):
         utils.execute('sudo', 'ip', 'tuntap', 'add', dev, 'mode', 'tap')
         utils.execute('sudo', 'ip', 'link', 'set', dev, 'up')
         utils.execute('sudo', 'ovs-vsctl', '--', '--may-exist', 'add-port',
-           FLAGS.flat_network_bridge, dev,
+           FLAGS.libvirt_ovs_integration_bridge, dev,
            '--', 'set', 'Interface', dev, "external-ids:iface-id=%s" % vif_id,
            '--', 'set', 'Interface', dev, "external-ids:iface-status=active",
            '--', 'set', 'Interface', dev, "external-ids:attached-mac=%s" % \
@@ -120,7 +122,6 @@ class LibvirtOpenVswitchDriver(VIFDriver):
             'script': '',
             'name': dev,
             'mac_address': mapping['mac']}
-        print "using result = %s" % str(result)
         return result
 
     def plug(self, network):
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 71107aff4..e63582b54 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -282,27 +282,6 @@ class VMHelper(HelperBase):
             LOG.exception(exc)
             raise StorageError(_('Unable to destroy VDI %s') % vdi_ref)
 
-    @classmethod
-    def create_vif(cls, session, vm_ref, network_ref, mac_address,
-                   dev, rxtx_cap=0):
-        """Create a VIF record.  Returns a Deferred that gives the new
-        VIF reference."""
-        vif_rec = {}
-        vif_rec['device'] = str(dev)
-        vif_rec['network'] = network_ref
-        vif_rec['VM'] = vm_ref
-        vif_rec['MAC'] = mac_address
-        vif_rec['MTU'] = '1500'
-        vif_rec['other_config'] = {}
-        vif_rec['qos_algorithm_type'] = "ratelimit" if rxtx_cap else ''
-        vif_rec['qos_algorithm_params'] = \
-                {"kbps": str(rxtx_cap * 1024)} if rxtx_cap else {}
-        LOG.debug(_('Creating VIF for VM %(vm_ref)s,'
-                ' network %(network_ref)s.') % locals())
-        vif_ref = session.call_xenapi('VIF.create', vif_rec)
-        LOG.debug(_('Created VIF %(vif_ref)s for VM %(vm_ref)s,'
-                ' network %(network_ref)s.') % locals())
-        return vif_ref
 
     @classmethod
     def create_vdi(cls, session, sr_ref, name_label, virtual_size, read_only):
@@ -1116,7 +1095,6 @@ def _stream_disk(dev, image_type, virtual_size, image_file):
         for chunk in image_file:
             f.write(chunk)
 
-
 def _write_partition(virtual_size, dev):
     dest = '/dev/%s' % dev
     primary_first = MBR_SIZE_SECTORS
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index c332c27b0..26f90fedd 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -52,6 +52,9 @@ FLAGS = flags.FLAGS
 flags.DEFINE_integer('windows_version_timeout', 300,
                      'number of seconds to wait for windows agent to be '
                      'fully operational')
+flags.DEFINE_string('xenapi_vif_driver',
+                    'nova.virt.xenapi.vif.XenAPIBridgeDriver',
+                    'The XenAPI VIF driver using XenServer Network APIs.')
 
 
 def cmp_version(a, b):
@@ -78,6 +81,7 @@ class VMOps(object):
         self._session = session
         self.poll_rescue_last_ran = None
         VMHelper.XenAPI = self.XenAPI
+        self.vif_driver = utils.import_object(FLAGS.xenapi_vif_driver)
 
     def list_instances(self):
         """List VM instances."""
@@ -255,7 +259,7 @@ class VMOps(object):
             VMHelper.preconfigure_instance(self._session, instance,
                                            first_vdi_ref, network_info)
 
-        self.create_vifs(vm_ref, network_info)
+        self.create_vifs(vm_ref, instance, network_info)
         self.inject_network_info(instance, network_info, vm_ref)
         return vm_ref
 
@@ -873,6 +877,11 @@ class VMOps(object):
             self._destroy_kernel_ramdisk(instance, vm_ref)
         self._destroy_vm(instance, vm_ref)
 
+        networks = db.network_get_all_by_instance(ctxt, instance['id'])
+        for network in networks:
+            self.vif_driver.unplug(network)
+
+
     def _wait_with_callback(self, instance_id, task, callback):
         ret = None
         try:
@@ -1068,7 +1077,7 @@ class VMOps(object):
                 # catch KeyError for domid if instance isn't running
                 pass
 
-    def create_vifs(self, vm_ref, network_info):
+    def create_vifs(self, vm_ref, instance, network_info):
         """Creates vifs for an instance."""
 
         logging.debug(_("creating vif(s) for vm: |%s|"), vm_ref)
@@ -1077,14 +1086,19 @@ class VMOps(object):
         self._session.get_xenapi().VM.get_record(vm_ref)
 
         for device, (network, info) in enumerate(network_info):
-            mac_address = info['mac']
-            bridge = network['bridge']
-            rxtx_cap = info.pop('rxtx_cap')
-            network_ref = \
-                NetworkHelper.find_network_with_bridge(self._session,
-                                                       bridge)
-            VMHelper.create_vif(self._session, vm_ref, network_ref,
-                                mac_address, device, rxtx_cap)
+            vif_rec = self.vif_driver.get_vif_rec(self._session,
+                    vm_ref, instance, device, network, info)
+            LOG.debug(_('Creating VIF for VM %(vm_ref)s,' \
+                ' network %(network_ref)s.') % locals())
+            vif_ref = session.call_xenapi('VIF.create', vif_rec)
+            LOG.debug(_('Created VIF %(vif_ref)s for VM %(vm_ref)s,'
+                ' network %(network_ref)s.') % locals())
+
+    def setup_vif_network(self, ctxt, instance_id):
+        """Set up VIF networking on the host."""
+        networks = db.network_get_all_by_instance(ctxt, instance_id)
+        for network in networks:
+            self.vif_driver.plug(network)
 
     def reset_network(self, instance, vm_ref=None):
         """Creates uuid arg to pass to make_agent_call and calls it."""
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index 032ab7345..ae39ecab4 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -269,6 +269,9 @@ class XenAPIConnection(driver.ComputeDriver):
         """inject network info for specified instance"""
         self._vmops.inject_network_info(instance, network_info)
 
+    def setup_vif_network(self, ctxt, instance_id):
+        self._vmops.setup_vif_network(ctxt, instance_id)
+
     def get_info(self, instance_id):
         """Return data about VM instance"""
         return self._vmops.get_info(instance_id)
-- 
cgit 


From 43de3c5f6b5d65d981fbebf169c05d06faa6a09e Mon Sep 17 00:00:00 2001
From: danwent <danwent@dan-xs3-cs>
Date: Wed, 20 Jul 2011 01:03:02 -0700
Subject: remove xenapi_net.py from network directory, as this functionality is
 now moved to virt layer

---
 nova/network/xenapi_net.py | 87 ----------------------------------------------
 1 file changed, 87 deletions(-)
 delete mode 100644 nova/network/xenapi_net.py

diff --git a/nova/network/xenapi_net.py b/nova/network/xenapi_net.py
deleted file mode 100644
index e86f4017d..000000000
--- a/nova/network/xenapi_net.py
+++ /dev/null
@@ -1,87 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (c) 2011 Citrix Systems, Inc.
-# Copyright 2011 OpenStack LLC.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-"""Implements vlans, bridges, and iptables rules using linux utilities."""
-
-import os
-
-from nova import db
-from nova import exception
-from nova import flags
-from nova import log as logging
-from nova import utils
-from nova.virt import xenapi_conn
-from nova.virt.xenapi import network_utils
-
-
-LOG = logging.getLogger("nova.xenapi_net")
-
-
-FLAGS = flags.FLAGS
-
-
-def ensure_vlan_bridge(vlan_num, bridge, bridge_interface, net_attrs=None):
-    """Create a vlan and bridge unless they already exist."""
-    # Open xenapi session
-    LOG.debug('ENTERING ensure_vlan_bridge in xenapi net')
-    url = FLAGS.xenapi_connection_url
-    username = FLAGS.xenapi_connection_username
-    password = FLAGS.xenapi_connection_password
-    session = xenapi_conn.XenAPISession(url, username, password)
-    # Check whether bridge already exists
-    # Retrieve network whose name_label is "bridge"
-    network_ref = network_utils.NetworkHelper.find_network_with_name_label(
-                                                                       session,
-                                                                       bridge)
-    if network_ref is None:
-        # If bridge does not exists
-        # 1 - create network
-        description = 'network for nova bridge %s' % bridge
-        network_rec = {'name_label': bridge,
-                       'name_description': description,
-                       'other_config': {}}
-        network_ref = session.call_xenapi('network.create', network_rec)
-        # 2 - find PIF for VLAN
-        # NOTE(salvatore-orlando): using double quotes inside single quotes
-        # as xapi filter only support tokens in double quotes
-        expr = 'field "device" = "%s" and \
-                field "VLAN" = "-1"' % bridge_interface
-        pifs = session.call_xenapi('PIF.get_all_records_where', expr)
-        pif_ref = None
-        # Multiple PIF are ok: we are dealing with a pool
-        if len(pifs) == 0:
-            raise Exception(
-                  _('Found no PIF for device %s') % bridge_interface)
-        # 3 - create vlan for network
-        for pif_ref in pifs.keys():
-            session.call_xenapi('VLAN.create',
-                                pif_ref,
-                                str(vlan_num),
-                                network_ref)
-    else:
-        # Check VLAN tag is appropriate
-        network_rec = session.call_xenapi('network.get_record', network_ref)
-        # Retrieve PIFs from network
-        for pif_ref in network_rec['PIFs']:
-            # Retrieve VLAN from PIF
-            pif_rec = session.call_xenapi('PIF.get_record', pif_ref)
-            pif_vlan = int(pif_rec['VLAN'])
-            # Raise an exception if VLAN != vlan_num
-            if pif_vlan != vlan_num:
-                raise Exception(_("PIF %(pif_rec['uuid'])s for network "
-                                  "%(bridge)s has VLAN id %(pif_vlan)d. "
-                                  "Expected %(vlan_num)d") % locals())
-- 
cgit 


From 798a5e31b304df1c59e226f9426c07cb250dae16 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Wed, 20 Jul 2011 20:21:44 +0900
Subject: Added network_info parameter to all the appropriate places in virt
 layers and compute manager

---
 nova/compute/manager.py         | 12 ++++++++----
 nova/virt/driver.py             | 10 +++++-----
 nova/virt/fake.py               |  8 ++++----
 nova/virt/hyperv.py             |  6 +++---
 nova/virt/libvirt/connection.py | 14 +++++++-------
 nova/virt/vmwareapi_conn.py     |  6 +++---
 nova/virt/xenapi_conn.py        |  6 +++---
 7 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 0894052ce..98f3cc86f 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -419,7 +419,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         image_ref = kwargs.get('image_ref')
         instance_ref.image_ref = image_ref
         instance_ref.injected_files = kwargs.get('injected_files', [])
-        self.driver.spawn(instance_ref)
+        self.driver.spawn(instance_ref, network_info)
 
         self._update_image_ref(context, instance_id, image_ref)
         self._update_launched_at(context, instance_id)
@@ -452,7 +452,9 @@ class ComputeManager(manager.SchedulerDependentManager):
                                    instance_id,
                                    power_state.NOSTATE,
                                    'rebooting')
-        self.driver.reboot(instance_ref)
+        network_info = self.network_api.get_instance_nw_info(context,
+                                                             instance_ref)
+        self.driver.reboot(instance_ref, network_info)
         self._update_state(context, instance_id)
 
     @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id())
@@ -647,7 +649,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         self.driver.plug_vifs(context, instance_ref, network_info)
         _update_state = lambda result: self._update_state_callback(
                 self, context, instance_id, result)
-        self.driver.rescue(instance_ref, _update_state)
+        self.driver.rescue(instance_ref, _update_state, network_info)
         self._update_state(context, instance_id)
 
     @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id())
@@ -663,7 +665,9 @@ class ComputeManager(manager.SchedulerDependentManager):
                                    'unrescuing')
         _update_state = lambda result: self._update_state_callback(
                 self, context, instance_id, result)
-        self.driver.unrescue(instance_ref, _update_state)
+        network_info = self.network_api.get_instance_nw_info(context,
+                                                             instance_ref)
+        self.driver.unrescue(instance_ref, _update_state, network_info)
         self._update_state(context, instance_id)
 
     @staticmethod
diff --git a/nova/virt/driver.py b/nova/virt/driver.py
index 178279d31..61f26ad96 100644
--- a/nova/virt/driver.py
+++ b/nova/virt/driver.py
@@ -61,11 +61,11 @@ class ComputeDriver(object):
         """Return a list of InstanceInfo for all registered VMs"""
         raise NotImplementedError()
 
-    def spawn(self, instance, network_info=None, block_device_mapping=None):
+    def spawn(self, instance, network_info, block_device_mapping=None):
         """Launch a VM for the specified instance"""
         raise NotImplementedError()
 
-    def destroy(self, instance, cleanup=True):
+    def destroy(self, instance, network_info, cleanup=True):
         """Destroy (shutdown and delete) the specified instance.
 
         The given parameter is an instance of nova.compute.service.Instance,
@@ -81,7 +81,7 @@ class ComputeDriver(object):
         """
         raise NotImplementedError()
 
-    def reboot(self, instance):
+    def reboot(self, instance, network_info):
         """Reboot specified VM"""
         raise NotImplementedError()
 
@@ -146,11 +146,11 @@ class ComputeDriver(object):
         """resume the specified instance"""
         raise NotImplementedError()
 
-    def rescue(self, instance, callback):
+    def rescue(self, instance, callback, network_info):
         """Rescue the specified instance"""
         raise NotImplementedError()
 
-    def unrescue(self, instance, callback):
+    def unrescue(self, instance, callback, network_info):
         """Unrescue the specified instance"""
         raise NotImplementedError()
 
diff --git a/nova/virt/fake.py b/nova/virt/fake.py
index ea0a59f21..c5e9d89e4 100644
--- a/nova/virt/fake.py
+++ b/nova/virt/fake.py
@@ -167,7 +167,7 @@ class FakeConnection(driver.ComputeDriver):
         """
         pass
 
-    def reboot(self, instance):
+    def reboot(self, instance, network_info):
         """
         Reboot the specified instance.
 
@@ -240,13 +240,13 @@ class FakeConnection(driver.ComputeDriver):
         """
         pass
 
-    def rescue(self, instance):
+    def rescue(self, instance, callback, network_info):
         """
         Rescue the specified instance.
         """
         pass
 
-    def unrescue(self, instance):
+    def unrescue(self, instance, callback, network_info):
         """
         Unrescue the specified instance.
         """
@@ -293,7 +293,7 @@ class FakeConnection(driver.ComputeDriver):
         """
         pass
 
-    def destroy(self, instance):
+    def destroy(self, instance, network_info):
         key = instance.name
         if key in self.instances:
             del self.instances[key]
diff --git a/nova/virt/hyperv.py b/nova/virt/hyperv.py
index 5c1dc772d..81c7dea58 100644
--- a/nova/virt/hyperv.py
+++ b/nova/virt/hyperv.py
@@ -139,7 +139,7 @@ class HyperVConnection(driver.ComputeDriver):
 
         return instance_infos
 
-    def spawn(self, instance, network_info=None, block_device_mapping=None):
+    def spawn(self, instance, network_info, block_device_mapping=None):
         """ Create a new VM and start it."""
         vm = self._lookup(instance.name)
         if vm is not None:
@@ -368,14 +368,14 @@ class HyperVConnection(driver.ComputeDriver):
                     wmi_obj.Properties_.Item(prop).Value
         return newinst
 
-    def reboot(self, instance):
+    def reboot(self, instance, network_info):
         """Reboot the specified instance."""
         vm = self._lookup(instance.name)
         if vm is None:
             raise exception.InstanceNotFound(instance_id=instance.id)
         self._set_vm_state(instance.name, 'Reboot')
 
-    def destroy(self, instance):
+    def destroy(self, instance, network_info):
         """Destroy the VM. Also destroy the associated VHD disk files"""
         LOG.debug(_("Got request to destroy vm %s"), instance.name)
         vm = self._lookup(instance.name)
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 572503311..5f347989c 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -477,7 +477,7 @@ class LibvirtConnection(driver.ComputeDriver):
         shutil.rmtree(temp_dir)
 
     @exception.wrap_exception()
-    def reboot(self, instance):
+    def reboot(self, instance, network_info):
         """Reboot a virtual machine, given an instance reference.
 
         This method actually destroys and re-creates the domain to ensure the
@@ -492,7 +492,7 @@ class LibvirtConnection(driver.ComputeDriver):
         # NOTE(itoumsn): self.shutdown() and wait instead of self.destroy() is
         # better because we cannot ensure flushing dirty buffers
         # in the guest OS. But, in case of KVM, shutdown() does not work...
-        self.destroy(instance, False)
+        self.destroy(instance, network_info, cleanup=False)
         self.firewall_driver.setup_basic_filtering(instance)
         self.firewall_driver.prepare_instance_filter(instance)
         self._create_new_domain(xml)
@@ -542,7 +542,7 @@ class LibvirtConnection(driver.ComputeDriver):
         dom.create()
 
     @exception.wrap_exception()
-    def rescue(self, instance):
+    def rescue(self, instance, callback, network_info):
         """Loads a VM using rescue images.
 
         A rescue is normally performed when something goes wrong with the
@@ -551,7 +551,7 @@ class LibvirtConnection(driver.ComputeDriver):
         data recovery.
 
         """
-        self.destroy(instance, False)
+        self.destroy(instance, network_info, cleanup=False)
 
         xml = self.to_xml(instance, rescue=True)
         rescue_images = {'image_id': FLAGS.rescue_image_id,
@@ -580,14 +580,14 @@ class LibvirtConnection(driver.ComputeDriver):
         return timer.start(interval=0.5, now=True)
 
     @exception.wrap_exception()
-    def unrescue(self, instance):
+    def unrescue(self, instance, network_info):
         """Reboot the VM which is being rescued back into primary images.
 
         Because reboot destroys and re-creates instances, unresue should
         simply call reboot.
 
         """
-        self.reboot(instance)
+        self.reboot(instance, network_info)
 
     @exception.wrap_exception()
     def poll_rescued_instances(self, timeout):
@@ -596,7 +596,7 @@ class LibvirtConnection(driver.ComputeDriver):
     # NOTE(ilyaalekseyev): Implementation like in multinics
     # for xenapi(tr3buchet)
     @exception.wrap_exception()
-    def spawn(self, instance, network_info=None, block_device_mapping=None):
+    def spawn(self, instance, network_info, block_device_mapping=None):
         xml = self.to_xml(instance, False, network_info=network_info,
                           block_device_mapping=block_device_mapping)
         block_device_mapping = block_device_mapping or []
diff --git a/nova/virt/vmwareapi_conn.py b/nova/virt/vmwareapi_conn.py
index d80e14931..9e15510ab 100644
--- a/nova/virt/vmwareapi_conn.py
+++ b/nova/virt/vmwareapi_conn.py
@@ -124,7 +124,7 @@ class VMWareESXConnection(driver.ComputeDriver):
         """List VM instances."""
         return self._vmops.list_instances()
 
-    def spawn(self, instance, network_info=None, block_device_mapping=None):
+    def spawn(self, instance, network_info, block_device_mapping=None):
         """Create VM instance."""
         self._vmops.spawn(instance)
 
@@ -132,11 +132,11 @@ class VMWareESXConnection(driver.ComputeDriver):
         """Create snapshot from a running VM instance."""
         self._vmops.snapshot(instance, name)
 
-    def reboot(self, instance):
+    def reboot(self, instance, network_info):
         """Reboot VM instance."""
         self._vmops.reboot(instance)
 
-    def destroy(self, instance):
+    def destroy(self, instance, network_info):
         """Destroy VM instance."""
         self._vmops.destroy(instance)
 
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index 032ab7345..b8e5251a9 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -210,7 +210,7 @@ class XenAPIConnection(driver.ComputeDriver):
         """ Create snapshot from a running VM instance """
         self._vmops.snapshot(instance, image_id)
 
-    def reboot(self, instance):
+    def reboot(self, instance, network_info):
         """Reboot VM instance"""
         self._vmops.reboot(instance)
 
@@ -249,11 +249,11 @@ class XenAPIConnection(driver.ComputeDriver):
         """resume the specified instance"""
         self._vmops.resume(instance, callback)
 
-    def rescue(self, instance, callback):
+    def rescue(self, instance, callback, network_info):
         """Rescue the specified instance"""
         self._vmops.rescue(instance, callback)
 
-    def unrescue(self, instance, callback):
+    def unrescue(self, instance, callback, network_info):
         """Unrescue the specified instance"""
         self._vmops.unrescue(instance, callback)
 
-- 
cgit 


From 7bdd244541fd9cef4031d4050b5200f58a15f757 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Wed, 20 Jul 2011 21:00:20 +0900
Subject: Moved ensure_vlan_bridge of vmware to VIF driver

---
 nova/network/vmwareapi_net.py | 82 --------------------------------------
 nova/virt/vmwareapi/vif.py    | 93 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+), 82 deletions(-)
 delete mode 100644 nova/network/vmwareapi_net.py
 create mode 100644 nova/virt/vmwareapi/vif.py

diff --git a/nova/network/vmwareapi_net.py b/nova/network/vmwareapi_net.py
deleted file mode 100644
index b32cf3303..000000000
--- a/nova/network/vmwareapi_net.py
+++ /dev/null
@@ -1,82 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (c) 2011 Citrix Systems, Inc.
-# Copyright 2011 OpenStack LLC.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-"""Implements vlans for vmwareapi."""
-
-from nova import db
-from nova import exception
-from nova import flags
-from nova import log as logging
-from nova import utils
-from nova.virt.vmwareapi_conn import VMWareAPISession
-from nova.virt.vmwareapi import network_utils
-
-
-LOG = logging.getLogger("nova.network.vmwareapi_net")
-
-
-FLAGS = flags.FLAGS
-FLAGS['vlan_interface'].SetDefault('vmnic0')
-
-
-def ensure_vlan_bridge(vlan_num, bridge, bridge_interface, net_attrs=None):
-    """Create a vlan and bridge unless they already exist."""
-    # Open vmwareapi session
-    host_ip = FLAGS.vmwareapi_host_ip
-    host_username = FLAGS.vmwareapi_host_username
-    host_password = FLAGS.vmwareapi_host_password
-    if not host_ip or host_username is None or host_password is None:
-        raise Exception(_('Must specify vmwareapi_host_ip, '
-                          'vmwareapi_host_username '
-                          'and vmwareapi_host_password to use '
-                          'connection_type=vmwareapi'))
-    session = VMWareAPISession(host_ip, host_username, host_password,
-                               FLAGS.vmwareapi_api_retry_count)
-    vlan_interface = bridge_interface
-    # Check if the vlan_interface physical network adapter exists on the host
-    if not network_utils.check_if_vlan_interface_exists(session,
-                                                        vlan_interface):
-        raise exception.NetworkAdapterNotFound(adapter=vlan_interface)
-
-    # Get the vSwitch associated with the Physical Adapter
-    vswitch_associated = network_utils.get_vswitch_for_vlan_interface(
-                                        session, vlan_interface)
-    if vswitch_associated is None:
-        raise exception.SwicthNotFoundForNetworkAdapter(adapter=vlan_interface)
-    # Check whether bridge already exists and retrieve the the ref of the
-    # network whose name_label is "bridge"
-    network_ref = network_utils.get_network_with_the_name(session, bridge)
-    if network_ref is None:
-        # Create a port group on the vSwitch associated with the vlan_interface
-        # corresponding physical network adapter on the ESX host
-        network_utils.create_port_group(session, bridge, vswitch_associated,
-                                vlan_num)
-    else:
-        # Get the vlan id and vswitch corresponding to the port group
-        pg_vlanid, pg_vswitch = \
-            network_utils.get_vlanid_and_vswitch_for_portgroup(session, bridge)
-
-        # Check if the vswitch associated is proper
-        if pg_vswitch != vswitch_associated:
-            raise exception.InvalidVLANPortGroup(bridge=bridge,
-                                                 expected=vswitch_associated,
-                                                 actual=pg_vswitch)
-
-        # Check if the vlan id is proper for the port group
-        if pg_vlanid != vlan_num:
-            raise exception.InvalidVLANTag(bridge=bridge, tag=vlan_num,
-                                           pgroup=pg_vlanid)
diff --git a/nova/virt/vmwareapi/vif.py b/nova/virt/vmwareapi/vif.py
new file mode 100644
index 000000000..902699089
--- /dev/null
+++ b/nova/virt/vmwareapi/vif.py
@@ -0,0 +1,93 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright (c) 2011 Citrix Systems, Inc.
+# Copyright 2011 OpenStack LLC.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""VIF drivers for VMWare."""
+
+from nova import db
+from nova import exception
+from nova import flags
+from nova import log as logging
+from nova import utils
+from nova.virt.vif import VIFDriver
+from nova.virt.vmwareapi_conn import VMWareAPISession
+from nova.virt.vmwareapi import network_utils
+
+
+LOG = logging.getLogger("nova.virt.vmwareapi.vif")
+
+FLAGS = flags.FLAGS
+
+
+class VMWareVlanBridgeDriver(VIFDriver):
+    """VIF driver for Linux VLAN bridge."""
+
+    def plug(self, instance, network, mapping):
+        """Create a vlan and bridge unless they already exist."""
+        vlan_num = network['vlan']
+        bridge = network['bridge']
+        bridge_interface = network['bridge_interface']
+
+        # Open vmwareapi session
+        host_ip = FLAGS.vmwareapi_host_ip
+        host_username = FLAGS.vmwareapi_host_username
+        host_password = FLAGS.vmwareapi_host_password
+        if not host_ip or host_username is None or host_password is None:
+            raise Exception(_('Must specify vmwareapi_host_ip, '
+                              'vmwareapi_host_username '
+                              'and vmwareapi_host_password to use '
+                              'connection_type=vmwareapi'))
+        session = VMWareAPISession(host_ip, host_username, host_password,
+                                   FLAGS.vmwareapi_api_retry_count)
+        vlan_interface = bridge_interface
+        # Check if the vlan_interface physical network adapter exists on the host
+        if not network_utils.check_if_vlan_interface_exists(session,
+                                                            vlan_interface):
+            raise exception.NetworkAdapterNotFound(adapter=vlan_interface)
+
+        # Get the vSwitch associated with the Physical Adapter
+        vswitch_associated = network_utils.get_vswitch_for_vlan_interface(
+                                            session, vlan_interface)
+        if vswitch_associated is None:
+            raise exception.SwicthNotFoundForNetworkAdapter(adapter=vlan_interface)
+        # Check whether bridge already exists and retrieve the the ref of the
+        # network whose name_label is "bridge"
+        network_ref = network_utils.get_network_with_the_name(session, bridge)
+        if network_ref is None:
+            # Create a port group on the vSwitch associated with the vlan_interface
+            # corresponding physical network adapter on the ESX host
+            network_utils.create_port_group(session, bridge, vswitch_associated,
+                                    vlan_num)
+        else:
+            # Get the vlan id and vswitch corresponding to the port group
+            pg_vlanid, pg_vswitch = \
+                network_utils.get_vlanid_and_vswitch_for_portgroup(session, bridge)
+
+            # Check if the vswitch associated is proper
+            if pg_vswitch != vswitch_associated:
+                raise exception.InvalidVLANPortGroup(bridge=bridge,
+                                                     expected=vswitch_associated,
+                                                     actual=pg_vswitch)
+
+            # Check if the vlan id is proper for the port group
+            if pg_vlanid != vlan_num:
+                raise exception.InvalidVLANTag(bridge=bridge, tag=vlan_num,
+                                               pgroup=pg_vlanid)
+
+
+    def unplug(self, instance, network, mapping):
+        pass
+
-- 
cgit 


From 0c66b0b8caad7437fa2afd64a2038bcb166c83a5 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Wed, 20 Jul 2011 21:34:30 +0900
Subject: Merged get_configurations and plug of VIF drivers

---
 nova/compute/manager.py         | 2 --
 nova/virt/libvirt/connection.py | 3 +--
 nova/virt/libvirt/vif.py        | 9 ++++-----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 98f3cc86f..2ade43503 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -299,7 +299,6 @@ class ComputeManager(manager.SchedulerDependentManager):
                 network_info = self.network_api.allocate_for_instance(context,
                                                          instance, vpn=is_vpn)
                 LOG.debug(_("instance network_info: |%s|"), network_info)
-                self.driver.plug_vifs(context, instance, network_info)
             else:
                 # TODO(tr3buchet) not really sure how this should be handled.
                 # virt requires network_info to be passed in but stub_network
@@ -646,7 +645,6 @@ class ComputeManager(manager.SchedulerDependentManager):
                                    'rescuing')
         network_info = self.network_api.get_instance_nw_info(context,
                                                              instance_ref)
-        self.driver.plug_vifs(context, instance_ref, network_info)
         _update_state = lambda result: self._update_state_callback(
                 self, context, instance_id, result)
         self.driver.rescue(instance_ref, _update_state, network_info)
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 5f347989c..5cedcf2c1 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -966,8 +966,7 @@ class LibvirtConnection(driver.ComputeDriver):
 
         nics = []
         for (network, mapping) in network_info:
-            nics.append(self.vif_driver.get_configurations(instance, network,
-                                                           mapping))
+            nics.append(self.vif_driver.plug(instance, network, mapping))
         # FIXME(vish): stick this in db
         inst_type_id = instance['instance_type_id']
         inst_type = instance_types.get_instance_type(inst_type_id)
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index 820055cf0..d35a3c8f6 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -33,7 +33,7 @@ flags.DEFINE_bool('allow_project_net_traffic',
 class LibvirtBridge(object):
     """Linux bridge VIF for Libvirt."""
 
-    def get_configurations(self, instance, network, mapping):
+    def get_configurations(self, network, mapping):
         """Get a dictionary of VIF configurations for bridge type."""
         # Assume that the gateway also acts as the dhcp server.
         dhcp_server = mapping['gateway']
@@ -76,6 +76,7 @@ class LibvirtBridgeDriver(VIFDriver, LibvirtBridge):
         """Ensure that the bridge exists, and add VIF to it."""
         linux_net.ensure_bridge(network['bridge'],
                                 network['bridge_interface'])
+        return self.get_configurations(network, mapping)
 
     def unplug(self, instance, network, mapping):
         pass
@@ -88,6 +89,7 @@ class LibvirtVlanBridgeDriver(VIFDriver, LibvirtBridge):
         """Ensure that VLAN and bridge exist and add VIF to the bridge."""
         linux_net.ensure_vlan_bridge(network['vlan'], network['bridge'],
                                      network['bridge_interface'])
+        return self.get_configurations(network, mapping)
 
     def unplug(self, instance, network, mapping):
         pass
@@ -96,7 +98,7 @@ class LibvirtVlanBridgeDriver(VIFDriver, LibvirtBridge):
 class LibvirtOpenVswitchDriver(VIFDriver):
     """VIF driver for Open vSwitch."""
 
-    def get_configurations(self, instance, network, mapping):
+    def plug(self, instance, network, mapping):
         vif_id = str(instance['id']) + "-" + str(network['id'])
         dev = "tap-%s" % vif_id
         utils.execute('sudo', 'ip', 'tuntap', 'add', dev, 'mode', 'tap')
@@ -115,9 +117,6 @@ class LibvirtOpenVswitchDriver(VIFDriver):
         print "using result = %s" % str(result)
         return result
 
-    def plug(self, instance, network, mapping):
-        pass
-
     def unplug(self, instance, network, mapping):
         vif_id = str(instance['id']) + "-" + str(network['id'])
         dev = "tap-%s" % vif_id
-- 
cgit 


From 27d8dc42120d3cefc91bf6510f215dfdef7f23d2 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Wed, 20 Jul 2011 22:21:48 +0900
Subject: Removed unnecessary context parameter

---
 nova/compute/manager.py         | 2 +-
 nova/virt/driver.py             | 5 +++++
 nova/virt/libvirt/connection.py | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 2ade43503..cc5cf747c 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -1212,7 +1212,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         max_retry = FLAGS.live_migration_retry_count
         for cnt in range(max_retry):
             try:
-                self.driver.plug_vifs(context, instance_ref, network_info)
+                self.driver.plug_vifs(instance_ref, network_info)
                 break
             except exception.ProcessExecutionError:
                 if cnt == max_retry - 1:
diff --git a/nova/virt/driver.py b/nova/virt/driver.py
index 61f26ad96..e8dcf138b 100644
--- a/nova/virt/driver.py
+++ b/nova/virt/driver.py
@@ -253,3 +253,8 @@ class ComputeDriver(object):
     def set_host_enabled(self, host, enabled):
         """Sets the specified host's ability to accept new instances."""
         raise NotImplementedError()
+
+    def plug_vifs(self, instance, network_info):
+        """Plugs in VIFs to networks."""
+        raise NotImplementedError()
+
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 5cedcf2c1..3f6230e95 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -259,7 +259,7 @@ class LibvirtConnection(driver.ComputeDriver):
             infos.append(info)
         return infos
 
-    def plug_vifs(self, ctxt, instance, network_info):
+    def plug_vifs(self, instance, network_info):
         """Plugin VIFs into networks."""
         for (network, mapping) in network_info:
             self.vif_driver.plug(instance, network, mapping)
@@ -493,6 +493,7 @@ class LibvirtConnection(driver.ComputeDriver):
         # better because we cannot ensure flushing dirty buffers
         # in the guest OS. But, in case of KVM, shutdown() does not work...
         self.destroy(instance, network_info, cleanup=False)
+        self.plug_vifs(instance, network_info)
         self.firewall_driver.setup_basic_filtering(instance)
         self.firewall_driver.prepare_instance_filter(instance)
         self._create_new_domain(xml)
-- 
cgit 


From 2bfa91575d36363b16c25c29623f7ac988e844bb Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Wed, 20 Jul 2011 22:22:07 +0900
Subject: First attempt at vmware API VIF driver integration

---
 nova/virt/vmwareapi/vmops.py | 29 ++++++++++++++++++++++++++---
 nova/virt/vmwareapi_conn.py  |  9 ++++++---
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/nova/virt/vmwareapi/vmops.py b/nova/virt/vmwareapi/vmops.py
index 94d9e6226..eded4391e 100644
--- a/nova/virt/vmwareapi/vmops.py
+++ b/nova/virt/vmwareapi/vmops.py
@@ -31,6 +31,7 @@ from nova import db
 from nova import exception
 from nova import flags
 from nova import log as logging
+from nova import utils
 from nova.compute import power_state
 from nova.virt.vmwareapi import vim_util
 from nova.virt.vmwareapi import vm_util
@@ -38,6 +39,10 @@ from nova.virt.vmwareapi import vmware_images
 from nova.virt.vmwareapi import network_utils
 
 FLAGS = flags.FLAGS
+flags.DEFINE_string('vmware_vif_driver',
+                    'nova.virt.vmwareapi.vif.VMWareVlanBridgeDriver',
+                    'The VMWare VIF driver to configure the VIFs.')
+
 LOG = logging.getLogger("nova.virt.vmwareapi.vmops")
 
 VMWARE_POWER_STATES = {
@@ -52,6 +57,7 @@ class VMWareVMOps(object):
     def __init__(self, session):
         """Initializer."""
         self._session = session
+        self._vif_driver = utils.import_object(FLAGS.vmware_vif_driver)
 
     def _wait_with_callback(self, instance_id, task, callback):
         """Waits for the task to finish and does a callback after."""
@@ -83,7 +89,7 @@ class VMWareVMOps(object):
         LOG.debug(_("Got total of %s instances") % str(len(lst_vm_names)))
         return lst_vm_names
 
-    def spawn(self, instance):
+    def spawn(self, instance, network_info):
         """
         Creates a VM instance.
 
@@ -117,6 +123,7 @@ class VMWareVMOps(object):
             if network_ref is None:
                 raise exception.NetworkNotFoundForBridge(bridge=net_name)
 
+        self.plug_vifs(instance, network_info)
         _check_if_network_bridge_exists()
 
         def _get_datastore_ref():
@@ -472,11 +479,14 @@ class VMWareVMOps(object):
 
         _clean_temp_data()
 
-    def reboot(self, instance):
+    def reboot(self, instance, network_info):
         """Reboot a VM instance."""
         vm_ref = self._get_vm_ref_from_the_name(instance.name)
         if vm_ref is None:
             raise exception.InstanceNotFound(instance_id=instance.id)
+
+        self.plug_vifs(instance, network_info)
+
         lst_properties = ["summary.guest.toolsStatus", "runtime.powerState",
                           "summary.guest.toolsRunningStatus"]
         props = self._session._call_method(vim_util, "get_object_properties",
@@ -514,7 +524,7 @@ class VMWareVMOps(object):
             self._session._wait_for_task(instance.id, reset_task)
             LOG.debug(_("Did hard reboot of VM %s") % instance.name)
 
-    def destroy(self, instance):
+    def destroy(self, instance, network_info):
         """
         Destroy a VM instance. Steps followed are:
         1. Power off the VM, if it is in poweredOn state.
@@ -560,6 +570,8 @@ class VMWareVMOps(object):
                 LOG.warn(_("In vmwareapi:vmops:destroy, got this exception"
                            " while un-registering the VM: %s") % str(excep))
 
+            self._unplug_vifs(instance, network_info)
+
             # Delete the folder holding the VM related content on
             # the datastore.
             try:
@@ -784,3 +796,14 @@ class VMWareVMOps(object):
             if vm.propSet[0].val == vm_name:
                 return vm.obj
         return None
+
+    def plug_vifs(self, instance, network_info):
+        """Plug VIFs into networks."""
+        for (network, mapping) in network_info:
+            self._vif_driver.plug(instance, network, mapping)
+
+    def _unplug_vifs(self, instance, network_info):
+        """Unplug VIFs from networks."""
+        for (network, mapping) in network_info:
+            self._vif_driver.unplug(instance, network, mapping)
+
diff --git a/nova/virt/vmwareapi_conn.py b/nova/virt/vmwareapi_conn.py
index 9e15510ab..2492c9951 100644
--- a/nova/virt/vmwareapi_conn.py
+++ b/nova/virt/vmwareapi_conn.py
@@ -126,7 +126,7 @@ class VMWareESXConnection(driver.ComputeDriver):
 
     def spawn(self, instance, network_info, block_device_mapping=None):
         """Create VM instance."""
-        self._vmops.spawn(instance)
+        self._vmops.spawn(instance, network_info)
 
     def snapshot(self, instance, name):
         """Create snapshot from a running VM instance."""
@@ -134,11 +134,11 @@ class VMWareESXConnection(driver.ComputeDriver):
 
     def reboot(self, instance, network_info):
         """Reboot VM instance."""
-        self._vmops.reboot(instance)
+        self._vmops.reboot(instance, network_info)
 
     def destroy(self, instance, network_info):
         """Destroy VM instance."""
-        self._vmops.destroy(instance)
+        self._vmops.destroy(instance, network_info)
 
     def pause(self, instance, callback):
         """Pause VM instance."""
@@ -194,6 +194,9 @@ class VMWareESXConnection(driver.ComputeDriver):
         """Sets the specified host's ability to accept new instances."""
         pass
 
+    def plug_vifs(self, instance, network_info):
+        """Plugs in VIFs to networks."""
+        self._vmops.plug_vifs(instance, network_info)
 
 class VMWareAPISession(object):
     """
-- 
cgit 


From 2bf85d9151771aa4ca5c1201cadbb255db85643f Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Thu, 21 Jul 2011 02:26:31 +0900
Subject: Created _get_instance_nw_info method to clean up duplicate code

---
 nova/compute/manager.py | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index cc5cf747c..326880b1c 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -212,6 +212,15 @@ class ComputeManager(manager.SchedulerDependentManager):
         """This call passes straight through to the virtualization driver."""
         return self.driver.refresh_provider_fw_rules()
 
+    def _get_instance_nw_info(self, context, instance):
+        """Get a list of dictionaries of network data of an instance.
+        Returns an empty list if stub_network flag is set."""
+        network_info = []
+        if not FLAGS.stub_network:
+            network_info = self.network_api.get_instance_nw_info(context,
+                                                                 instance)
+        return network_info
+
     def _setup_block_device_mapping(self, context, instance_id):
         """setup volumes for block device mapping"""
         self.db.instance_set_state(context,
@@ -352,10 +361,8 @@ class ComputeManager(manager.SchedulerDependentManager):
                   {'action_str': action_str, 'instance_id': instance_id},
                   context=context)
 
-        network_info = None
+        network_info = self._get_instance_nw_info(context, instance)
         if not FLAGS.stub_network:
-            network_info = self.network_api.get_instance_nw_info(context,
-                                                                 instance)
             self.network_api.deallocate_for_instance(context, instance)
 
         volumes = instance.get('volumes') or []
@@ -412,8 +419,8 @@ class ComputeManager(manager.SchedulerDependentManager):
 
         self._update_state(context, instance_id, power_state.BUILDING)
 
-        network_info = self.network_api.get_instance_nw_info(context,
-                                                             instance_ref)
+        network_info = self._get_instance_nw_info(context, instance_ref)
+
         self.driver.destroy(instance_ref, network_info)
         image_ref = kwargs.get('image_ref')
         instance_ref.image_ref = image_ref
@@ -451,8 +458,7 @@ class ComputeManager(manager.SchedulerDependentManager):
                                    instance_id,
                                    power_state.NOSTATE,
                                    'rebooting')
-        network_info = self.network_api.get_instance_nw_info(context,
-                                                             instance_ref)
+        network_info = self._get_instance_nw_info(context, instance_ref)
         self.driver.reboot(instance_ref, network_info)
         self._update_state(context, instance_id)
 
@@ -643,10 +649,9 @@ class ComputeManager(manager.SchedulerDependentManager):
                                    instance_id,
                                    power_state.NOSTATE,
                                    'rescuing')
-        network_info = self.network_api.get_instance_nw_info(context,
-                                                             instance_ref)
         _update_state = lambda result: self._update_state_callback(
                 self, context, instance_id, result)
+        network_info = self._get_instance_nw_info(context, instance_ref)
         self.driver.rescue(instance_ref, _update_state, network_info)
         self._update_state(context, instance_id)
 
@@ -663,8 +668,7 @@ class ComputeManager(manager.SchedulerDependentManager):
                                    'unrescuing')
         _update_state = lambda result: self._update_state_callback(
                 self, context, instance_id, result)
-        network_info = self.network_api.get_instance_nw_info(context,
-                                                             instance_ref)
+        network_info = self._get_instance_nw_info(context, instance_ref)
         self.driver.unrescue(instance_ref, _update_state, network_info)
         self._update_state(context, instance_id)
 
@@ -680,8 +684,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         context = context.elevated()
         instance_ref = self.db.instance_get(context, instance_id)
 
-        network_info = self.network_api.get_instance_nw_info(context,
-                                                             instance_ref)
+        network_info = self._get_instance_nw_info(context, instance_ref)
         self.driver.destroy(instance_ref, network_info)
         usage_info = utils.usage_from_instance(instance_ref)
         notifier.notify('compute.%s' % self.host,
@@ -701,8 +704,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         instance_ref = self.db.instance_get(context, instance_id)
         migration_ref = self.db.migration_get(context, migration_id)
 
-        network_info = self.network_api.get_instance_nw_info(context,
-                                                             instance_ref)
+        network_info = self._get_instance_nw_info(context, instance_ref)
         self.driver.destroy(instance_ref, network_info)
         topic = self.db.queue_get_for(context, FLAGS.compute_topic,
                 instance_ref['host'])
@@ -837,8 +839,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         # reload the updated instance ref
         # FIXME(mdietz): is there reload functionality?
         instance = self.db.instance_get(context, instance_id)
-        network_info = self.network_api.get_instance_nw_info(context,
-                                                             instance)
+        network_info = self._get_instance_nw_info(context, instance)
         self.driver.finish_resize(instance, disk_info, network_info)
 
         self.db.migration_update(context, migration_id,
@@ -988,8 +989,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         LOG.debug(_('instance %s: inject network info'), instance_id,
                                                          context=context)
         instance = self.db.instance_get(context, instance_id)
-        network_info = self.network_api.get_instance_nw_info(context,
-                                                             instance)
+        network_info = self._get_instance_nw_info(context, instance)
         LOG.debug(_("network_info to inject: |%s|"), network_info)
 
         self.driver.inject_network_info(instance, network_info)
@@ -1207,8 +1207,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         #
         # Retry operation is necessary because continuously request comes,
         # concorrent request occurs to iptables, then it complains.
-        network_info = self.network_api.get_instance_nw_info(context,
-                                                             instance_ref)
+        network_info = self._get_instance_nw_info(context, instance_ref)
         max_retry = FLAGS.live_migration_retry_count
         for cnt in range(max_retry):
             try:
-- 
cgit 


From 53506549e285ee85cb1911670a8ff24ccdd32d5c Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Thu, 21 Jul 2011 02:26:58 +0900
Subject: Made the compute unit tests to pass

---
 nova/tests/test_compute.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index 2900c594e..9d6d2da54 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -569,7 +569,6 @@ class ComputeTestCase(test.TestCase):
         self._setup_other_managers()
         dbmock = self.mox.CreateMock(db)
         volmock = self.mox.CreateMock(self.volume_manager)
-        netmock = self.mox.CreateMock(self.network_manager)
         drivermock = self.mox.CreateMock(self.compute_driver)
 
         dbmock.instance_get(c, i_ref['id']).AndReturn(i_ref)
@@ -577,12 +576,11 @@ class ComputeTestCase(test.TestCase):
         for i in range(len(i_ref['volumes'])):
             vid = i_ref['volumes'][i]['id']
             volmock.setup_compute_volume(c, vid).InAnyOrder('g1')
-        netmock.setup_compute_network(c, i_ref['id'])
+        drivermock.plug_vifs(i_ref, [])
         drivermock.ensure_filtering_rules_for_instance(i_ref)
 
         self.compute.db = dbmock
         self.compute.volume_manager = volmock
-        self.compute.network_manager = netmock
         self.compute.driver = drivermock
 
         self.mox.ReplayAll()
@@ -597,18 +595,16 @@ class ComputeTestCase(test.TestCase):
 
         self._setup_other_managers()
         dbmock = self.mox.CreateMock(db)
-        netmock = self.mox.CreateMock(self.network_manager)
         drivermock = self.mox.CreateMock(self.compute_driver)
 
         dbmock.instance_get(c, i_ref['id']).AndReturn(i_ref)
         dbmock.instance_get_fixed_addresses(c, i_ref['id']).AndReturn('dummy')
         self.mox.StubOutWithMock(compute_manager.LOG, 'info')
         compute_manager.LOG.info(_("%s has no volume."), i_ref['hostname'])
-        netmock.setup_compute_network(c, i_ref['id'])
+        drivermock.plug_vifs(i_ref, [])
         drivermock.ensure_filtering_rules_for_instance(i_ref)
 
         self.compute.db = dbmock
-        self.compute.network_manager = netmock
         self.compute.driver = drivermock
 
         self.mox.ReplayAll()
@@ -629,18 +625,20 @@ class ComputeTestCase(test.TestCase):
         dbmock = self.mox.CreateMock(db)
         netmock = self.mox.CreateMock(self.network_manager)
         volmock = self.mox.CreateMock(self.volume_manager)
+        drivermock = self.mox.CreateMock(self.compute_driver)
 
         dbmock.instance_get(c, i_ref['id']).AndReturn(i_ref)
         dbmock.instance_get_fixed_addresses(c, i_ref['id']).AndReturn('dummy')
         for i in range(len(i_ref['volumes'])):
             volmock.setup_compute_volume(c, i_ref['volumes'][i]['id'])
         for i in range(FLAGS.live_migration_retry_count):
-            netmock.setup_compute_network(c, i_ref['id']).\
+            drivermock.plug_vifs(i_ref, []).\
                 AndRaise(exception.ProcessExecutionError())
 
         self.compute.db = dbmock
         self.compute.network_manager = netmock
         self.compute.volume_manager = volmock
+        self.compute.driver = drivermock
 
         self.mox.ReplayAll()
         self.assertRaises(exception.ProcessExecutionError,
-- 
cgit 


From cea17225c9a568e97f55287edf7510ebcfbae301 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Thu, 21 Jul 2011 02:57:52 +0900
Subject: Moved back allow_project_net_traffic to libvirt conn

---
 nova/virt/libvirt/connection.py | 3 +++
 nova/virt/libvirt/vif.py        | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 3f6230e95..c2a867e30 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -96,6 +96,9 @@ flags.DEFINE_string('libvirt_uri',
                     '',
                     'Override the default libvirt URI (which is dependent'
                     ' on libvirt_type)')
+flags.DEFINE_bool('allow_project_net_traffic',
+                  True,
+                  'Whether to allow in project network traffic')
 flags.DEFINE_bool('use_cow_images',
                   True,
                   'Whether to use cow images')
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index d35a3c8f6..3d9b234b8 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -25,9 +25,6 @@ from nova import utils
 from nova.virt.vif import VIFDriver
 
 FLAGS = flags.FLAGS
-flags.DEFINE_bool('allow_project_net_traffic',
-                  True,
-                  'Whether to allow in project network traffic')
 
 
 class LibvirtBridge(object):
-- 
cgit 


From 38371fe9c073990ecf722dc3983d4d8fa968b198 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Thu, 21 Jul 2011 02:58:42 +0900
Subject: Made all but one test pass for libvirt

---
 nova/tests/test_libvirt.py | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index f99e1713d..4878ed8d1 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -54,9 +54,13 @@ def _create_network_info(count=1, ipv6=None):
     fake_ip = '0.0.0.0/0'
     fake_ip_2 = '0.0.0.1/0'
     fake_ip_3 = '0.0.0.1/0'
+    fake_vlan = 100
+    fake_bridge_interface = 'eth0'
     network = {'bridge': fake,
                'cidr': fake_ip,
-               'cidr_v6': fake_ip}
+               'cidr_v6': fake_ip,
+               'vlan': fake_vlan,
+               'bridge_interface': fake_bridge_interface}
     mapping = {'mac': fake,
                'gateway': fake,
                'gateway6': fake,
@@ -218,9 +222,19 @@ class LibvirtConnTestCase(test.TestCase):
             def setattr(self, key, val):
                 self.__setattr__(key, val)
 
+        # A fake VIF driver
+        class FakeVIFDriver(object):
+
+            def __init__(self, **kwargs):
+                pass
+
+            def setattr(self, key, val):
+                self.__setattr__(key, val)
+
         # Creating mocks
         fake = FakeLibvirtConnection()
         fakeip = FakeIptablesFirewallDriver
+        fakevif = FakeVIFDriver()
         # Customizing above fake if necessary
         for key, val in kwargs.items():
             fake.__setattr__(key, val)
@@ -228,6 +242,8 @@ class LibvirtConnTestCase(test.TestCase):
         # Inevitable mocks for connection.LibvirtConnection
         self.mox.StubOutWithMock(connection.utils, 'import_class')
         connection.utils.import_class(mox.IgnoreArg()).AndReturn(fakeip)
+        self.mox.StubOutWithMock(connection.utils, 'import_object')
+        connection.utils.import_object(mox.IgnoreArg()).AndReturn(fakevif)
         self.mox.StubOutWithMock(connection.LibvirtConnection, '_conn')
         connection.LibvirtConnection._conn = fake
 
@@ -279,22 +295,6 @@ class LibvirtConnTestCase(test.TestCase):
                                         _create_network_info(2))
         self.assertTrue(len(result['nics']) == 2)
 
-    def test_get_nic_for_xml_v4(self):
-        conn = connection.LibvirtConnection(True)
-        network, mapping = _create_network_info()[0]
-        self.flags(use_ipv6=False)
-        params = conn._get_nic_for_xml(network, mapping)['extra_params']
-        self.assertTrue(params.find('PROJNETV6') == -1)
-        self.assertTrue(params.find('PROJMASKV6') == -1)
-
-    def test_get_nic_for_xml_v6(self):
-        conn = connection.LibvirtConnection(True)
-        network, mapping = _create_network_info()[0]
-        self.flags(use_ipv6=True)
-        params = conn._get_nic_for_xml(network, mapping)['extra_params']
-        self.assertTrue(params.find('PROJNETV6') > -1)
-        self.assertTrue(params.find('PROJMASKV6') > -1)
-
     @test.skip_test("skipping libvirt tests depends on get_network_info shim")
     def test_xml_and_uri_no_ramdisk_no_kernel(self):
         instance_data = dict(self.test_instance)
-- 
cgit 


From 22f6b3d99c94a4bdfb031767f86b3aee4396aa70 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Thu, 21 Jul 2011 03:20:07 +0900
Subject: Added Dan Wendlandt to Authors, and fixed failing network unit tests

---
 Authors                    | 1 +
 nova/tests/test_network.py | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Authors b/Authors
index 15599b0e1..32bae4f43 100644
--- a/Authors
+++ b/Authors
@@ -18,6 +18,7 @@ Christian Berendt <berendt@b1-systems.de>
 Chuck Short <zulcss@ubuntu.com>
 Cory Wright <corywright@gmail.com>
 Dan Prince <dan.prince@rackspace.com>
+Dan Wendlandt <dan@nicira.com>
 Dave Walker <DaveWalker@ubuntu.com>
 David Pravec <David.Pravec@danix.org>
 Dean Troyer <dtroyer@gmail.com>
diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py
index b09021e13..3ced1e5c4 100644
--- a/nova/tests/test_network.py
+++ b/nova/tests/test_network.py
@@ -159,7 +159,9 @@ class FlatNetworkTestCase(test.TestCase):
                      'cidr': '192.168.%s.0/24' % i,
                      'cidr_v6': '2001:db%s::/64' % i8,
                      'id': i,
-                     'injected': 'DONTCARE'}
+                     'injected': 'DONTCARE',
+                     'bridge_interface': 'fake_fa%s' % i,
+                     'vlan': None}
 
             self.assertDictMatch(nw[0], check)
 
-- 
cgit 


From 2b8cc5f98435423eb2b8bc42bcb7e9c38e453c34 Mon Sep 17 00:00:00 2001
From: danwent <danwent@dan-xs3-cs>
Date: Wed, 20 Jul 2011 13:03:27 -0700
Subject: update for ryu's naming changes, fix some bugs.  tested with
 OVSDriver only so far

---
 nova/virt/xenapi/vmops.py | 32 +++++++++++++++++++-------------
 nova/virt/xenapi_conn.py  |  6 +++---
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 26f90fedd..f88715c50 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -81,8 +81,9 @@ class VMOps(object):
         self._session = session
         self.poll_rescue_last_ran = None
         VMHelper.XenAPI = self.XenAPI
+        print "loading vif_driver = %s" % FLAGS.xenapi_vif_driver
         self.vif_driver = utils.import_object(FLAGS.xenapi_vif_driver)
-
+        print "driver class = %s" % str(self.vif_driver)
     def list_instances(self):
         """List VM instances."""
         # TODO(justinsb): Should we just always use the details method?
@@ -473,7 +474,7 @@ class VMOps(object):
                     self._session, instance, template_vdi_uuids, image_id)
         finally:
             if template_vm_ref:
-                self._destroy(instance, template_vm_ref,
+                self._destroy(instance, template_vm_ref, None,
                         shutdown=False, destroy_kernel_ramdisk=False)
 
         logging.debug(_("Finished snapshot and upload for VM %s"), instance)
@@ -843,7 +844,7 @@ class VMOps(object):
 
         self._session.call_xenapi("Async.VM.destroy", rescue_vm_ref)
 
-    def destroy(self, instance):
+    def destroy(self, instance, network_info):
         """Destroy VM instance.
 
         This is the method exposed by xenapi_conn.destroy(). The rest of the
@@ -853,9 +854,9 @@ class VMOps(object):
         instance_id = instance.id
         LOG.info(_("Destroying VM for Instance %(instance_id)s") % locals())
         vm_ref = VMHelper.lookup(self._session, instance.name)
-        return self._destroy(instance, vm_ref, shutdown=True)
+        return self._destroy(instance, vm_ref, network_info, shutdown=True)
 
-    def _destroy(self, instance, vm_ref, shutdown=True,
+    def _destroy(self, instance, vm_ref, network_info, shutdown=True,
                  destroy_kernel_ramdisk=True):
         """Destroys VM instance by performing:
 
@@ -877,9 +878,14 @@ class VMOps(object):
             self._destroy_kernel_ramdisk(instance, vm_ref)
         self._destroy_vm(instance, vm_ref)
 
-        networks = db.network_get_all_by_instance(ctxt, instance['id'])
-        for network in networks:
-            self.vif_driver.unplug(network)
+        if network_info:
+            try:
+                for (network, mapping) in network_info:
+                    self.vif_driver.unplug(instance, network, mapping)
+            except:
+                LOG.warning("Failed while unplugging vif of instance '%s'" % \
+                    instance['name'])
+                raise
 
 
     def _wait_with_callback(self, instance_id, task, callback):
@@ -1088,17 +1094,17 @@ class VMOps(object):
         for device, (network, info) in enumerate(network_info):
             vif_rec = self.vif_driver.get_vif_rec(self._session,
                     vm_ref, instance, device, network, info)
+            network_ref = vif_rec['network']
             LOG.debug(_('Creating VIF for VM %(vm_ref)s,' \
                 ' network %(network_ref)s.') % locals())
-            vif_ref = session.call_xenapi('VIF.create', vif_rec)
+            vif_ref = self._session.call_xenapi('VIF.create', vif_rec)
             LOG.debug(_('Created VIF %(vif_ref)s for VM %(vm_ref)s,'
                 ' network %(network_ref)s.') % locals())
 
-    def setup_vif_network(self, ctxt, instance_id):
+    def plug_vifs(instance, network_info):
         """Set up VIF networking on the host."""
-        networks = db.network_get_all_by_instance(ctxt, instance_id)
-        for network in networks:
-            self.vif_driver.plug(network)
+        for (network, mapping) in network_info:
+            self.vif_driver.plug(self._session, instance, network, mapping)
 
     def reset_network(self, instance, vm_ref=None):
         """Creates uuid arg to pass to make_agent_call and calls it."""
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index 10a532ea0..102278e1c 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -226,7 +226,7 @@ class XenAPIConnection(driver.ComputeDriver):
 
     def destroy(self, instance, network_info):
         """Destroy VM instance"""
-        self._vmops.destroy(instance)
+        self._vmops.destroy(instance, network_info)
 
     def pause(self, instance, callback):
         """Pause VM instance"""
@@ -269,8 +269,8 @@ class XenAPIConnection(driver.ComputeDriver):
         """inject network info for specified instance"""
         self._vmops.inject_network_info(instance, network_info)
 
-    def setup_vif_network(self, ctxt, instance_id):
-        self._vmops.setup_vif_network(ctxt, instance_id)
+    def plug_vifs(self, instance_ref, network_info):
+        self._vmops.plug_vifs(instance_ref, network_info)
 
     def get_info(self, instance_id):
         """Return data about VM instance"""
-- 
cgit 


From 407e30e4843d27943e38374d61525805236319d2 Mon Sep 17 00:00:00 2001
From: Dan Wendlandt <dan@nicira.com>
Date: Wed, 20 Jul 2011 13:10:25 -0700
Subject: remove debug prints

---
 nova/virt/xenapi/vmops.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index f88715c50..bdf471d16 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -81,9 +81,8 @@ class VMOps(object):
         self._session = session
         self.poll_rescue_last_ran = None
         VMHelper.XenAPI = self.XenAPI
-        print "loading vif_driver = %s" % FLAGS.xenapi_vif_driver
         self.vif_driver = utils.import_object(FLAGS.xenapi_vif_driver)
-        print "driver class = %s" % str(self.vif_driver)
+
     def list_instances(self):
         """List VM instances."""
         # TODO(justinsb): Should we just always use the details method?
-- 
cgit 


From e3abccb611345d61584569114a4929e751de14ae Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Thu, 21 Jul 2011 16:17:23 +0900
Subject: Combined bridige and vlan VIF driver to allow better transition for
 current Nova users

---
 nova/network/manager.py  | 29 ++++++++++++++++++++++++++++-
 nova/virt/libvirt/vif.py | 46 +++++++++++++++++++++-------------------------
 2 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/nova/network/manager.py b/nova/network/manager.py
index d11aa4135..25490bf39 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -478,7 +478,9 @@ class NetworkManager(manager.SchedulerDependentManager):
                 'mac': vif['address'],
                 'rxtx_cap': flavor['rxtx_cap'],
                 'dns': [network['dns']],
-                'ips': [ip_dict(ip) for ip in network_IPs]}
+                'ips': [ip_dict(ip) for ip in network_IPs],
+                'create_bridge': self._create_bridge,
+                'create_vlan': self._create_vlan}
             if network['cidr_v6']:
                 info['ip6s'] = [ip6_dict()]
             # TODO(tr3buchet): handle ip6 routes here as well
@@ -696,6 +698,16 @@ class NetworkManager(manager.SchedulerDependentManager):
         """Sets up network on this host."""
         raise NotImplementedError()
 
+    @property
+    def _create_bridge(self):
+        """Indicate whether this manager requires VIF to create a bridge."""
+        return False
+
+    @property
+    def _create_vlan(self):
+        """Indicate whether this manager requires VIF to create a VLAN tag."""
+        return False
+
 
 class FlatManager(NetworkManager):
     """Basic network where no vlans are used.
@@ -783,6 +795,11 @@ class FlatDHCPManager(FloatingIP, RPCAllocateFixedIP, NetworkManager):
                 self.db.network_update(context, network_ref['id'],
                                        {'gateway_v6': gateway})
 
+    @property
+    def _create_bridge(self):
+        """Indicate whether this manager requires VIF to create a bridge."""
+        return True
+
 
 class VlanManager(RPCAllocateFixedIP, FloatingIP, NetworkManager):
     """Vlan network with dhcp.
@@ -899,3 +916,13 @@ class VlanManager(RPCAllocateFixedIP, FloatingIP, NetworkManager):
         """Number of reserved ips at the top of the range."""
         parent_reserved = super(VlanManager, self)._top_reserved_ips
         return parent_reserved + FLAGS.cnt_vpn_clients
+
+    @property
+    def _create_bridge(self):
+        """Indicate whether this manager requires VIF to create a bridge."""
+        return True
+
+    @property
+    def _create_vlan(self):
+        """Indicate whether this manager requires VIF to create a VLAN tag."""
+        return True
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index c43ce14e3..24634d7d2 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -19,20 +19,24 @@
 """VIF drivers for libvirt."""
 
 from nova import flags
+from nova import log as logging
 from nova.network import linux_net
 from nova.virt.libvirt import netutils
 from nova import utils
 from nova.virt.vif import VIFDriver
 
+LOG = logging.getLogger('nova.virt.libvirt.vif')
+
 FLAGS = flags.FLAGS
 
 flags.DEFINE_string('libvirt_ovs_integration_bridge', 'br-int',
 			'Name of Integration Bridge used by Open vSwitch')
 
-class LibvirtBridge(object):
-    """Linux bridge VIF for Libvirt."""
 
-    def get_configurations(self, network, mapping):
+class LibvirtBridgeDriver(VIFDriver):
+    """VIF driver for Linux bridge."""
+
+    def _get_configurations(self, network, mapping):
         """Get a dictionary of VIF configurations for bridge type."""
         # Assume that the gateway also acts as the dhcp server.
         gateway6 = mapping.get('gateway6')
@@ -66,32 +70,24 @@ class LibvirtBridge(object):
 
         return result
 
-
-class LibvirtBridgeDriver(VIFDriver, LibvirtBridge):
-    """VIF driver for Linux bridge."""
-
     def plug(self, instance, network, mapping):
         """Ensure that the bridge exists, and add VIF to it."""
-        if not network.get('multi_host'):
-            linux_net.ensure_bridge(network['bridge'],
-                                    network['bridge_interface'])
-        return self.get_configurations(network, mapping)
-
-    def unplug(self, instance, network, mapping):
-        pass
-
-
-class LibvirtVlanBridgeDriver(VIFDriver, LibvirtBridge):
-    """VIF driver for Linux bridge with VLAN."""
-
-    def plug(self, instance, network, mapping):
-        """Ensure that VLAN and bridge exist and add VIF to the bridge."""
-        if not network.get('multi_host'):
-            linux_net.ensure_vlan_bridge(network['vlan'], network['bridge'],
-                                         network['bridge_interface'])
-        return self.get_configurations(network, mapping)
+        if not network.get('multi_host') and mapping.get('create_bridge'):
+            if mapping.get('create_vlan'):
+                LOG.debug(_("Ensuring vlan %s and bridge %s") %
+                          (network['vlan'], network['bridge']))
+                linux_net.ensure_vlan_bridge(network['vlan'],
+                                             network['bridge'],
+                                             network['bridge_interface'])
+            else:
+                LOG.debug(_("Ensuring bridge %s") % network['bridge'])
+                linux_net.ensure_bridge(network['bridge'],
+                                        network['bridge_interface'])
+
+        return self._get_configurations(network, mapping)
 
     def unplug(self, instance, network, mapping):
+        """No manual unplugging required."""
         pass
 
 
-- 
cgit 


From 3b32c0270d6f61e0164185757ed97c82bda25600 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Thu, 21 Jul 2011 16:31:14 +0900
Subject: Fixed PEP8 issues

---
 nova/network/manager.py      |  1 -
 nova/virt/driver.py          |  1 -
 nova/virt/libvirt/vif.py     |  2 +-
 nova/virt/vmwareapi/vif.py   | 26 ++++++++++++++------------
 nova/virt/vmwareapi/vmops.py |  1 -
 nova/virt/vmwareapi_conn.py  |  1 +
 nova/virt/xenapi/vm_utils.py |  2 +-
 nova/virt/xenapi/vmops.py    |  1 -
 8 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/nova/network/manager.py b/nova/network/manager.py
index 25490bf39..ef96d48a7 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -780,7 +780,6 @@ class FlatDHCPManager(FloatingIP, RPCAllocateFixedIP, NetworkManager):
 
         self.driver.metadata_forward()
 
-
     def _setup_network(self, context, network_ref):
         """Sets up network on this host."""
         network_ref['dhcp_server'] = self._get_dhcp_ip(context, network_ref)
diff --git a/nova/virt/driver.py b/nova/virt/driver.py
index e8dcf138b..2faff0a1e 100644
--- a/nova/virt/driver.py
+++ b/nova/virt/driver.py
@@ -257,4 +257,3 @@ class ComputeDriver(object):
     def plug_vifs(self, instance, network_info):
         """Plugs in VIFs to networks."""
         raise NotImplementedError()
-
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index 24634d7d2..fdd12d2f4 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -30,7 +30,7 @@ LOG = logging.getLogger('nova.virt.libvirt.vif')
 FLAGS = flags.FLAGS
 
 flags.DEFINE_string('libvirt_ovs_integration_bridge', 'br-int',
-			'Name of Integration Bridge used by Open vSwitch')
+                    'Name of Integration Bridge used by Open vSwitch')
 
 
 class LibvirtBridgeDriver(VIFDriver):
diff --git a/nova/virt/vmwareapi/vif.py b/nova/virt/vmwareapi/vif.py
index 902699089..281565bbc 100644
--- a/nova/virt/vmwareapi/vif.py
+++ b/nova/virt/vmwareapi/vif.py
@@ -53,7 +53,8 @@ class VMWareVlanBridgeDriver(VIFDriver):
         session = VMWareAPISession(host_ip, host_username, host_password,
                                    FLAGS.vmwareapi_api_retry_count)
         vlan_interface = bridge_interface
-        # Check if the vlan_interface physical network adapter exists on the host
+        # Check if the vlan_interface physical network adapter exists on the
+        # host.
         if not network_utils.check_if_vlan_interface_exists(session,
                                                             vlan_interface):
             raise exception.NetworkAdapterNotFound(adapter=vlan_interface)
@@ -62,32 +63,33 @@ class VMWareVlanBridgeDriver(VIFDriver):
         vswitch_associated = network_utils.get_vswitch_for_vlan_interface(
                                             session, vlan_interface)
         if vswitch_associated is None:
-            raise exception.SwicthNotFoundForNetworkAdapter(adapter=vlan_interface)
+            raise exception.SwicthNotFoundForNetworkAdapter(
+                adapter=vlan_interface)
         # Check whether bridge already exists and retrieve the the ref of the
         # network whose name_label is "bridge"
         network_ref = network_utils.get_network_with_the_name(session, bridge)
         if network_ref is None:
-            # Create a port group on the vSwitch associated with the vlan_interface
-            # corresponding physical network adapter on the ESX host
-            network_utils.create_port_group(session, bridge, vswitch_associated,
-                                    vlan_num)
+            # Create a port group on the vSwitch associated with the
+            # vlan_interface corresponding physical network adapter on the ESX
+            # host.
+            network_utils.create_port_group(session, bridge,
+                                            vswitch_associated, vlan_num)
         else:
             # Get the vlan id and vswitch corresponding to the port group
             pg_vlanid, pg_vswitch = \
-                network_utils.get_vlanid_and_vswitch_for_portgroup(session, bridge)
+                network_utils.get_vlanid_and_vswitch_for_portgroup(session,
+                                                                   bridge)
 
             # Check if the vswitch associated is proper
             if pg_vswitch != vswitch_associated:
-                raise exception.InvalidVLANPortGroup(bridge=bridge,
-                                                     expected=vswitch_associated,
-                                                     actual=pg_vswitch)
+                raise exception.InvalidVLANPortGroup(
+                    bridge=bridge, expected=vswitch_associated,
+                    actual=pg_vswitch)
 
             # Check if the vlan id is proper for the port group
             if pg_vlanid != vlan_num:
                 raise exception.InvalidVLANTag(bridge=bridge, tag=vlan_num,
                                                pgroup=pg_vlanid)
 
-
     def unplug(self, instance, network, mapping):
         pass
-
diff --git a/nova/virt/vmwareapi/vmops.py b/nova/virt/vmwareapi/vmops.py
index eded4391e..6cc130809 100644
--- a/nova/virt/vmwareapi/vmops.py
+++ b/nova/virt/vmwareapi/vmops.py
@@ -806,4 +806,3 @@ class VMWareVMOps(object):
         """Unplug VIFs from networks."""
         for (network, mapping) in network_info:
             self._vif_driver.unplug(instance, network, mapping)
-
diff --git a/nova/virt/vmwareapi_conn.py b/nova/virt/vmwareapi_conn.py
index 2492c9951..ce57847b2 100644
--- a/nova/virt/vmwareapi_conn.py
+++ b/nova/virt/vmwareapi_conn.py
@@ -198,6 +198,7 @@ class VMWareESXConnection(driver.ComputeDriver):
         """Plugs in VIFs to networks."""
         self._vmops.plug_vifs(instance, network_info)
 
+
 class VMWareAPISession(object):
     """
     Sets up a session with the ESX host and handles all
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index e63582b54..62863c6d8 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -282,7 +282,6 @@ class VMHelper(HelperBase):
             LOG.exception(exc)
             raise StorageError(_('Unable to destroy VDI %s') % vdi_ref)
 
-
     @classmethod
     def create_vdi(cls, session, sr_ref, name_label, virtual_size, read_only):
         """Create a VDI record and returns its reference."""
@@ -1095,6 +1094,7 @@ def _stream_disk(dev, image_type, virtual_size, image_file):
         for chunk in image_file:
             f.write(chunk)
 
+
 def _write_partition(virtual_size, dev):
     dest = '/dev/%s' % dev
     primary_first = MBR_SIZE_SECTORS
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index ad90e38e9..4fa59b6b7 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -884,7 +884,6 @@ class VMOps(object):
                     instance['name'])
                 raise
 
-
     def _wait_with_callback(self, instance_id, task, callback):
         ret = None
         try:
-- 
cgit 


From b2b378748aa859bab63c65fe88aa45081945b3c6 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Thu, 21 Jul 2011 18:41:32 +0900
Subject: Changed the default of VIF driver

---
 nova/virt/libvirt/connection.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 7b2ff49b2..585cd74a3 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -126,7 +126,7 @@ flags.DEFINE_bool('start_guests_on_host_boot', False,
 flags.DEFINE_string('libvirt_vif_type', 'bridge',
                     'Type of VIF to create.')
 flags.DEFINE_string('libvirt_vif_driver',
-                    'nova.virt.libvirt.vif.LibvirtVlanBridgeDriver',
+                    'nova.virt.libvirt.vif.LibvirtBridgeDriver',
                     'The libvirt VIF driver to configure the VIFs.')
 
 
-- 
cgit 


From 68134f862e8c3eaa571791d9675fd0f8dbc3b906 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Thu, 21 Jul 2011 22:00:20 +0900
Subject: Added create_vlan/bridge in network unit test

---
 nova/tests/test_network.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py
index 340313405..57aa04ece 100644
--- a/nova/tests/test_network.py
+++ b/nova/tests/test_network.py
@@ -147,6 +147,7 @@ class FlatNetworkTestCase(test.TestCase):
                      'cidr': '192.168.%s.0/24' % i,
                      'cidr_v6': '2001:db%s::/64' % i8,
                      'id': i,
+                     'multi_host': False,
                      'injected': 'DONTCARE',
                      'bridge_interface': 'fake_fa%s' % i,
                      'vlan': None}
@@ -162,7 +163,9 @@ class FlatNetworkTestCase(test.TestCase):
                      'ips': 'DONTCARE',
                      'label': 'test%s' % i,
                      'mac': 'DE:AD:BE:EF:00:0%s' % i,
-                     'rxtx_cap': 'DONTCARE'}
+                     'rxtx_cap': 'DONTCARE',
+                     'create_vlan': False,
+                     'create_bridge': False}
             self.assertDictMatch(nw[1], check)
 
             check = [{'enabled': 'DONTCARE',
-- 
cgit 


From a3c761110d7ee49ac9d18ff13e584aa8cdaedab8 Mon Sep 17 00:00:00 2001
From: Dan Wendlandt <dan@nicira.com>
Date: Thu, 21 Jul 2011 07:07:34 -0700
Subject: forgot to add xenapi/vif.py

---
 nova/virt/xenapi/vif.py | 146 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 146 insertions(+)
 create mode 100644 nova/virt/xenapi/vif.py

diff --git a/nova/virt/xenapi/vif.py b/nova/virt/xenapi/vif.py
new file mode 100644
index 000000000..cc5aa38f5
--- /dev/null
+++ b/nova/virt/xenapi/vif.py
@@ -0,0 +1,146 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright (c) 2011 Citrix Systems, Inc.
+# Copyright 2011 OpenStack LLC.
+# Copyright (C) 2011 Nicira, Inc
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""VIF drivers for XenAPI."""
+
+from nova import flags
+from nova import log as logging
+from nova.virt.vif import VIFDriver
+from nova.virt.xenapi.network_utils import NetworkHelper
+
+FLAGS = flags.FLAGS
+flags.DEFINE_string('xenapi_ovs_integration_bridge', 'xapi1',
+			'Name of Integration Bridge used by Open vSwitch')
+
+LOG = logging.getLogger("nova.virt.xenapi.vif")
+
+class XenAPIBridgeDriver(VIFDriver):
+    """Combined VIF and Bridge class for XenAPI."""
+
+    def get_vif_rec(self, xenapi_session, vm_ref, instance, device, network,
+                                                    network_mapping):
+        print "bridge = '%s'" % network['bridge']
+       	network_ref = NetworkHelper.find_network_with_bridge(xenapi_session,
+							network['bridge'])
+        rxtx_cap = network_mapping.pop('rxtx_cap')
+        vif_rec = {}
+        vif_rec['device'] = str(device)
+        vif_rec['network'] = network_ref
+        vif_rec['VM'] = vm_ref
+        vif_rec['MAC'] = network_mapping['mac']
+        vif_rec['MTU'] = '1500'
+        vif_rec['other_config'] = {}
+        vif_rec['qos_algorithm_type'] = "ratelimit" if rxtx_cap else ''
+        vif_rec['qos_algorithm_params'] = \
+                {"kbps": str(rxtx_cap * 1024)} if rxtx_cap else {}
+        return vif_rec
+
+    def plug(self, xenapi_session, instance, network, mapping):
+        """Ensure that the bridge exists, if using VLANs"""
+
+        vlan_num = network['vlan']
+        if vlan_num is None:
+            return # no plugging done for non-VLAN networks
+	    bridge = network['bridge']
+        bridge_interface = network['bridge_interface']
+
+        print "in plug with bridge = %s and bridge_interface = %s" % (bridge,bridge_interface)
+    	# Check whether bridge already exists
+    	# Retrieve network whose name_label is "bridge"
+    	network_ref = network_utils.NetworkHelper.find_network_with_name_label(
+                                                               xenapi_session,
+                                                                       bridge)
+    	print "got network_ref = %s" % network_ref
+        if network_ref is None:
+        	# If bridge does not exists
+        	# 1 - create network
+        	description = 'network for nova bridge %s' % bridge
+        	network_rec = {'name_label': bridge,
+                       'name_description': description,
+                       'other_config': {}}
+        	network_ref = xenapi_session.call_xenapi('network.create', network_rec)
+		    # 2 - find PIF for VLAN NOTE(salvatore-orlando): using double
+		    # quotes inside single quotes as xapi filter only support
+		    # tokens in double quotes
+        	expr = 'field "device" = "%s" and \
+                field "VLAN" = "-1"' % bridge_interface
+        	pifs = xenapi_session.call_xenapi('PIF.get_all_records_where', expr)
+        	pif_ref = None
+        	# Multiple PIF are ok: we are dealing with a pool
+        	if len(pifs) == 0:
+            		raise Exception(
+                  	_('Found no PIF for device %s') % bridge_interface)
+            # 3 - create vlan for network
+            print "creating vlan %s" % str(vlan_num)
+            for pif_ref in pifs.keys():
+            		xenapi_session.call_xenapi('VLAN.create',
+                                pif_ref,
+                                str(vlan_num),
+                                network_ref)
+    	else:
+           	# Check VLAN tag is appropriate
+        	network_rec = xenapi_session.call_xenapi('network.get_record',
+								network_ref)
+        	# Retrieve PIFs from network
+        	for pif_ref in network_rec['PIFs']:
+            		# Retrieve VLAN from PIF
+            		pif_rec = xenapi_session.call_xenapi('PIF.get_record', pif_ref)
+            		pif_vlan = int(pif_rec['VLAN'])
+            		# Raise an exception if VLAN != vlan_num
+            		if pif_vlan != vlan_num:
+                		raise Exception(_("PIF %(pif_rec['uuid'])s for network "
+                                  "%(bridge)s has VLAN id %(pif_vlan)d. "
+                                  "Expected %(vlan_num)d") % locals())
+            print "vlan is good"
+
+        print "all done"
+
+    def unplug(self, instance, network, mapping):
+        pass
+
+class XenAPIOpenVswitchDriver(VIFDriver):
+    """VIF driver for Open vSwitch with XenAPI."""
+
+    def get_vif_rec(self, xenapi_session, vm_ref, instance, device, network,
+                                                    network_mapping):
+	    # with OVS model, always plug into OVS integration bridge
+       	network_ref = NetworkHelper.find_network_with_bridge(xenapi_session,
+			FLAGS.xenapi_ovs_integration_bridge)
+        vif_rec = {}
+        vif_rec['device'] = str(device)
+        vif_rec['network'] = network_ref
+        vif_rec['VM'] = vm_ref
+        vif_rec['MAC'] = network_mapping['mac']
+        vif_rec['MTU'] = '1500'
+        vif_id = str(instance['id']) + "-" + str(network['id'])
+        vif_rec['qos_algorithm_type'] = ""
+        vif_rec['qos_algorithm_params'] = {}
+        # OVS on the hypervisor monitors this key and uses it to
+        # set the iface-id attribute
+        vif_rec['other_config'] = {"nicira-iface-id" : vif_id }
+        return vif_rec
+
+    def plug(self, xenapi_session, instance, network, mapping):
+	    # nothing to do, as this driver assumes that integration bridge
+	    # was created by administrator
+        pass
+
+    def unplug(self, instance, network, mapping):
+	    pass
+
-- 
cgit 


From 337c1ae31b348f3103db09e81af6f27d5290b79e Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Thu, 21 Jul 2011 23:55:10 +0900
Subject: Fixed Xenapi unit test error of test_rescue

---
 nova/tests/test_xenapi.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index 4cb7447d3..199a8bc52 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -647,7 +647,7 @@ class XenAPIVMTestCase(test.TestCase):
         self.flags(xenapi_inject_image=False)
         instance = self._create_instance()
         conn = xenapi_conn.get_connection(False)
-        conn.rescue(instance, None)
+        conn.rescue(instance, None, [])
 
     def test_unrescue(self):
         instance = self._create_instance()
-- 
cgit 


From d79ad70cf9ad959ea91b13a2724450cbadcdc0c4 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Thu, 21 Jul 2011 23:58:25 +0900
Subject: removed vif API extension

---
 nova/api/openstack/contrib/vifs.py | 85 --------------------------------------
 1 file changed, 85 deletions(-)
 delete mode 100644 nova/api/openstack/contrib/vifs.py

diff --git a/nova/api/openstack/contrib/vifs.py b/nova/api/openstack/contrib/vifs.py
deleted file mode 100644
index a54f412a6..000000000
--- a/nova/api/openstack/contrib/vifs.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (C) 2011 Midokura KK
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License
-from webob import exc
-
-from nova import exception
-from nova import network
-from nova.api.openstack import extensions
-
-
-def _translate_vif_view(vif):
-    result = {'id': vif['id'],
-              'mac': vif['address'],
-              'network_id': vif['network_id']}
-    return {'vif': result}
-
-
-def _translate_vifs_view(vifs):
-    return {'vifs': [_translate_vif_view(vif) for vif in vifs]}
-
-
-class ServerVIFController(object):
-    """The controller for VIFs attached to servers.
-
-    A child resource of the server.
-    """
-
-    _serialization_metadata = {
-        'application/xml': {
-            "attributes": {
-                "vif": [
-                    "id",
-                    "mac",
-                    "network_id",
-                    ]}}}
-
-    def __init__(self):
-        self.network_api = network.API()
-        super(ServerVIFController, self).__init__()
-
-    def index(self, req, server_id):
-        """Return data about the vifs of the server."""
-        context = req.environ['nova.context']
-
-        vifs = self.network_api.get_vifs_by_instance(context, server_id)
-
-        return _translate_vifs_view(vifs)
-
-
-class VIFs(extensions.ExtensionDescriptor):
-    def get_name(self):
-        return "VIFs"
-
-    def get_alias(self):
-        return "os-vifs"
-
-    def get_description(self):
-        return "VIF support"
-
-    def get_namespace(self):
-        return "http://docs.openstack.org/ext/vifs/api/v1.1"
-
-    def get_updated(self):
-        return "2011-07-11T00:00:00+00:00"
-
-    def get_resources(self):
-        resources = []
-
-        res = extensions.ResourceExtension('os-server_vifs',
-                         ServerVIFController())
-        resources.append(res)
-
-        return resources
-- 
cgit 


From 7aca24e8463c38c4e051a59788de1c0c0b15cd0c Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Fri, 22 Jul 2011 00:27:45 +0900
Subject: Fixed the localization unit test error in the vif driver logging

---
 nova/virt/libvirt/vif.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index fdd12d2f4..bf3579608 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -74,13 +74,14 @@ class LibvirtBridgeDriver(VIFDriver):
         """Ensure that the bridge exists, and add VIF to it."""
         if not network.get('multi_host') and mapping.get('create_bridge'):
             if mapping.get('create_vlan'):
-                LOG.debug(_("Ensuring vlan %s and bridge %s") %
-                          (network['vlan'], network['bridge']))
+                LOG.debug(_('Ensuring vlan %(vlan)s and bridge %(bridge)s'),
+                          {'vlan': network['vlan'],
+                           'bridge': network['bridge']})
                 linux_net.ensure_vlan_bridge(network['vlan'],
                                              network['bridge'],
                                              network['bridge_interface'])
             else:
-                LOG.debug(_("Ensuring bridge %s") % network['bridge'])
+                LOG.debug(_("Ensuring bridge %s"), network['bridge'])
                 linux_net.ensure_bridge(network['bridge'],
                                         network['bridge_interface'])
 
-- 
cgit 


From 87403c1e8b27b52e9e84856490ea7a0dc51f5bb6 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Fri, 22 Jul 2011 01:13:34 +0900
Subject: Changed test_live_migration_raises_exception to use mock for compte
 manager method

---
 nova/tests/test_libvirt.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index 01a37fe47..ad0931a89 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -722,6 +722,9 @@ class LibvirtConnTestCase(test.TestCase):
                 return vdmock
 
         self.create_fake_libvirt_mock(lookupByName=fake_lookup)
+        self.mox.StubOutWithMock(self.compute, "recover_live_migration")
+        self.compute.recover_live_migration(self.context, instance_ref,
+                                            dest='dest')
 
         # Start test
         self.mox.ReplayAll()
-- 
cgit 


From 5f47389f6151d7ae80d91382d8dab32d6fb2f0c8 Mon Sep 17 00:00:00 2001
From: Lvov Maxim <usrleon@gmail.com>
Date: Thu, 21 Jul 2011 21:05:55 +0400
Subject: minor fix

---
 bin/nova-manage | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/nova-manage b/bin/nova-manage
index 2e9b52d74..3e15d9fe3 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -613,7 +613,7 @@ class NetworkCommands(object):
     @args('--fixed_range_v6', dest="fixed_range_v6", help='fixed ipv6 range')
     @args('--gateway_v6', dest="gateway_v6", help='ipv6 gateway')
     @args('--flat_network_bridge', dest="flat_network_bridge", metavar='<flat network bridge>', help='Flat_network_bridge')
-    @args('--bridge', dest="bridge_interface", metavar='<bridge interface>', help='Bridge_interface')
+    @args('--bridge_interface', dest="bridge_interface", metavar='<bridge interface>', help='Bridge_interface')
     def create(self, label=None, fixed_range=None, num_networks=None,
                network_size=None, vlan_start=None,
                vpn_start=None, fixed_range_v6=None, gateway_v6=None,
-- 
cgit 


From 6e3c492ae878335ea7ef7e00cc9e9abc55b0a0b4 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Fri, 22 Jul 2011 05:23:44 +0900
Subject: Catch the FixedIpNotFoundForInstance exception when no fixed IP is
 mapped to instance

---
 nova/network/manager.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nova/network/manager.py b/nova/network/manager.py
index ef96d48a7..83d0519c9 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -427,7 +427,12 @@ class NetworkManager(manager.SchedulerDependentManager):
         and info = dict containing pertinent networking data
         """
         # TODO(tr3buchet) should handle floating IPs as well?
-        fixed_ips = self.db.fixed_ip_get_by_instance(context, instance_id)
+        try:
+            fixed_ips = self.db.fixed_ip_get_by_instance(context, instance_id)
+        except exception.FixedIpNotFoundForInstance, ex:
+            LOG.warn(_('No fixed IPs for instance %s'), instance_id)
+            fixed_ips = []
+
         vifs = self.db.virtual_interface_get_by_instance(context, instance_id)
         flavor = self.db.instance_type_get_by_id(context,
                                                  instance_type_id)
-- 
cgit 


From c5c14a95355cef408e8dcfeb04b9d796be2af564 Mon Sep 17 00:00:00 2001
From: Dan Wendlandt <dan@nicira.com>
Date: Thu, 21 Jul 2011 18:54:00 -0700
Subject: remove debugging

---
 nova/virt/xenapi/vif.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/nova/virt/xenapi/vif.py b/nova/virt/xenapi/vif.py
index cc5aa38f5..3604ef8a9 100644
--- a/nova/virt/xenapi/vif.py
+++ b/nova/virt/xenapi/vif.py
@@ -35,7 +35,6 @@ class XenAPIBridgeDriver(VIFDriver):
 
     def get_vif_rec(self, xenapi_session, vm_ref, instance, device, network,
                                                     network_mapping):
-        print "bridge = '%s'" % network['bridge']
        	network_ref = NetworkHelper.find_network_with_bridge(xenapi_session,
 							network['bridge'])
         rxtx_cap = network_mapping.pop('rxtx_cap')
@@ -60,13 +59,11 @@ class XenAPIBridgeDriver(VIFDriver):
 	    bridge = network['bridge']
         bridge_interface = network['bridge_interface']
 
-        print "in plug with bridge = %s and bridge_interface = %s" % (bridge,bridge_interface)
     	# Check whether bridge already exists
     	# Retrieve network whose name_label is "bridge"
     	network_ref = network_utils.NetworkHelper.find_network_with_name_label(
                                                                xenapi_session,
                                                                        bridge)
-    	print "got network_ref = %s" % network_ref
         if network_ref is None:
         	# If bridge does not exists
         	# 1 - create network
@@ -87,7 +84,6 @@ class XenAPIBridgeDriver(VIFDriver):
             		raise Exception(
                   	_('Found no PIF for device %s') % bridge_interface)
             # 3 - create vlan for network
-            print "creating vlan %s" % str(vlan_num)
             for pif_ref in pifs.keys():
             		xenapi_session.call_xenapi('VLAN.create',
                                 pif_ref,
@@ -107,9 +103,6 @@ class XenAPIBridgeDriver(VIFDriver):
                 		raise Exception(_("PIF %(pif_rec['uuid'])s for network "
                                   "%(bridge)s has VLAN id %(pif_vlan)d. "
                                   "Expected %(vlan_num)d") % locals())
-            print "vlan is good"
-
-        print "all done"
 
     def unplug(self, instance, network, mapping):
         pass
-- 
cgit 


From d78d188d41e580ef0e2b4f0116bb0402ce83930f Mon Sep 17 00:00:00 2001
From: Dan Wendlandt <dan@nicira.com>
Date: Thu, 21 Jul 2011 21:36:26 -0700
Subject: refactor xenapi vif plug to combine plug + get_vif_rec, tested and
 fixed XenAPIBridgeDriver

---
 nova/virt/libvirt/vif.py  | 13 ++++----
 nova/virt/xenapi/vif.py   | 75 +++++++++++++++++++++++------------------------
 nova/virt/xenapi/vmops.py |  2 +-
 3 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index bf3579608..07c3973d4 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -98,14 +98,17 @@ class LibvirtOpenVswitchDriver(VIFDriver):
     def plug(self, instance, network, mapping):
         vif_id = str(instance['id']) + "-" + str(network['id'])
         dev = "tap-%s" % vif_id
+        iface_id = "nova-" + vif_id
         utils.execute('sudo', 'ip', 'tuntap', 'add', dev, 'mode', 'tap')
         utils.execute('sudo', 'ip', 'link', 'set', dev, 'up')
         utils.execute('sudo', 'ovs-vsctl', '--', '--may-exist', 'add-port',
-           FLAGS.libvirt_ovs_integration_bridge, dev,
-           '--', 'set', 'Interface', dev, "external-ids:iface-id=%s" % vif_id,
-           '--', 'set', 'Interface', dev, "external-ids:iface-status=active",
-           '--', 'set', 'Interface', dev, "external-ids:attached-mac=%s" % \
-                mapping['mac'])
+            FLAGS.libvirt_ovs_integration_bridge, dev,
+            '--', 'set', 'Interface', dev,
+            "external-ids:iface-id=%s" % iface_id,
+            '--', 'set', 'Interface', dev,
+            "external-ids:iface-status=active",
+            '--', 'set', 'Interface', dev,
+            "external-ids:attached-mac=%s" % mapping['mac'])
 
         result = {
             'script': '',
diff --git a/nova/virt/xenapi/vif.py b/nova/virt/xenapi/vif.py
index beee2390d..0557d63af 100644
--- a/nova/virt/xenapi/vif.py
+++ b/nova/virt/xenapi/vif.py
@@ -26,18 +26,21 @@ from nova.virt.xenapi.network_utils import NetworkHelper
 
 FLAGS = flags.FLAGS
 flags.DEFINE_string('xenapi_ovs_integration_bridge', 'xapi1',
-                    'Name of Integration Bridge used by Open vSwitch')
+                'Name of Integration Bridge used by Open vSwitch')
 
 LOG = logging.getLogger("nova.virt.xenapi.vif")
 
 
 class XenAPIBridgeDriver(VIFDriver):
-    """Combined VIF and Bridge class for XenAPI."""
+    """VIF Driver for XenAPI that uses XenAPI to create Networks."""
 
-    def get_vif_rec(self, xenapi_session, vm_ref, instance, device, network,
+    def plug(self, xenapi_session, vm_ref, instance, device, network,
                                                     network_mapping):
-        network_ref = NetworkHelper.find_network_with_bridge(xenapi_session,
-                                                             network['bridge'])
+        if network['vlan']:
+            network_ref = self.ensure_vlan_bridge(xenapi_session, network)
+        else:
+            network_ref = NetworkHelper.find_network_with_bridge(
+                                        xenapi_session, network['bridge'])
         rxtx_cap = network_mapping.pop('rxtx_cap')
         vif_rec = {}
         vif_rec['device'] = str(device)
@@ -51,60 +54,60 @@ class XenAPIBridgeDriver(VIFDriver):
                 {"kbps": str(rxtx_cap * 1024)} if rxtx_cap else {}
         return vif_rec
 
-    def plug(self, xenapi_session, instance, network, mapping):
-        """Ensure that the bridge exists, if using VLANs"""
+    def ensure_vlan_bridge(self, xenapi_session, network):
+        """Ensure that a VLAN bridge exists"""
 
         vlan_num = network['vlan']
-        if vlan_num is None:
-            return  # no plugging done for non-VLAN networks
         bridge = network['bridge']
         bridge_interface = network['bridge_interface']
-
         # Check whether bridge already exists
         # Retrieve network whose name_label is "bridge"
-        network_ref = network_utils.NetworkHelper.find_network_with_name_label(
-            xenapi_session, bridge)
-
+        network_ref = NetworkHelper.find_network_with_name_label(
+                                        xenapi_session, bridge)
         if network_ref is None:
             # If bridge does not exists
             # 1 - create network
             description = 'network for nova bridge %s' % bridge
             network_rec = {'name_label': bridge,
-                           'name_description': description,
-                           'other_config': {}}
+                       'name_description': description,
+                       'other_config': {}}
             network_ref = xenapi_session.call_xenapi('network.create',
-                                                     network_rec)
+                                                        network_rec)
             # 2 - find PIF for VLAN NOTE(salvatore-orlando): using double
             # quotes inside single quotes as xapi filter only support
             # tokens in double quotes
             expr = 'field "device" = "%s" and \
                 field "VLAN" = "-1"' % bridge_interface
             pifs = xenapi_session.call_xenapi('PIF.get_all_records_where',
-                                              expr)
+                                                                    expr)
             pif_ref = None
             # Multiple PIF are ok: we are dealing with a pool
             if len(pifs) == 0:
-                raise Exception(_('Found no PIF for device %s') %
-                                bridge_interface)
-
-            # 3 - create vlan for network
+                raise Exception(_('Found no PIF for device %s') % \
+                                        bridge_interface)
             for pif_ref in pifs.keys():
-                xenapi_session.call_xenapi('VLAN.create', pif_ref,
-                                           str(vlan_num), network_ref)
+                xenapi_session.call_xenapi('VLAN.create',
+                                pif_ref,
+                                str(vlan_num),
+                                network_ref)
         else:
             # Check VLAN tag is appropriate
             network_rec = xenapi_session.call_xenapi('network.get_record',
-                                                     network_ref)
+                                                            network_ref)
             # Retrieve PIFs from network
             for pif_ref in network_rec['PIFs']:
                 # Retrieve VLAN from PIF
-                pif_rec = xenapi_session.call_xenapi('PIF.get_record', pif_ref)
+                pif_rec = xenapi_session.call_xenapi('PIF.get_record',
+                                                                pif_ref)
                 pif_vlan = int(pif_rec['VLAN'])
                 # Raise an exception if VLAN != vlan_num
                 if pif_vlan != vlan_num:
-                    raise Exception(_("PIF %(pif_rec['uuid'])s for network "
-                          "%(bridge)s has VLAN id %(pif_vlan)d. "
-                          "Expected %(vlan_num)d") % locals())
+                    raise Exception(_(
+                                "PIF %(pif_rec['uuid'])s for network "
+                                "%(bridge)s has VLAN id %(pif_vlan)d. "
+                                "Expected %(vlan_num)d") % locals())
+
+        return network_ref
 
     def unplug(self, instance, network, mapping):
         pass
@@ -113,18 +116,19 @@ class XenAPIBridgeDriver(VIFDriver):
 class XenAPIOpenVswitchDriver(VIFDriver):
     """VIF driver for Open vSwitch with XenAPI."""
 
-    def get_vif_rec(self, xenapi_session, vm_ref, instance, device, network,
+    def plug(self, xenapi_session, vm_ref, instance, device, network,
                                                     network_mapping):
-        # with OVS model, always plug into OVS integration bridge
-        network_ref = NetworkHelper.find_network_with_bridge(
-            xenapi_session, FLAGS.xenapi_ovs_integration_bridge)
+        # with OVS model, always plug into an OVS integration bridge
+        # that is already created
+        network_ref = NetworkHelper.find_network_with_bridge(xenapi_session,
+                                        FLAGS.xenapi_ovs_integration_bridge)
         vif_rec = {}
         vif_rec['device'] = str(device)
         vif_rec['network'] = network_ref
         vif_rec['VM'] = vm_ref
         vif_rec['MAC'] = network_mapping['mac']
         vif_rec['MTU'] = '1500'
-        vif_id = str(instance['id']) + "-" + str(network['id'])
+        vif_id = "nova-" + str(instance['id']) + "-" + str(network['id'])
         vif_rec['qos_algorithm_type'] = ""
         vif_rec['qos_algorithm_params'] = {}
         # OVS on the hypervisor monitors this key and uses it to
@@ -132,10 +136,5 @@ class XenAPIOpenVswitchDriver(VIFDriver):
         vif_rec['other_config'] = {"nicira-iface-id": vif_id}
         return vif_rec
 
-    def plug(self, xenapi_session, instance, network, mapping):
-        # nothing to do, as this driver assumes that integration bridge
-        # was created by administrator
-        pass
-
     def unplug(self, instance, network, mapping):
         pass
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 4fa59b6b7..bc47ac494 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -1088,7 +1088,7 @@ class VMOps(object):
         self._session.get_xenapi().VM.get_record(vm_ref)
 
         for device, (network, info) in enumerate(network_info):
-            vif_rec = self.vif_driver.get_vif_rec(self._session,
+            vif_rec = self.vif_driver.plug(self._session,
                     vm_ref, instance, device, network, info)
             network_ref = vif_rec['network']
             LOG.debug(_('Creating VIF for VM %(vm_ref)s,' \
-- 
cgit 


From ff9b31734f15fec0a5b1f9de96dadbda6475a3b4 Mon Sep 17 00:00:00 2001
From: Dan Wendlandt <dan@nicira.com>
Date: Thu, 21 Jul 2011 21:57:03 -0700
Subject: for libvirt OVS driver, do not make device if it exists already

---
 nova/virt/libvirt/vif.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index 07c3973d4..02bbcc194 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -98,17 +98,18 @@ class LibvirtOpenVswitchDriver(VIFDriver):
     def plug(self, instance, network, mapping):
         vif_id = str(instance['id']) + "-" + str(network['id'])
         dev = "tap-%s" % vif_id
-        iface_id = "nova-" + vif_id
-        utils.execute('sudo', 'ip', 'tuntap', 'add', dev, 'mode', 'tap')
-        utils.execute('sudo', 'ip', 'link', 'set', dev, 'up')
+        if not linux_net._device_exists(dev): 
+            iface_id = "nova-" + vif_id
+            utils.execute('sudo', 'ip', 'tuntap', 'add', dev, 'mode', 'tap')
+            utils.execute('sudo', 'ip', 'link', 'set', dev, 'up')
         utils.execute('sudo', 'ovs-vsctl', '--', '--may-exist', 'add-port',
-            FLAGS.libvirt_ovs_integration_bridge, dev,
-            '--', 'set', 'Interface', dev,
-            "external-ids:iface-id=%s" % iface_id,
-            '--', 'set', 'Interface', dev,
-            "external-ids:iface-status=active",
-            '--', 'set', 'Interface', dev,
-            "external-ids:attached-mac=%s" % mapping['mac'])
+                FLAGS.libvirt_ovs_integration_bridge, dev,
+                '--', 'set', 'Interface', dev,
+                "external-ids:iface-id=%s" % iface_id,
+                '--', 'set', 'Interface', dev,
+                "external-ids:iface-status=active",
+                '--', 'set', 'Interface', dev,
+                "external-ids:attached-mac=%s" % mapping['mac'])
 
         result = {
             'script': '',
-- 
cgit 


From 88a0dd185ebef93845c026dceff0c32eaaffda11 Mon Sep 17 00:00:00 2001
From: Lvov Maxim <usrleon@gmail.com>
Date: Fri, 22 Jul 2011 08:58:34 +0400
Subject: remove IPy

---
 bin/nova-manage | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bin/nova-manage b/bin/nova-manage
index 3e15d9fe3..8614a253b 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -61,7 +61,6 @@ import os
 import sys
 import time
 
-import IPy
 from optparse import OptionParser
 
 # If ../nova/__init__.py exists, add ../ to Python search path, so that
-- 
cgit 


From 162563d48d5b5b4626c20de7fd93dd17ea31f123 Mon Sep 17 00:00:00 2001
From: Dan Wendlandt <dan@nicira.com>
Date: Thu, 21 Jul 2011 22:17:37 -0700
Subject: use new 'create_vlan' field in XenAPIBridgeDriver

---
 nova/virt/xenapi/vif.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/virt/xenapi/vif.py b/nova/virt/xenapi/vif.py
index 0557d63af..f5fb789ff 100644
--- a/nova/virt/xenapi/vif.py
+++ b/nova/virt/xenapi/vif.py
@@ -36,7 +36,7 @@ class XenAPIBridgeDriver(VIFDriver):
 
     def plug(self, xenapi_session, vm_ref, instance, device, network,
                                                     network_mapping):
-        if network['vlan']:
+        if network_mapping.get('create_vlan'):
             network_ref = self.ensure_vlan_bridge(xenapi_session, network)
         else:
             network_ref = NetworkHelper.find_network_with_bridge(
-- 
cgit 


From c4affeaffd77b21a528c09b94f65d66fb07f5231 Mon Sep 17 00:00:00 2001
From: Lvov Maxim <usrleon@gmail.com>
Date: Fri, 22 Jul 2011 13:21:02 +0400
Subject: add decorator for multi host option

---
 bin/nova-manage | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/nova-manage b/bin/nova-manage
index d30ed04cb..c0994271f 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -613,6 +613,7 @@ class NetworkCommands(object):
     @args('--gateway_v6', dest="gateway_v6", help='ipv6 gateway')
     @args('--flat_network_bridge', dest="flat_network_bridge", metavar='<flat network bridge>', help='Flat_network_bridge')
     @args('--bridge_interface', dest="bridge_interface", metavar='<bridge interface>', help='Bridge_interface')
+    @args('--multi_host', dest="multi_host", metavar="<'T'|'F'>", help='Multi host')
     def create(self, label=None, fixed_range=None, num_networks=None,
                network_size=None, multi_host=None, vlan_start=None,
                vpn_start=None, fixed_range_v6=None, gateway_v6=None,
-- 
cgit 


From c4f650278d01437a9e1866ba2fec86d4a6d70d6a Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Fri, 22 Jul 2011 18:55:04 +0900
Subject: Fixed the missing quotes for 802.1Qbh in libvirt template

---
 nova/virt/libvirt.xml.template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/nova/virt/libvirt.xml.template b/nova/virt/libvirt.xml.template
index 619d69523..c82732570 100644
--- a/nova/virt/libvirt.xml.template
+++ b/nova/virt/libvirt.xml.template
@@ -99,14 +99,14 @@
             <script path='${nic.script}' />
         </interface>
     #else if $vif_type == '802.1Qbh'
-        <interface type='direct'>
-             <mac address=${nic.mac_address}/>
-             <source dev=${nic.device_name} mode='private'/>
-             <virtualport type='802.1Qbh'>
-                 <parameters profileid=${nic.profile_name}/>
-             </virtualport>
-             <model type='virtio'/>
-        </interface>
+       <interface type='direct'>
+            <mac address='${nic.mac_address}'/>
+            <source dev='${nic.device_name}' mode='private'/>
+            <virtualport type='802.1Qbh'>
+                <parameters profileid='${nic.profile_name}'/>
+            </virtualport>
+            <model type='virtio'/>
+       </interface>
     #else
         <interface type='bridge'>
             <source bridge='${nic.bridge_name}'/>
-- 
cgit 


From 0880f170318cfa5d12b10e237f641b27c646c8b2 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Fri, 22 Jul 2011 21:36:05 +0900
Subject: Removed unused exception object

---
 nova/network/manager.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/network/manager.py b/nova/network/manager.py
index 7c7deef3c..1ce8af34e 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -429,7 +429,7 @@ class NetworkManager(manager.SchedulerDependentManager):
         # TODO(tr3buchet) should handle floating IPs as well?
         try:
             fixed_ips = self.db.fixed_ip_get_by_instance(context, instance_id)
-        except exception.FixedIpNotFoundForInstance, ex:
+        except exception.FixedIpNotFoundForInstance:
             LOG.warn(_('No fixed IPs for instance %s'), instance_id)
             fixed_ips = []
 
-- 
cgit 


From 93ffbbb234df486a1adb558a5228a7f23ea3451b Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Fri, 22 Jul 2011 22:12:15 +0900
Subject: Added network_info to unfilter_instance to avoid exceptions when
 shutting down instances

---
 nova/compute/manager.py         |  3 ++-
 nova/tests/test_compute.py      |  2 +-
 nova/virt/driver.py             |  2 +-
 nova/virt/fake.py               |  2 +-
 nova/virt/libvirt/connection.py |  8 +++++---
 nova/virt/libvirt/firewall.py   | 11 ++++++-----
 nova/virt/xenapi_conn.py        |  2 +-
 7 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index aeecdecfa..da84b98cb 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -1314,8 +1314,9 @@ class ComputeManager(manager.SchedulerDependentManager):
         # Releasing vlan.
         # (not necessary in current implementation?)
 
+        network_info = self._get_instance_nw_info(ctxt, instance_ref)
         # Releasing security group ingress rule.
-        self.driver.unfilter_instance(instance_ref)
+        self.driver.unfilter_instance(instance_ref, network_info=network_info)
 
         # Database updating.
         i_name = instance_ref.name
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index 42520c9a6..b80813220 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -828,7 +828,7 @@ class ComputeTestCase(test.TestCase):
         for v in i_ref['volumes']:
             self.compute.volume_manager.remove_compute_volume(c, v['id'])
         self.mox.StubOutWithMock(self.compute.driver, 'unfilter_instance')
-        self.compute.driver.unfilter_instance(i_ref)
+        self.compute.driver.unfilter_instance(i_ref, network_info=[])
 
         # executing
         self.mox.ReplayAll()
diff --git a/nova/virt/driver.py b/nova/virt/driver.py
index 2faff0a1e..5c3130dfc 100644
--- a/nova/virt/driver.py
+++ b/nova/virt/driver.py
@@ -224,7 +224,7 @@ class ComputeDriver(object):
         """
         raise NotImplementedError()
 
-    def unfilter_instance(self, instance):
+    def unfilter_instance(self, instance, network_info=None):
         """Stop filtering instance"""
         raise NotImplementedError()
 
diff --git a/nova/virt/fake.py b/nova/virt/fake.py
index c5e9d89e4..26bc421c0 100644
--- a/nova/virt/fake.py
+++ b/nova/virt/fake.py
@@ -499,7 +499,7 @@ class FakeConnection(driver.ComputeDriver):
         """This method is supported only by libvirt."""
         return
 
-    def unfilter_instance(self, instance_ref):
+    def unfilter_instance(self, instance_ref, network_info=None):
         """This method is supported only by libvirt."""
         raise NotImplementedError('This method is supported only by libvirt.')
 
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 585cd74a3..d4f547ec4 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -333,7 +333,8 @@ class LibvirtConnection(driver.ComputeDriver):
         timer = utils.LoopingCall(_wait_for_destroy)
         timer.start(interval=0.5, now=True)
 
-        self.firewall_driver.unfilter_instance(instance)
+        self.firewall_driver.unfilter_instance(instance,
+                                               network_info=network_info)
 
         if cleanup:
             self._cleanup(instance)
@@ -1569,9 +1570,10 @@ class LibvirtConnection(driver.ComputeDriver):
         timer.f = wait_for_live_migration
         timer.start(interval=0.5, now=True)
 
-    def unfilter_instance(self, instance_ref):
+    def unfilter_instance(self, instance_ref, network_info=None):
         """See comments of same method in firewall_driver."""
-        self.firewall_driver.unfilter_instance(instance_ref)
+        self.firewall_driver.unfilter_instance(instance_ref,
+                                               network_info=network_info)
 
     def update_host_status(self):
         """See xenapi_conn.py implementation."""
diff --git a/nova/virt/libvirt/firewall.py b/nova/virt/libvirt/firewall.py
index 379197398..9ce57b6c9 100644
--- a/nova/virt/libvirt/firewall.py
+++ b/nova/virt/libvirt/firewall.py
@@ -46,7 +46,7 @@ class FirewallDriver(object):
         At this point, the instance isn't running yet."""
         raise NotImplementedError()
 
-    def unfilter_instance(self, instance):
+    def unfilter_instance(self, instance, network_info=None):
         """Stop filtering instance"""
         raise NotImplementedError()
 
@@ -300,9 +300,10 @@ class NWFilterFirewall(FirewallDriver):
         # execute in a native thread and block current greenthread until done
         tpool.execute(self._conn.nwfilterDefineXML, xml)
 
-    def unfilter_instance(self, instance):
+    def unfilter_instance(self, instance, network_info=None):
         """Clear out the nwfilter rules."""
-        network_info = netutils.get_network_info(instance)
+        if not network_info:
+            network_info = netutils.get_network_info(instance)
         instance_name = instance.name
         for (network, mapping) in network_info:
             nic_id = mapping['mac'].replace(':', '')
@@ -542,11 +543,11 @@ class IptablesFirewallDriver(FirewallDriver):
         """No-op. Everything is done in prepare_instance_filter"""
         pass
 
-    def unfilter_instance(self, instance):
+    def unfilter_instance(self, instance, network_info=None):
         if self.instances.pop(instance['id'], None):
             self.remove_filters_for_instance(instance)
             self.iptables.apply()
-            self.nwfilter.unfilter_instance(instance)
+            self.nwfilter.unfilter_instance(instance, network_info)
         else:
             LOG.info(_('Attempted to unfilter instance %s which is not '
                      'filtered'), instance['id'])
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index 102278e1c..03ed2ecbe 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -325,7 +325,7 @@ class XenAPIConnection(driver.ComputeDriver):
         """This method is supported only by libvirt."""
         return
 
-    def unfilter_instance(self, instance_ref):
+    def unfilter_instance(self, instance_ref, network_info=None):
         """This method is supported only by libvirt."""
         raise NotImplementedError('This method is supported only by libvirt.')
 
-- 
cgit 


From d06908783c9a20621af124d824a88d34b6d78b33 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Sat, 23 Jul 2011 01:38:26 +0900
Subject: Updated the comments for VMWare VIF driver

---
 nova/virt/vmwareapi/vif.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/virt/vmwareapi/vif.py b/nova/virt/vmwareapi/vif.py
index 281565bbc..b3e43b209 100644
--- a/nova/virt/vmwareapi/vif.py
+++ b/nova/virt/vmwareapi/vif.py
@@ -33,7 +33,7 @@ FLAGS = flags.FLAGS
 
 
 class VMWareVlanBridgeDriver(VIFDriver):
-    """VIF driver for Linux VLAN bridge."""
+    """VIF Driver to setup bridge/VLAN networking using VMWare API."""
 
     def plug(self, instance, network, mapping):
         """Create a vlan and bridge unless they already exist."""
-- 
cgit 


From 348dcb39f879926c20ed87256b149aeeaa4c6832 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Sat, 23 Jul 2011 05:11:39 +0900
Subject: Add i18n for logging, changed create_bridge/vlan to
 should_create_bridge/vlan, changed unfilter_instance's keyword param to
 positional, and added Dan's alternate ID to .mailmap

---
 .mailmap                        |  1 +
 nova/compute/manager.py         |  2 +-
 nova/network/manager.py         | 42 +++++++++++++++--------------------------
 nova/tests/test_compute.py      |  2 +-
 nova/tests/test_network.py      |  4 ++--
 nova/virt/driver.py             |  2 +-
 nova/virt/libvirt/connection.py |  6 +++---
 nova/virt/libvirt/vif.py        |  5 +++--
 nova/virt/xenapi/vif.py         |  2 +-
 nova/virt/xenapi/vmops.py       |  4 ++--
 nova/virt/xenapi_conn.py        |  2 +-
 11 files changed, 31 insertions(+), 41 deletions(-)

diff --git a/.mailmap b/.mailmap
index ff304c891..76e7bc669 100644
--- a/.mailmap
+++ b/.mailmap
@@ -14,6 +14,7 @@
 <code@term.ie> <github@anarkystic.com>
 <code@term.ie> <termie@preciousroy.local>
 <corywright@gmail.com> <cory.wright@rackspace.com>
+<dan@nicira.com> <danwent@dan-xs3-cs>
 <devin.carlen@gmail.com> <devcamcar@illian.local>
 <ewan.mellor@citrix.com> <emellor@silver>
 <itoumsn@nttdata.co.jp> <itoumsn@shayol>
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index da84b98cb..31627fe3b 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -1316,7 +1316,7 @@ class ComputeManager(manager.SchedulerDependentManager):
 
         network_info = self._get_instance_nw_info(ctxt, instance_ref)
         # Releasing security group ingress rule.
-        self.driver.unfilter_instance(instance_ref, network_info=network_info)
+        self.driver.unfilter_instance(instance_ref, network_info)
 
         # Database updating.
         i_name = instance_ref.name
diff --git a/nova/network/manager.py b/nova/network/manager.py
index 1ce8af34e..005fa73e7 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -300,6 +300,14 @@ class NetworkManager(manager.SchedulerDependentManager):
         The one at a time part is to flatten the layout to help scale
     """
 
+    """Constant to indicate whether this manager requires VIF to create a
+    bridge."""
+    SHOULD_CREATE_BRIDGE = False
+
+    """Constant to indicate whether this manager requires VIF to create a
+    VLAN tag."""
+    SHOULD_CREATE_VLAN = False
+
     timeout_fixed_ips = True
 
     def __init__(self, network_driver=None, *args, **kwargs):
@@ -483,8 +491,8 @@ class NetworkManager(manager.SchedulerDependentManager):
                 'rxtx_cap': flavor['rxtx_cap'],
                 'dns': [network['dns']],
                 'ips': [ip_dict(ip) for ip in network_IPs],
-                'create_bridge': self._create_bridge,
-                'create_vlan': self._create_vlan}
+                'should_create_bridge': self.SHOULD_CREATE_BRIDGE,
+                'should_create_vlan': self.SHOULD_CREATE_VLAN}
             if network['cidr_v6']:
                 info['ip6s'] = [ip6_dict()]
             # TODO(tr3buchet): handle ip6 routes here as well
@@ -702,16 +710,6 @@ class NetworkManager(manager.SchedulerDependentManager):
         """Sets up network on this host."""
         raise NotImplementedError()
 
-    @property
-    def _create_bridge(self):
-        """Indicate whether this manager requires VIF to create a bridge."""
-        return False
-
-    @property
-    def _create_vlan(self):
-        """Indicate whether this manager requires VIF to create a VLAN tag."""
-        return False
-
 
 class FlatManager(NetworkManager):
     """Basic network where no vlans are used.
@@ -772,6 +770,8 @@ class FlatDHCPManager(FloatingIP, RPCAllocateFixedIP, NetworkManager):
 
     """
 
+    SHOULD_CREATE_BRIDGE = True
+
     def init_host(self):
         """Do any initialization that needs to be run if this is a
         standalone service.
@@ -798,11 +798,6 @@ class FlatDHCPManager(FloatingIP, RPCAllocateFixedIP, NetworkManager):
                 self.db.network_update(context, network_ref['id'],
                                        {'gateway_v6': gateway})
 
-    @property
-    def _create_bridge(self):
-        """Indicate whether this manager requires VIF to create a bridge."""
-        return True
-
 
 class VlanManager(RPCAllocateFixedIP, FloatingIP, NetworkManager):
     """Vlan network with dhcp.
@@ -819,6 +814,9 @@ class VlanManager(RPCAllocateFixedIP, FloatingIP, NetworkManager):
 
     """
 
+    SHOULD_CREATE_BRIDGE = True
+    SHOULD_CREATE_VLAN = True
+
     def init_host(self):
         """Do any initialization that needs to be run if this is a
         standalone service.
@@ -919,13 +917,3 @@ class VlanManager(RPCAllocateFixedIP, FloatingIP, NetworkManager):
         """Number of reserved ips at the top of the range."""
         parent_reserved = super(VlanManager, self)._top_reserved_ips
         return parent_reserved + FLAGS.cnt_vpn_clients
-
-    @property
-    def _create_bridge(self):
-        """Indicate whether this manager requires VIF to create a bridge."""
-        return True
-
-    @property
-    def _create_vlan(self):
-        """Indicate whether this manager requires VIF to create a VLAN tag."""
-        return True
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index b80813220..2a8f33dd3 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -828,7 +828,7 @@ class ComputeTestCase(test.TestCase):
         for v in i_ref['volumes']:
             self.compute.volume_manager.remove_compute_volume(c, v['id'])
         self.mox.StubOutWithMock(self.compute.driver, 'unfilter_instance')
-        self.compute.driver.unfilter_instance(i_ref, network_info=[])
+        self.compute.driver.unfilter_instance(i_ref, [])
 
         # executing
         self.mox.ReplayAll()
diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py
index fca2975de..39695a1b1 100644
--- a/nova/tests/test_network.py
+++ b/nova/tests/test_network.py
@@ -164,8 +164,8 @@ class FlatNetworkTestCase(test.TestCase):
                      'label': 'test%s' % i,
                      'mac': 'DE:AD:BE:EF:00:0%s' % i,
                      'rxtx_cap': 'DONTCARE',
-                     'create_vlan': False,
-                     'create_bridge': False}
+                     'should_create_vlan': False,
+                     'should_create_bridge': False}
             self.assertDictMatch(nw[1], check)
 
             check = [{'enabled': 'DONTCARE',
diff --git a/nova/virt/driver.py b/nova/virt/driver.py
index 5c3130dfc..34dc5f544 100644
--- a/nova/virt/driver.py
+++ b/nova/virt/driver.py
@@ -224,7 +224,7 @@ class ComputeDriver(object):
         """
         raise NotImplementedError()
 
-    def unfilter_instance(self, instance, network_info=None):
+    def unfilter_instance(self, instance, network_info):
         """Stop filtering instance"""
         raise NotImplementedError()
 
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index d4f547ec4..c9965185a 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -315,8 +315,8 @@ class LibvirtConnection(driver.ComputeDriver):
                 for (network, mapping) in network_info:
                     self.vif_driver.unplug(instance, network, mapping)
             except:
-                LOG.warning("Failed while unplugging vif of instance '%s'" % \
-                    instance['name'])
+                LOG.warning(_("Failed while unplugging vif of instance '%s'"),
+                            instance['name'])
                 raise
 
         def _wait_for_destroy():
@@ -1570,7 +1570,7 @@ class LibvirtConnection(driver.ComputeDriver):
         timer.f = wait_for_live_migration
         timer.start(interval=0.5, now=True)
 
-    def unfilter_instance(self, instance_ref, network_info=None):
+    def unfilter_instance(self, instance_ref, network_info):
         """See comments of same method in firewall_driver."""
         self.firewall_driver.unfilter_instance(instance_ref,
                                                network_info=network_info)
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index 7fb80a5cc..aa566cc72 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -72,8 +72,9 @@ class LibvirtBridgeDriver(VIFDriver):
 
     def plug(self, instance, network, mapping):
         """Ensure that the bridge exists, and add VIF to it."""
-        if not network.get('multi_host') and mapping.get('create_bridge'):
-            if mapping.get('create_vlan'):
+        if (not network.get('multi_host') and
+            mapping.get('should_create_bridge')):
+            if mapping.get('should_create_vlan'):
                 LOG.debug(_('Ensuring vlan %(vlan)s and bridge %(bridge)s'),
                           {'vlan': network['vlan'],
                            'bridge': network['bridge']})
diff --git a/nova/virt/xenapi/vif.py b/nova/virt/xenapi/vif.py
index f5fb789ff..527602243 100644
--- a/nova/virt/xenapi/vif.py
+++ b/nova/virt/xenapi/vif.py
@@ -36,7 +36,7 @@ class XenAPIBridgeDriver(VIFDriver):
 
     def plug(self, xenapi_session, vm_ref, instance, device, network,
                                                     network_mapping):
-        if network_mapping.get('create_vlan'):
+        if network_mapping.get('should_create_vlan'):
             network_ref = self.ensure_vlan_bridge(xenapi_session, network)
         else:
             network_ref = NetworkHelper.find_network_with_bridge(
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index bc47ac494..b63308f55 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -880,8 +880,8 @@ class VMOps(object):
                 for (network, mapping) in network_info:
                     self.vif_driver.unplug(instance, network, mapping)
             except:
-                LOG.warning("Failed while unplugging vif of instance '%s'" % \
-                    instance['name'])
+                LOG.warning(_("Failed while unplugging vif of instance '%s'"),
+                            instance['name'])
                 raise
 
     def _wait_with_callback(self, instance_id, task, callback):
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index 03ed2ecbe..7c355a55b 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -325,7 +325,7 @@ class XenAPIConnection(driver.ComputeDriver):
         """This method is supported only by libvirt."""
         return
 
-    def unfilter_instance(self, instance_ref, network_info=None):
+    def unfilter_instance(self, instance_ref, network_info):
         """This method is supported only by libvirt."""
         raise NotImplementedError('This method is supported only by libvirt.')
 
-- 
cgit 


From 9088c9b51a0884b3ce1689dcebc28e985000d267 Mon Sep 17 00:00:00 2001
From: Lvov Maxim <usrleon@gmail.com>
Date: Mon, 25 Jul 2011 09:42:58 +0400
Subject: fix 'version' command

---
 bin/nova-manage | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/nova-manage b/bin/nova-manage
index c0994271f..e77e3a244 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -1348,7 +1348,7 @@ def main():
     actions = methods_of(command_object)
     if len(argv) < 1:
         if hasattr(command_object, '__call__'):
-            action = '__call__'
+            action = ''
             fn = command_object.__call__
         else:
             print script_name + " category action [<args>]"
@@ -1364,7 +1364,7 @@ def main():
     # For not decorated methods
     options = getattr(fn, 'options', [])
 
-    usage = "%%prog %s %s <args> [options]" % (sys.argv[2], sys.argv[3])
+    usage = "%%prog %s %s <args> [options]" % (category, action)
     parser = OptionParser(usage=usage)
     for ar, kw in options:
         parser.add_option(*ar, **kw)
-- 
cgit 


From 31b9bb98b067d45b7fcdf11fc5791b4b1379280b Mon Sep 17 00:00:00 2001
From: Lvov Maxim <usrleon@gmail.com>
Date: Mon, 25 Jul 2011 17:38:42 +0400
Subject: add decorator for 'dns' params

---
 bin/nova-manage | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/nova-manage b/bin/nova-manage
index 8165665cc..2d69e4d57 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -614,6 +614,8 @@ class NetworkCommands(object):
     @args('--flat_network_bridge', dest="flat_network_bridge", metavar='<flat network bridge>', help='Flat_network_bridge')
     @args('--bridge_interface', dest="bridge_interface", metavar='<bridge interface>', help='Bridge_interface')
     @args('--multi_host', dest="multi_host", metavar="<'T'|'F'>", help='Multi host')
+    @args('--dns1', dest="dns1", metavar="<DNS Address>", help='First DNS')
+    @args('--dns2', dest="dns2", metavar="<DNS Address>", help='Second DNS')
     def create(self, label=None, fixed_range=None, num_networks=None,
                network_size=None, multi_host=None, vlan_start=None,
                vpn_start=None, fixed_range_v6=None, gateway_v6=None,
-- 
cgit 


From 4c9ca0962e98c33b54d289c5ac1cd0dc79d36b51 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Tue, 26 Jul 2011 01:52:12 +0900
Subject: Moved the exception handling of unplugging VIF from virt driver to
 VIF driver.  Added better comments.  Added OpenStack copyrights to libivrt
 vifs.py

---
 nova/network/manager.py         |  6 ++----
 nova/virt/libvirt/connection.py |  9 ++-------
 nova/virt/libvirt/vif.py        | 20 ++++++++++++++------
 nova/virt/xenapi/vmops.py       |  9 ++-------
 4 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/nova/network/manager.py b/nova/network/manager.py
index 005fa73e7..cf971c011 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -300,12 +300,10 @@ class NetworkManager(manager.SchedulerDependentManager):
         The one at a time part is to flatten the layout to help scale
     """
 
-    """Constant to indicate whether this manager requires VIF to create a
-    bridge."""
+    # If True, this manager requires VIF to create a bridge.
     SHOULD_CREATE_BRIDGE = False
 
-    """Constant to indicate whether this manager requires VIF to create a
-    VLAN tag."""
+    # If True, this manager requires VIF to create VLAN tag.
     SHOULD_CREATE_VLAN = False
 
     timeout_fixed_ips = True
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index c9965185a..22dfac055 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -311,13 +311,8 @@ class LibvirtConnection(driver.ComputeDriver):
                             locals())
                 raise
 
-            try:
-                for (network, mapping) in network_info:
-                    self.vif_driver.unplug(instance, network, mapping)
-            except:
-                LOG.warning(_("Failed while unplugging vif of instance '%s'"),
-                            instance['name'])
-                raise
+            for (network, mapping) in network_info:
+                self.vif_driver.unplug(instance, network, mapping)
 
         def _wait_for_destroy():
             """Called at an interval until the VM is gone."""
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index aa566cc72..24d45d1a7 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -2,6 +2,7 @@
 
 # Copyright (C) 2011 Midokura KK
 # Copyright (C) 2011 Nicira, Inc
+# Copyright 2011 OpenStack LLC.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -29,7 +30,7 @@ LOG = logging.getLogger('nova.virt.libvirt.vif')
 
 FLAGS = flags.FLAGS
 
-flags.DEFINE_string('libvirt_ovs_integration_bridge', 'br-int',
+flags.DEFINE_string('libvirt_ovs_bridge', 'br-int',
                     'Name of Integration Bridge used by Open vSwitch')
 
 
@@ -99,12 +100,12 @@ class LibvirtOpenVswitchDriver(VIFDriver):
     def plug(self, instance, network, mapping):
         vif_id = str(instance['id']) + "-" + str(network['id'])
         dev = "tap-%s" % vif_id
+        iface_id = "nova-" + vif_id
         if not linux_net._device_exists(dev):
-            iface_id = "nova-" + vif_id
             utils.execute('sudo', 'ip', 'tuntap', 'add', dev, 'mode', 'tap')
             utils.execute('sudo', 'ip', 'link', 'set', dev, 'up')
         utils.execute('sudo', 'ovs-vsctl', '--', '--may-exist', 'add-port',
-                FLAGS.libvirt_ovs_integration_bridge, dev,
+                FLAGS.libvirt_ovs_bridge, dev,
                 '--', 'set', 'Interface', dev,
                 "external-ids:iface-id=%s" % iface_id,
                 '--', 'set', 'Interface', dev,
@@ -119,8 +120,15 @@ class LibvirtOpenVswitchDriver(VIFDriver):
         return result
 
     def unplug(self, instance, network, mapping):
+        """Unplug the VIF from the network by deleting the port from
+        the bridge."""
         vif_id = str(instance['id']) + "-" + str(network['id'])
         dev = "tap-%s" % vif_id
-        utils.execute('sudo', 'ovs-vsctl', 'del-port',
-                FLAGS.flat_network_bridge, dev)
-        utils.execute('sudo', 'ip', 'link', 'delete', dev)
+        try:
+            utils.execute('sudo', 'ovs-vsctl', 'del-port',
+                          FLAGS.flat_network_bridge, dev)
+            utils.execute('sudo', 'ip', 'link', 'delete', dev)
+        except:
+            LOG.warning(_("Failed while unplugging vif of instance '%s'"),
+                        instance['name'])
+            raise
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index b63308f55..0473abb97 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -876,13 +876,8 @@ class VMOps(object):
         self._destroy_vm(instance, vm_ref)
 
         if network_info:
-            try:
-                for (network, mapping) in network_info:
-                    self.vif_driver.unplug(instance, network, mapping)
-            except:
-                LOG.warning(_("Failed while unplugging vif of instance '%s'"),
-                            instance['name'])
-                raise
+            for (network, mapping) in network_info:
+                self.vif_driver.unplug(instance, network, mapping)
 
     def _wait_with_callback(self, instance_id, task, callback):
         ret = None
-- 
cgit 


From 1bb28f728e4f9345cc482dccadd7a679b9bc1667 Mon Sep 17 00:00:00 2001
From: Adam Johnson <adjohn@gmail.com>
Date: Tue, 26 Jul 2011 09:49:36 +0900
Subject: adding to authors

---
 Authors | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Authors b/Authors
index 9da9e5a0a..1a07946bd 100644
--- a/Authors
+++ b/Authors
@@ -1,4 +1,5 @@
 Adam Gandelman <adamg@canonical.com>
+Adam Johnson <adjohn@gmail.com>
 Alex Meade <alex.meade@rackspace.com>
 Alexander Sakhnov <asakhnov@mirantis.com>
 Andrey Brindeyev <abrindeyev@griddynamics.com>
-- 
cgit 


From 88ee72fbb50b5f7ead636ef65933489b0e099c2b Mon Sep 17 00:00:00 2001
From: Lvov Maxim <usrleon@gmail.com>
Date: Tue, 26 Jul 2011 09:37:48 +0400
Subject: fix pep8

---
 bin/nova-manage | 192 +++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 128 insertions(+), 64 deletions(-)

diff --git a/bin/nova-manage b/bin/nova-manage
index 2d69e4d57..b63bd326f 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -111,6 +111,7 @@ def args(*args, **kwargs):
         return func
     return _decorator
 
+
 def param2id(object_id):
     """Helper function to convert various id types to internal id.
     args: [object_id], e.g. 'vol-0000000a' or 'volume-0000000a' or '10'
@@ -128,7 +129,8 @@ class VpnCommands(object):
         self.manager = manager.AuthManager()
         self.pipe = pipelib.CloudPipe()
 
-    @args('--project', dest="project", metavar='<Project name>', help='Project name')
+    @args('--project', dest="project", metavar='<Project name>',
+            help='Project name')
     def list(self, project=None):
         """Print a listing of the VPN data for one or all projects."""
 
@@ -173,12 +175,14 @@ class VpnCommands(object):
                 self.pipe.launch_vpn_instance(p.id)
                 time.sleep(10)
 
-    @args('--project', dest="project_id", metavar='<Project name>', help='Project name')
+    @args('--project', dest="project_id", metavar='<Project name>',
+            help='Project name')
     def run(self, project_id):
         """Start the VPN for a given project."""
         self.pipe.launch_vpn_instance(project_id)
 
-    @args('--project', dest="project_id", metavar='<Project name>', help='Project name')
+    @args('--project', dest="project_id", metavar='<Project name>',
+            help='Project name')
     @args('--ip', dest="ip", metavar='<IP Address>', help='IP Address')
     @args('--port', dest="port", metavar='<Port>', help='Port')
     def change(self, project_id, ip, port):
@@ -222,7 +226,8 @@ class ShellCommands(object):
         Falls back to Python shell if unavailable"""
         self.run('python')
 
-    @args('--shell', dest="shell", metavar='<bpython|ipython|python >', help='Python shell')
+    @args('--shell', dest="shell", metavar='<bpython|ipython|python >',
+            help='Python shell')
     def run(self, shell=None):
         """Runs a Python interactive interpreter."""
         if not shell:
@@ -273,7 +278,8 @@ class RoleCommands(object):
 
     @args('--user', dest="user", metavar='<user name>', help='User name')
     @args('--role', dest="role", metavar='<user role>', help='User role')
-    @args('--project', dest="project", metavar='<Project name>', help='Project name')
+    @args('--project', dest="project", metavar='<Project name>',
+            help='Project name')
     def add(self, user, role, project=None):
         """adds role to user
         if project is specified, adds project specific role"""
@@ -286,7 +292,8 @@ class RoleCommands(object):
 
     @args('--user', dest="user", metavar='<user name>', help='User name')
     @args('--role', dest="role", metavar='<user role>', help='User role')
-    @args('--project', dest="project", metavar='<Project name>', help='Project name')
+    @args('--project', dest="project", metavar='<Project name>',
+            help='Project name')
     def has(self, user, role, project=None):
         """checks to see if user has role
         if project is specified, returns True if user has
@@ -295,7 +302,8 @@ class RoleCommands(object):
 
     @args('--user', dest="user", metavar='<user name>', help='User name')
     @args('--role', dest="role", metavar='<user role>', help='User role')
-    @args('--project', dest="project", metavar='<Project name>', help='Project name')
+    @args('--project', dest="project", metavar='<Project name>',
+            help='Project name')
     def remove(self, user, role, project=None):
         """removes role from user
         if project is specified, removes project specific role"""
@@ -365,9 +373,12 @@ class UserCommands(object):
             print user.name
 
     @args('--name', dest="name", metavar='<name>', help='User name')
-    @args('--access', dest="access_key", metavar='<access>', help='Access key')
-    @args('--secret', dest="secret_key", metavar='<secret>', help='Secret key')
-    @args('--is_admin', dest='is_admin', metavar="<'T'|'F'>", help='Is admin?')
+    @args('--access', dest="access_key", metavar='<access>',
+            help='Access key')
+    @args('--secret', dest="secret_key", metavar='<secret>',
+            help='Secret key')
+    @args('--is_admin', dest='is_admin', metavar="<'T'|'F'>",
+            help='Is admin?')
     def modify(self, name, access_key, secret_key, is_admin):
         """update a users keys & admin flag
         arguments: accesskey secretkey admin
@@ -382,7 +393,8 @@ class UserCommands(object):
         self.manager.modify_user(name, access_key, secret_key, is_admin)
 
     @args('--name', dest="user_id", metavar='<name>', help='User name')
-    @args('--project', dest="project_id", metavar='<Project name>', help='Project name')
+    @args('--project', dest="project_id", metavar='<Project name>',
+            help='Project name')
     def revoke(self, user_id, project_id=None):
         """revoke certs for a user"""
         if project_id:
@@ -397,7 +409,8 @@ class ProjectCommands(object):
     def __init__(self):
         self.manager = manager.AuthManager()
 
-    @args('--project', dest="project_id", metavar='<Project name>', help='Project name')
+    @args('--project', dest="project_id", metavar='<Project name>',
+            help='Project name')
     @args('--user', dest="user_id", metavar='<name>', help='User name')
     def add(self, project_id, user_id):
         """Adds user to project"""
@@ -407,9 +420,12 @@ class ProjectCommands(object):
             print ex
             raise
 
-    @args('--project', dest="name", metavar='<Project name>', help='Project name')
-    @args('--user', dest="project_manager", metavar='<user>', help='Project manager')
-    @args('--desc', dest="description", metavar='<description>', help='Description')
+    @args('--project', dest="name", metavar='<Project name>',
+            help='Project name')
+    @args('--user', dest="project_manager", metavar='<user>',
+            help='Project manager')
+    @args('--desc', dest="description", metavar='<description>',
+            help='Description')
     def create(self, name, project_manager, description=None):
         """Creates a new project"""
         try:
@@ -418,9 +434,12 @@ class ProjectCommands(object):
             print ex
             raise
 
-    @args('--project', dest="name", metavar='<Project name>', help='Project name')
-    @args('--user', dest="project_manager", metavar='<user>', help='Project manager')
-    @args('--desc', dest="description", metavar='<description>', help='Description')
+    @args('--project', dest="name", metavar='<Project name>',
+            help='Project name')
+    @args('--user', dest="project_manager", metavar='<user>',
+            help='Project manager')
+    @args('--desc', dest="description", metavar='<description>',
+            help='Description')
     def modify(self, name, project_manager, description=None):
         """Modifies a project"""
         try:
@@ -429,7 +448,8 @@ class ProjectCommands(object):
             print ex
             raise
 
-    @args('--project', dest="name", metavar='<Project name>', help='Project name')
+    @args('--project', dest="name", metavar='<Project name>',
+            help='Project name')
     def delete(self, name):
         """Deletes an existing project"""
         try:
@@ -438,9 +458,11 @@ class ProjectCommands(object):
             print ex
             raise
 
-    @args('--project', dest="project_id", metavar='<Project name>', help='Project name')
+    @args('--project', dest="project_id", metavar='<Project name>',
+            help='Project name')
     @args('--user', dest="user_id", metavar='<name>', help='User name')
-    @args('--file', dest="filename", metavar='<filename>', help='File name(Default: novarc)')
+    @args('--file', dest="filename", metavar='<filename>',
+            help='File name(Default: novarc)')
     def environment(self, project_id, user_id, filename='novarc'):
         """Exports environment variables to an sourcable file"""
         try:
@@ -460,7 +482,8 @@ class ProjectCommands(object):
         for project in self.manager.get_projects(username):
             print project.name
 
-    @args('--project', dest="project_id", metavar='<Project name>', help='Project name')
+    @args('--project', dest="project_id", metavar='<Project name>',
+            help='Project name')
     @args('--key', dest="key", metavar='<key>', help='Key')
     @args('--value', dest="value", metavar='<value>', help='Value')
     def quota(self, project_id, key=None, value=None):
@@ -479,7 +502,8 @@ class ProjectCommands(object):
                 value = 'unlimited'
             print '%s: %s' % (key, value)
 
-    @args('--project', dest="project_id", metavar='<Project name>', help='Project name')
+    @args('--project', dest="project_id", metavar='<Project name>',
+            help='Project name')
     @args('--user', dest="user_id", metavar='<name>', help='User name')
     def remove(self, project_id, user_id):
         """Removes user from project"""
@@ -489,7 +513,8 @@ class ProjectCommands(object):
             print ex
             raise
 
-    @args('--project', dest="project_id", metavar='<Project name>', help='Project name')
+    @args('--project', dest="project_id", metavar='<Project name>',
+            help='Project name')
     def scrub(self, project_id):
         """Deletes data associated with project"""
         admin_context = context.get_admin_context()
@@ -500,9 +525,11 @@ class ProjectCommands(object):
         for group in groups:
             db.security_group_destroy(admin_context, group['id'])
 
-    @args('--project', dest="project_id", metavar='<Project name>', help='Project name')
+    @args('--project', dest="project_id", metavar='<Project name>',
+            help='Project name')
     @args('--user', dest="user_id", metavar='<name>', help='User name')
-    @args('--file', dest="filename", metavar='<filename>', help='File name(Default: nova.zip)')
+    @args('--file', dest="filename", metavar='<filename>',
+            help='File name(Default: nova.zip)')
     def zipfile(self, project_id, user_id, filename='nova.zip'):
         """Exports credentials for project to a zip file"""
         try:
@@ -521,9 +548,9 @@ class ProjectCommands(object):
                     '  nova-manage network create pvt 10.0.0.0/8 10 64\n\n')
         except exception.ProcessExecutionError, e:
             print e
-            print _("The above error may show that the certificate db has not "
-                    "been created.\nPlease create a database by running a "
-                    "nova-api server on this host.")
+            print _("The above error may show that the certificate db has "
+                    "not been created.\nPlease create a database by running "
+                    "a nova-api server on this host.")
 
 AccountCommands = ProjectCommands
 
@@ -603,17 +630,24 @@ class FloatingIpCommands(object):
 class NetworkCommands(object):
     """Class for managing networks."""
 
-    @args('--label', dest="label", metavar='<label>', help='Label (ex: public)')
-    @args('--network', dest="fixed_range", metavar='<x.x.x.x/yy>', help='Network')
-    @args('--num_networks', dest="num_networks", metavar='<number>', help='How many networks create')
-    @args('--network_size', dest="network_size", metavar='<number>', help='How many hosts in network')
+    @args('--label', dest="label", metavar='<label>',
+            help='Label(ex: public)')
+    @args('--network', dest="fixed_range", metavar='<x.x.x.x/yy>',
+            help='Network')
+    @args('--num_networks', dest="num_networks", metavar='<number>',
+            help='How many networks create')
+    @args('--network_size', dest="network_size", metavar='<number>',
+            help='How many hosts in network')
     @args('--vlan', dest="vlan_start", metavar='<vlan id>', help='vlan id')
     @args('--vpn', dest="vpn_start", help='vpn start')
     @args('--fixed_range_v6', dest="fixed_range_v6", help='fixed ipv6 range')
     @args('--gateway_v6', dest="gateway_v6", help='ipv6 gateway')
-    @args('--flat_network_bridge', dest="flat_network_bridge", metavar='<flat network bridge>', help='Flat_network_bridge')
-    @args('--bridge_interface', dest="bridge_interface", metavar='<bridge interface>', help='Bridge_interface')
-    @args('--multi_host', dest="multi_host", metavar="<'T'|'F'>", help='Multi host')
+    @args('--flat_network_bridge', dest="flat_network_bridge",
+            metavar='<flat network bridge>', help='Flat_network_bridge')
+    @args('--bridge_interface', dest="bridge_interface",
+            metavar='<bridge interface>', help='Bridge_interface')
+    @args('--multi_host', dest="multi_host", metavar="<'T'|'F'>",
+            help='Multi host')
     @args('--dns1', dest="dns1", metavar="<DNS Address>", help='First DNS')
     @args('--dns2', dest="dns2", metavar="<DNS Address>", help='Second DNS')
     def create(self, label=None, fixed_range=None, num_networks=None,
@@ -694,7 +728,8 @@ class NetworkCommands(object):
                                         network.vlan,
                                         network.project_id)
 
-    @args('--network', dest="fixed_range", metavar='<x.x.x.x/yy>', help='Network to delete')
+    @args('--network', dest="fixed_range", metavar='<x.x.x.x/yy>',
+            help='Network to delete')
     def delete(self, fixed_range):
         """Deletes a network"""
         network = db.network_get_by_cidr(context.get_admin_context(), \
@@ -750,7 +785,8 @@ class VmCommands(object):
                 instance['launch_index'])
 
     @args('--ec2_id', dest='ec2_id', metavar='<ec2 id>', help='EC2 ID')
-    @args('--dest', dest='dest', metavar='<Destanation>', help='destanation node')
+    @args('--dest', dest='dest', metavar='<Destanation>',
+            help='destanation node')
     def live_migration(self, ec2_id, dest):
         """Migrates a running instance to a new machine."""
 
@@ -783,9 +819,12 @@ class ServiceCommands(object):
     """Enable and disable running services"""
 
     @args('--host', dest='host', metavar='<host>', help='Host')
-    @args('--service', dest='service', metavar='<service>', help='Nova service')
+    @args('--service', dest='service', metavar='<service>',
+            help='Nova service')
     def list(self, host=None, service=None):
-        """Show a list of all running services. Filter by host & service name."""
+        """
+        Show a list of all running services. Filter by host & service name.
+        """
         ctxt = context.get_admin_context()
         now = utils.utcnow()
         services = db.service_get_all(ctxt)
@@ -805,7 +844,8 @@ class ServiceCommands(object):
                                               svc['updated_at'])
 
     @args('--host', dest='host', metavar='<host>', help='Host')
-    @args('--service', dest='service', metavar='<service>', help='Nova service')
+    @args('--service', dest='service', metavar='<service>',
+            help='Nova service')
     def enable(self, host, service):
         """Enable scheduling for a service"""
         ctxt = context.get_admin_context()
@@ -816,7 +856,8 @@ class ServiceCommands(object):
         db.service_update(ctxt, svc['id'], {'disabled': False})
 
     @args('--host', dest='host', metavar='<host>', help='Host')
-    @args('--service', dest='service', metavar='<service>', help='Nova service')
+    @args('--service', dest='service', metavar='<service>',
+            help='Nova service')
     def disable(self, host, service):
         """Disable scheduling for a service"""
         ctxt = context.get_admin_context()
@@ -902,7 +943,8 @@ class DbCommands(object):
     def __init__(self):
         pass
 
-    @args('--version', dest='version', metavar='<version>', help='Database version')
+    @args('--version', dest='version', metavar='<version>',
+            help='Database version')
     def sync(self, version=None):
         """Sync the database up to the most recent version."""
         return migration.db_sync(version)
@@ -929,7 +971,8 @@ class VersionCommands(object):
 class VolumeCommands(object):
     """Methods for dealing with a cloud in an odd state"""
 
-    @args('--volume', dest='volume_id', metavar='<volume id>', help='Volume ID')
+    @args('--volume', dest='volume_id', metavar='<volume id>',
+            help='Volume ID')
     def delete(self, volume_id):
         """Delete a volume, bypassing the check that it
         must be available."""
@@ -953,7 +996,8 @@ class VolumeCommands(object):
                  {"method": "delete_volume",
                   "args": {"volume_id": volume['id']}})
 
-    @args('--volume', dest='volume_id', metavar='<volume id>', help='Volume ID')
+    @args('--volume', dest='volume_id', metavar='<volume id>',
+            help='Volume ID')
     def reattach(self, volume_id):
         """Re-attach a volume that has previously been attached
         to an instance.  Typically called after a compute host
@@ -984,14 +1028,20 @@ class InstanceTypeCommands(object):
             val["flavorid"], val["swap"], val["rxtx_quota"],
             val["rxtx_cap"], deleted)
 
-    @args('--name', dest='name', metavar='<name>', help='Name of instance type/flavor')
-    @args('--memory', dest='memory', metavar='<memory size>', help='Memory size')
+    @args('--name', dest='name', metavar='<name>',
+            help='Name of instance type/flavor')
+    @args('--memory', dest='memory', metavar='<memory size>',
+            help='Memory size')
     @args('--cpu', dest='vcpus', metavar='<num cores>', help='Number cpus')
-    @args('--local_gb', dest='local_gb', metavar='<local_gb>', help='local_gb')
-    @args('--flavor', dest='flavorid', metavar='<flavor  id>', help='Flavor ID')
+    @args('--local_gb', dest='local_gb', metavar='<local_gb>',
+            help='local_gb')
+    @args('--flavor', dest='flavorid', metavar='<flavor  id>',
+            help='Flavor ID')
     @args('--swap', dest='swap', metavar='<swap>', help='Swap')
-    @args('--rxtx_quota', dest='rxtx_quota', metavar='<rxtx_quota>', help='rxtx_quota')
-    @args('--rxtx_cap', dest='rxtx_cap', metavar='<rxtx_cap>', help='rxtx_cap')
+    @args('--rxtx_quota', dest='rxtx_quota', metavar='<rxtx_quota>',
+            help='rxtx_quota')
+    @args('--rxtx_cap', dest='rxtx_cap', metavar='<rxtx_cap>',
+            help='rxtx_cap')
     def create(self, name, memory, vcpus, local_gb, flavorid,
                swap=0, rxtx_quota=0, rxtx_cap=0):
         """Creates instance types / flavors"""
@@ -1017,7 +1067,8 @@ class InstanceTypeCommands(object):
         else:
             print "%s created" % name
 
-    @args('--name', dest='name', metavar='<name>', help='Name of instance type/flavor')
+    @args('--name', dest='name', metavar='<name>',
+            help='Name of instance type/flavor')
     def delete(self, name, purge=None):
         """Marks instance types / flavors as deleted"""
         try:
@@ -1038,7 +1089,8 @@ class InstanceTypeCommands(object):
         else:
             print "%s %s" % (name, verb)
 
-    @args('--name', dest='name', metavar='<name>', help='Name of instance type/flavor')
+    @args('--name', dest='name', metavar='<name>',
+            help='Name of instance type/flavor')
     def list(self, name=None):
         """Lists all active or specific instance types / flavors"""
         try:
@@ -1093,8 +1145,10 @@ class ImageCommands(object):
     @args('--ram', dest='ramdisk', metavar='<ramdisk>', help='RAM disk')
     @args('--owner', dest='owner', metavar='<owner>', help='Image owner')
     @args('--name', dest='name', metavar='<name>', help='Image name')
-    @args('--public', dest='is_public', metavar="<'T'|'F'>", help='Image public or not')
-    @args('--arch', dest='architecture', metavar='<arch>', help='Architecture')
+    @args('--public', dest='is_public', metavar="<'T'|'F'>",
+            help='Image public or not')
+    @args('--arch', dest='architecture', metavar='<arch>',
+            help='Architecture')
     def all_register(self, image, kernel, ramdisk, owner, name=None,
                  is_public='T', architecture='x86_64'):
         """Uploads an image, kernel, and ramdisk into the image_service"""
@@ -1109,10 +1163,15 @@ class ImageCommands(object):
     @args('--path', dest='path', metavar='<path>', help='Image path')
     @args('--owner', dest='owner', metavar='<owner>', help='Image owner')
     @args('--name', dest='name', metavar='<name>', help='Image name')
-    @args('--public', dest='is_public', metavar="<'T'|'F'>", help='Image public or not')
-    @args('--arch', dest='architecture', metavar='<arch>', help='Architecture')
-    @args('--cont_format', dest='container_format', metavar='<container format>', help='Container format(default: bare)')
-    @args('--disk_format', dest='disk_format', metavar='<disk format>', help='Disk format(default: raw)')
+    @args('--public', dest='is_public', metavar="<'T'|'F'>",
+            help='Image public or not')
+    @args('--arch', dest='architecture', metavar='<arch>',
+            help='Architecture')
+    @args('--cont_format', dest='container_format',
+            metavar='<container format>',
+            help='Container format(default bare)')
+    @args('--disk_format', dest='disk_format', metavar='<disk format>',
+            help='Disk format(default: raw)')
     @args('--kernel', dest='kernel_id', metavar='<kernel>', help='Kernel')
     @args('--ram', dest='ramdisk_id', metavar='<ramdisk>', help='RAM disk')
     def image_register(self, path, owner, name=None, is_public='T',
@@ -1126,8 +1185,10 @@ class ImageCommands(object):
     @args('--path', dest='path', metavar='<path>', help='Image path')
     @args('--owner', dest='owner', metavar='<owner>', help='Image owner')
     @args('--name', dest='name', metavar='<name>', help='Image name')
-    @args('--public', dest='is_public', metavar="<'T'|'F'>", help='Image public or not')
-    @args('--arch', dest='architecture', metavar='<arch>', help='Architecture')
+    @args('--public', dest='is_public', metavar="<'T'|'F'>",
+            help='Image public or not')
+    @args('--arch', dest='architecture', metavar='<arch>',
+            help='Architecture')
     def kernel_register(self, path, owner, name=None, is_public='T',
                architecture='x86_64'):
         """Uploads a kernel into the image_service"""
@@ -1137,8 +1198,10 @@ class ImageCommands(object):
     @args('--path', dest='path', metavar='<path>', help='Image path')
     @args('--owner', dest='owner', metavar='<owner>', help='Image owner')
     @args('--name', dest='name', metavar='<name>', help='Image name')
-    @args('--public', dest='is_public', metavar="<'T'|'F'>", help='Image public or not')
-    @args('--arch', dest='architecture', metavar='<arch>', help='Architecture')
+    @args('--public', dest='is_public', metavar="<'T'|'F'>",
+            help='Image public or not')
+    @args('--arch', dest='architecture', metavar='<arch>',
+            help='Architecture')
     def ramdisk_register(self, path, owner, name=None, is_public='T',
                 architecture='x86_64'):
         """Uploads a ramdisk into the image_service"""
@@ -1190,7 +1253,8 @@ class ImageCommands(object):
             except Exception as exc:
                 print _("Failed to convert %(old)s: %(exc)s") % locals()
 
-    @args('--dir', dest='directory', metavar='<path>', help='Images directory')
+    @args('--dir', dest='directory', metavar='<path>',
+            help='Images directory')
     def convert(self, directory):
         """Uploads old objectstore images in directory to new service"""
         machine_images = {}
-- 
cgit