converted new lines from CRLF to LF

4 files changed, 513 insertions, 513 deletions

diff --git a/nova/db/sqlalchemy/migrate_repo/versions/012_add_ipv6_flatmanager.py b/nova/db/sqlalchemy/migrate_repo/versions/012_add_ipv6_flatmanager.py
index 9f98f436f..5f5e3d007 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/012_add_ipv6_flatmanager.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/012_add_ipv6_flatmanager.py
@@ -1,151 +1,151 @@
-# Copyright 2010 OpenStack LLC.

-# 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.

-

-from sqlalchemy import *

-from migrate import *

-

-from nova import log as logging

-

-

-meta = MetaData()

-

-

-# Table stub-definitions

-# Just for the ForeignKey and column creation to succeed, these are not the

-# actual definitions of instances or services.

-#

-

-#

-# Tables to alter

-#

-networks = Table('networks', meta,

-        Column('created_at', DateTime(timezone=False)),

-        Column('updated_at', DateTime(timezone=False)),

-        Column('deleted_at', DateTime(timezone=False)),

-        Column('deleted', Boolean(create_constraint=True, name=None)),

-        Column('id', Integer(),  primary_key=True, nullable=False),

-        Column('injected', Boolean(create_constraint=True, name=None)),

-        Column('cidr',

-               String(length=255, convert_unicode=False, assert_unicode=None,

-                      unicode_error=None, _warn_on_bytestring=False)),

-        Column('netmask',

-               String(length=255, convert_unicode=False, assert_unicode=None,

-                      unicode_error=None, _warn_on_bytestring=False)),

-        Column('bridge',

-               String(length=255, convert_unicode=False, assert_unicode=None,

-                      unicode_error=None, _warn_on_bytestring=False)),

-        Column('gateway',

-               String(length=255, convert_unicode=False, assert_unicode=None,

-                      unicode_error=None, _warn_on_bytestring=False)),

-        Column('broadcast',

-               String(length=255, convert_unicode=False, assert_unicode=None,

-                      unicode_error=None, _warn_on_bytestring=False)),

-        Column('dns',

-               String(length=255, convert_unicode=False, assert_unicode=None,

-                      unicode_error=None, _warn_on_bytestring=False)),

-        Column('vlan', Integer()),

-        Column('vpn_public_address',

-               String(length=255, convert_unicode=False, assert_unicode=None,

-                      unicode_error=None, _warn_on_bytestring=False)),

-        Column('vpn_public_port', Integer()),

-        Column('vpn_private_address',

-               String(length=255, convert_unicode=False, assert_unicode=None,

-                      unicode_error=None, _warn_on_bytestring=False)),

-        Column('dhcp_start',

-               String(length=255, convert_unicode=False, assert_unicode=None,

-                      unicode_error=None, _warn_on_bytestring=False)),

-        Column('project_id',

-               String(length=255, convert_unicode=False, assert_unicode=None,

-                      unicode_error=None, _warn_on_bytestring=False)),

-        Column('host',

-               String(length=255, convert_unicode=False, assert_unicode=None,

-                      unicode_error=None, _warn_on_bytestring=False)),

-        Column('cidr_v6',

-        String(length=255, convert_unicode=False, assert_unicode=None,

-               unicode_error=None, _warn_on_bytestring=False)),

-        Column('ra_server', String(length=255,

-                                   convert_unicode=False,

-                                   assert_unicode=None,

-                                   unicode_error=None,

-                                   _warn_on_bytestring=False)),

-        Column(

-        'label',

-        String(length=255, convert_unicode=False, assert_unicode=None,

-               unicode_error=None, _warn_on_bytestring=False)))

-

-fixed_ips = Table('fixed_ips', meta,

-        Column('created_at', DateTime(timezone=False)),

-        Column('updated_at', DateTime(timezone=False)),

-        Column('deleted_at', DateTime(timezone=False)),

-        Column('deleted', Boolean(create_constraint=True, name=None)),

-        Column('id', Integer(),  primary_key=True, nullable=False),

-        Column('address',

-               String(length=255, convert_unicode=False, assert_unicode=None,

-                      unicode_error=None, _warn_on_bytestring=False)),

-        Column('network_id',

-               Integer(),

-               ForeignKey('networks.id'),

-               nullable=True),

-        Column('instance_id',

-               Integer(),

-               ForeignKey('instances.id'),

-               nullable=True),

-        Column('allocated', Boolean(create_constraint=True, name=None)),

-        Column('leased', Boolean(create_constraint=True, name=None)),

-        Column('reserved', Boolean(create_constraint=True, name=None)),

-        Column("addressV6", String(length=255,

-                                   convert_unicode=False,

-                                   assert_unicode=None,

-                                   unicode_error=None,

-                                   _warn_on_bytestring=False)),

-        Column("netmaskV6", String(length=3,

-                                   convert_unicode=False,

-                                   assert_unicode=None,

-                                   unicode_error=None,

-                                   _warn_on_bytestring=False)),

-        Column("gatewayV6", String(length=255,

-                                   convert_unicode=False,

-                                   assert_unicode=None,

-                                   unicode_error=None,

-                                   _warn_on_bytestring=False)),

-        )

-#

-# New Tables

-#

-# None

-

-#

-# Columns to add to existing tables

-#

-networks_netmask_v6 = Column(

-        'netmask_v6',

-        String(length=255, convert_unicode=False, assert_unicode=None,

-               unicode_error=None, _warn_on_bytestring=False))

-

-

-def upgrade(migrate_engine):

-    # Upgrade operations go here. Don't create your own engine;

-    # bind migrate_engine to your metadata

-    meta.bind = migrate_engine

-

-    # Alter column name

-    networks.c.ra_server.alter(name='gateway_v6')

-    # Add new column to existing table

-    networks.create_column(networks_netmask_v6)

-

-    # drop existing columns from table

-    fixed_ips.c.addressV6.drop()

-    fixed_ips.c.netmaskV6.drop()

-    fixed_ips.c.gatewayV6.drop()

+# Copyright 2010 OpenStack LLC.
+# 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.
+
+from sqlalchemy import *
+from migrate import *
+
+from nova import log as logging
+
+
+meta = MetaData()
+
+
+# Table stub-definitions
+# Just for the ForeignKey and column creation to succeed, these are not the
+# actual definitions of instances or services.
+#
+
+#
+# Tables to alter
+#
+networks = Table('networks', meta,
+        Column('created_at', DateTime(timezone=False)),
+        Column('updated_at', DateTime(timezone=False)),
+        Column('deleted_at', DateTime(timezone=False)),
+        Column('deleted', Boolean(create_constraint=True, name=None)),
+        Column('id', Integer(),  primary_key=True, nullable=False),
+        Column('injected', Boolean(create_constraint=True, name=None)),
+        Column('cidr',
+               String(length=255, convert_unicode=False, assert_unicode=None,
+                      unicode_error=None, _warn_on_bytestring=False)),
+        Column('netmask',
+               String(length=255, convert_unicode=False, assert_unicode=None,
+                      unicode_error=None, _warn_on_bytestring=False)),
+        Column('bridge',
+               String(length=255, convert_unicode=False, assert_unicode=None,
+                      unicode_error=None, _warn_on_bytestring=False)),
+        Column('gateway',
+               String(length=255, convert_unicode=False, assert_unicode=None,
+                      unicode_error=None, _warn_on_bytestring=False)),
+        Column('broadcast',
+               String(length=255, convert_unicode=False, assert_unicode=None,
+                      unicode_error=None, _warn_on_bytestring=False)),
+        Column('dns',
+               String(length=255, convert_unicode=False, assert_unicode=None,
+                      unicode_error=None, _warn_on_bytestring=False)),
+        Column('vlan', Integer()),
+        Column('vpn_public_address',
+               String(length=255, convert_unicode=False, assert_unicode=None,
+                      unicode_error=None, _warn_on_bytestring=False)),
+        Column('vpn_public_port', Integer()),
+        Column('vpn_private_address',
+               String(length=255, convert_unicode=False, assert_unicode=None,
+                      unicode_error=None, _warn_on_bytestring=False)),
+        Column('dhcp_start',
+               String(length=255, convert_unicode=False, assert_unicode=None,
+                      unicode_error=None, _warn_on_bytestring=False)),
+        Column('project_id',
+               String(length=255, convert_unicode=False, assert_unicode=None,
+                      unicode_error=None, _warn_on_bytestring=False)),
+        Column('host',
+               String(length=255, convert_unicode=False, assert_unicode=None,
+                      unicode_error=None, _warn_on_bytestring=False)),
+        Column('cidr_v6',
+        String(length=255, convert_unicode=False, assert_unicode=None,
+               unicode_error=None, _warn_on_bytestring=False)),
+        Column('ra_server', String(length=255,
+                                   convert_unicode=False,
+                                   assert_unicode=None,
+                                   unicode_error=None,
+                                   _warn_on_bytestring=False)),
+        Column(
+        'label',
+        String(length=255, convert_unicode=False, assert_unicode=None,
+               unicode_error=None, _warn_on_bytestring=False)))
+
+fixed_ips = Table('fixed_ips', meta,
+        Column('created_at', DateTime(timezone=False)),
+        Column('updated_at', DateTime(timezone=False)),
+        Column('deleted_at', DateTime(timezone=False)),
+        Column('deleted', Boolean(create_constraint=True, name=None)),
+        Column('id', Integer(),  primary_key=True, nullable=False),
+        Column('address',
+               String(length=255, convert_unicode=False, assert_unicode=None,
+                      unicode_error=None, _warn_on_bytestring=False)),
+        Column('network_id',
+               Integer(),
+               ForeignKey('networks.id'),
+               nullable=True),
+        Column('instance_id',
+               Integer(),
+               ForeignKey('instances.id'),
+               nullable=True),
+        Column('allocated', Boolean(create_constraint=True, name=None)),
+        Column('leased', Boolean(create_constraint=True, name=None)),
+        Column('reserved', Boolean(create_constraint=True, name=None)),
+        Column("addressV6", String(length=255,
+                                   convert_unicode=False,
+                                   assert_unicode=None,
+                                   unicode_error=None,
+                                   _warn_on_bytestring=False)),
+        Column("netmaskV6", String(length=3,
+                                   convert_unicode=False,
+                                   assert_unicode=None,
+                                   unicode_error=None,
+                                   _warn_on_bytestring=False)),
+        Column("gatewayV6", String(length=255,
+                                   convert_unicode=False,
+                                   assert_unicode=None,
+                                   unicode_error=None,
+                                   _warn_on_bytestring=False)),
+        )
+#
+# New Tables
+#
+# None
+
+#
+# Columns to add to existing tables
+#
+networks_netmask_v6 = Column(
+        'netmask_v6',
+        String(length=255, convert_unicode=False, assert_unicode=None,
+               unicode_error=None, _warn_on_bytestring=False))
+
+
+def upgrade(migrate_engine):
+    # Upgrade operations go here. Don't create your own engine;
+    # bind migrate_engine to your metadata
+    meta.bind = migrate_engine
+
+    # Alter column name
+    networks.c.ra_server.alter(name='gateway_v6')
+    # Add new column to existing table
+    networks.create_column(networks_netmask_v6)
+
+    # drop existing columns from table
+    fixed_ips.c.addressV6.drop()
+    fixed_ips.c.netmaskV6.drop()
+    fixed_ips.c.gatewayV6.drop()
diff --git a/nova/tests/network/__init__.py b/nova/tests/network/__init__.py
index 8f71a30ba..e0d479f8c 100644
--- a/nova/tests/network/__init__.py
+++ b/nova/tests/network/__init__.py
@@ -1,47 +1,47 @@
-import os

-

-from nova import context

-from nova import db

-from nova import flags

-from nova import log as logging

-from nova import utils

-

-FLAGS = flags.FLAGS

-LOG = logging.getLogger('nova.tests.network')

-

-

-def binpath(script):

-    """Returns the absolute path to a script in bin"""

-    return os.path.abspath(os.path.join(__file__, "../../../../bin", script))

-

-

-def lease_ip(private_ip):

-    """Run add command on dhcpbridge"""

-    network_ref = db.fixed_ip_get_network(context.get_admin_context(),

-                                          private_ip)

-    instance_ref = db.fixed_ip_get_instance(context.get_admin_context(),

-                                            private_ip)

-    cmd = (binpath('nova-dhcpbridge'), 'add',

-           instance_ref['mac_address'],

-           private_ip, 'fake')

-    env = {'DNSMASQ_INTERFACE': network_ref['bridge'],

-           'TESTING': '1',

-           'FLAGFILE': FLAGS.dhcpbridge_flagfile}

-    (out, err) = utils.execute(*cmd, addl_env=env)

-    LOG.debug("ISSUE_IP: %s, %s ", out, err)

-

-

-def release_ip(private_ip):

-    """Run del command on dhcpbridge"""

-    network_ref = db.fixed_ip_get_network(context.get_admin_context(),

-                                          private_ip)

-    instance_ref = db.fixed_ip_get_instance(context.get_admin_context(),

-                                            private_ip)

-    cmd = (binpath('nova-dhcpbridge'), 'del',

-           instance_ref['mac_address'],

-           private_ip, 'fake')

-    env = {'DNSMASQ_INTERFACE': network_ref['bridge'],

-           'TESTING': '1',

-           'FLAGFILE': FLAGS.dhcpbridge_flagfile}

-    (out, err) = utils.execute(*cmd, addl_env=env)

-    LOG.debug("RELEASE_IP: %s, %s ", out, err)

+import os
+
+from nova import context
+from nova import db
+from nova import flags
+from nova import log as logging
+from nova import utils
+
+FLAGS = flags.FLAGS
+LOG = logging.getLogger('nova.tests.network')
+
+
+def binpath(script):
+    """Returns the absolute path to a script in bin"""
+    return os.path.abspath(os.path.join(__file__, "../../../../bin", script))
+
+
+def lease_ip(private_ip):
+    """Run add command on dhcpbridge"""
+    network_ref = db.fixed_ip_get_network(context.get_admin_context(),
+                                          private_ip)
+    instance_ref = db.fixed_ip_get_instance(context.get_admin_context(),
+                                            private_ip)
+    cmd = (binpath('nova-dhcpbridge'), 'add',
+           instance_ref['mac_address'],
+           private_ip, 'fake')
+    env = {'DNSMASQ_INTERFACE': network_ref['bridge'],
+           'TESTING': '1',
+           'FLAGFILE': FLAGS.dhcpbridge_flagfile}
+    (out, err) = utils.execute(*cmd, addl_env=env)
+    LOG.debug("ISSUE_IP: %s, %s ", out, err)
+
+
+def release_ip(private_ip):
+    """Run del command on dhcpbridge"""
+    network_ref = db.fixed_ip_get_network(context.get_admin_context(),
+                                          private_ip)
+    instance_ref = db.fixed_ip_get_instance(context.get_admin_context(),
+                                            private_ip)
+    cmd = (binpath('nova-dhcpbridge'), 'del',
+           instance_ref['mac_address'],
+           private_ip, 'fake')
+    env = {'DNSMASQ_INTERFACE': network_ref['bridge'],
+           'TESTING': '1',
+           'FLAGFILE': FLAGS.dhcpbridge_flagfile}
+    (out, err) = utils.execute(*cmd, addl_env=env)
+    LOG.debug("RELEASE_IP: %s, %s ", out, err)
diff --git a/nova/tests/network/base.py b/nova/tests/network/base.py
index 2dd8178ff..988a1de72 100644
--- a/nova/tests/network/base.py
+++ b/nova/tests/network/base.py
@@ -1,154 +1,154 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4

-

-# Copyright 2010 United States Government as represented by the

-# Administrator of the National Aeronautics and Space Administration.

-# 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.

-"""

-Base class of Unit Tests for all network models

-"""

-import IPy

-import os

-

-from nova import context

-from nova import db

-from nova import exception

-from nova import flags

-from nova import log as logging

-from nova import test

-from nova import utils

-from nova.auth import manager

-

-FLAGS = flags.FLAGS

-LOG = logging.getLogger('nova.tests.network')

-

-

-class NetworkTestCase(test.TestCase):

-    """Test cases for network code"""

-    def setUp(self):

-        super(NetworkTestCase, self).setUp()

-        # NOTE(vish): if you change these flags, make sure to change the

-        #             flags in the corresponding section in nova-dhcpbridge

-        self.flags(connection_type='fake',

-                   fake_call=True,

-                   fake_network=True)

-        self.manager = manager.AuthManager()

-        self.user = self.manager.create_user('netuser', 'netuser', 'netuser')

-        self.projects = []

-        self.network = utils.import_object(FLAGS.network_manager)

-        self.context = context.RequestContext(project=None, user=self.user)

-        for i in range(FLAGS.num_networks):

-            name = 'project%s' % i

-            project = self.manager.create_project(name, 'netuser', name)

-            self.projects.append(project)

-            # create the necessary network data for the project

-            user_context = context.RequestContext(project=self.projects[i],

-                                                     user=self.user)

-            host = self.network.get_network_host(user_context.elevated())

-        instance_ref = self._create_instance(0)

-        self.instance_id = instance_ref['id']

-        instance_ref = self._create_instance(1)

-        self.instance2_id = instance_ref['id']

-

-    def tearDown(self):

-        # TODO(termie): this should really be instantiating clean datastores

-        #               in between runs, one failure kills all the tests

-        db.instance_destroy(context.get_admin_context(), self.instance_id)

-        db.instance_destroy(context.get_admin_context(), self.instance2_id)

-        for project in self.projects:

-            self.manager.delete_project(project)

-        self.manager.delete_user(self.user)

-        super(NetworkTestCase, self).tearDown()

-

-    def _create_instance(self, project_num, mac=None):

-        if not mac:

-            mac = utils.generate_mac()

-        project = self.projects[project_num]

-        self.context._project = project

-        self.context.project_id = project.id

-        return db.instance_create(self.context,

-                                  {'project_id': project.id,

-                                   'mac_address': mac})

-

-    def _create_address(self, project_num, instance_id=None):

-        """Create an address in given project num"""

-        if instance_id is None:

-            instance_id = self.instance_id

-        self.context._project = self.projects[project_num]

-        self.context.project_id = self.projects[project_num].id

-        return self.network.allocate_fixed_ip(self.context, instance_id)

-

-    def _deallocate_address(self, project_num, address):

-        self.context._project = self.projects[project_num]

-        self.context.project_id = self.projects[project_num].id

-        self.network.deallocate_fixed_ip(self.context, address)

-

-    def _is_allocated_in_project(self, address, project_id):

-        """Returns true if address is in specified project"""

-        project_net = db.network_get_by_bridge(context.get_admin_context(),

-                                           FLAGS.flat_network_bridge)

-        network = db.fixed_ip_get_network(context.get_admin_context(),

-                                          address)

-        instance = db.fixed_ip_get_instance(context.get_admin_context(),

-                                            address)

-        # instance exists until release

-        return instance is not None and network['id'] == project_net['id']

-

-    def test_private_ipv6(self):

-        """Make sure ipv6 is OK"""

-        if FLAGS.use_ipv6:

-            instance_ref = self._create_instance(0)

-            address = self._create_address(0, instance_ref['id'])

-            network_ref = db.project_get_network(

-                                                 context.get_admin_context(),

-                                                 self.context.project_id)

-            address_v6 = db.instance_get_fixed_address_v6(

-                                                 context.get_admin_context(),

-                                                 instance_ref['id'])

-            self.assertEqual(instance_ref['mac_address'],

-                             utils.to_mac(address_v6))

-            instance_ref2 = db.fixed_ip_get_instance_v6(

-                                                 context.get_admin_context(),

-                                                 address_v6)

-            self.assertEqual(instance_ref['id'], instance_ref2['id'])

-            self.assertEqual(address_v6,

-                             utils.to_global_ipv6(

-                                                 network_ref['cidr_v6'],

-                                                 instance_ref['mac_address']))

-            self._deallocate_address(0, address)

-            db.instance_destroy(context.get_admin_context(),

-                                instance_ref['id'])

-

-    def test_available_ips(self):

-        """Make sure the number of available ips for the network is correct

-

-        The number of available IP addresses depends on the test

-        environment's setup.

-

-        Network size is set in test fixture's setUp method.

-

-        There are ips reserved at the bottom and top of the range.

-        services (network, gateway, CloudPipe, broadcast)

-        """

-        network = db.project_get_network(context.get_admin_context(),

-                                         self.projects[0].id)

-        net_size = flags.FLAGS.network_size

-        admin_context = context.get_admin_context()

-        total_ips = (db.network_count_available_ips(admin_context,

-                                                    network['id']) +

-                     db.network_count_reserved_ips(admin_context,

-                                                   network['id']) +

-                     db.network_count_allocated_ips(admin_context,

-                                                    network['id']))

-        self.assertEqual(total_ips, net_size)

+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# 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.
+"""
+Base class of Unit Tests for all network models
+"""
+import IPy
+import os
+
+from nova import context
+from nova import db
+from nova import exception
+from nova import flags
+from nova import log as logging
+from nova import test
+from nova import utils
+from nova.auth import manager
+
+FLAGS = flags.FLAGS
+LOG = logging.getLogger('nova.tests.network')
+
+
+class NetworkTestCase(test.TestCase):
+    """Test cases for network code"""
+    def setUp(self):
+        super(NetworkTestCase, self).setUp()
+        # NOTE(vish): if you change these flags, make sure to change the
+        #             flags in the corresponding section in nova-dhcpbridge
+        self.flags(connection_type='fake',
+                   fake_call=True,
+                   fake_network=True)
+        self.manager = manager.AuthManager()
+        self.user = self.manager.create_user('netuser', 'netuser', 'netuser')
+        self.projects = []
+        self.network = utils.import_object(FLAGS.network_manager)
+        self.context = context.RequestContext(project=None, user=self.user)
+        for i in range(FLAGS.num_networks):
+            name = 'project%s' % i
+            project = self.manager.create_project(name, 'netuser', name)
+            self.projects.append(project)
+            # create the necessary network data for the project
+            user_context = context.RequestContext(project=self.projects[i],
+                                                     user=self.user)
+            host = self.network.get_network_host(user_context.elevated())
+        instance_ref = self._create_instance(0)
+        self.instance_id = instance_ref['id']
+        instance_ref = self._create_instance(1)
+        self.instance2_id = instance_ref['id']
+
+    def tearDown(self):
+        # TODO(termie): this should really be instantiating clean datastores
+        #               in between runs, one failure kills all the tests
+        db.instance_destroy(context.get_admin_context(), self.instance_id)
+        db.instance_destroy(context.get_admin_context(), self.instance2_id)
+        for project in self.projects:
+            self.manager.delete_project(project)
+        self.manager.delete_user(self.user)
+        super(NetworkTestCase, self).tearDown()
+
+    def _create_instance(self, project_num, mac=None):
+        if not mac:
+            mac = utils.generate_mac()
+        project = self.projects[project_num]
+        self.context._project = project
+        self.context.project_id = project.id
+        return db.instance_create(self.context,
+                                  {'project_id': project.id,
+                                   'mac_address': mac})
+
+    def _create_address(self, project_num, instance_id=None):
+        """Create an address in given project num"""
+        if instance_id is None:
+            instance_id = self.instance_id
+        self.context._project = self.projects[project_num]
+        self.context.project_id = self.projects[project_num].id
+        return self.network.allocate_fixed_ip(self.context, instance_id)
+
+    def _deallocate_address(self, project_num, address):
+        self.context._project = self.projects[project_num]
+        self.context.project_id = self.projects[project_num].id
+        self.network.deallocate_fixed_ip(self.context, address)
+
+    def _is_allocated_in_project(self, address, project_id):
+        """Returns true if address is in specified project"""
+        project_net = db.network_get_by_bridge(context.get_admin_context(),
+                                           FLAGS.flat_network_bridge)
+        network = db.fixed_ip_get_network(context.get_admin_context(),
+                                          address)
+        instance = db.fixed_ip_get_instance(context.get_admin_context(),
+                                            address)
+        # instance exists until release
+        return instance is not None and network['id'] == project_net['id']
+
+    def test_private_ipv6(self):
+        """Make sure ipv6 is OK"""
+        if FLAGS.use_ipv6:
+            instance_ref = self._create_instance(0)
+            address = self._create_address(0, instance_ref['id'])
+            network_ref = db.project_get_network(
+                                                 context.get_admin_context(),
+                                                 self.context.project_id)
+            address_v6 = db.instance_get_fixed_address_v6(
+                                                 context.get_admin_context(),
+                                                 instance_ref['id'])
+            self.assertEqual(instance_ref['mac_address'],
+                             utils.to_mac(address_v6))
+            instance_ref2 = db.fixed_ip_get_instance_v6(
+                                                 context.get_admin_context(),
+                                                 address_v6)
+            self.assertEqual(instance_ref['id'], instance_ref2['id'])
+            self.assertEqual(address_v6,
+                             utils.to_global_ipv6(
+                                                 network_ref['cidr_v6'],
+                                                 instance_ref['mac_address']))
+            self._deallocate_address(0, address)
+            db.instance_destroy(context.get_admin_context(),
+                                instance_ref['id'])
+
+    def test_available_ips(self):
+        """Make sure the number of available ips for the network is correct
+
+        The number of available IP addresses depends on the test
+        environment's setup.
+
+        Network size is set in test fixture's setUp method.
+
+        There are ips reserved at the bottom and top of the range.
+        services (network, gateway, CloudPipe, broadcast)
+        """
+        network = db.project_get_network(context.get_admin_context(),
+                                         self.projects[0].id)
+        net_size = flags.FLAGS.network_size
+        admin_context = context.get_admin_context()
+        total_ips = (db.network_count_available_ips(admin_context,
+                                                    network['id']) +
+                     db.network_count_reserved_ips(admin_context,
+                                                   network['id']) +
+                     db.network_count_allocated_ips(admin_context,
+                                                    network['id']))
+        self.assertEqual(total_ips, net_size)
diff --git a/nova/tests/test_flat_network.py b/nova/tests/test_flat_network.py
index b6f7762c5..dcc617e25 100644
--- a/nova/tests/test_flat_network.py
+++ b/nova/tests/test_flat_network.py
@@ -1,161 +1,161 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4

-

-# Copyright 2010 United States Government as represented by the

-# Administrator of the National Aeronautics and Space Administration.

-# 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.

-"""

-Unit Tests for flat network code

-"""

-import IPy

-import os

-import unittest

-

-from nova import context

-from nova import db

-from nova import exception

-from nova import flags

-from nova import log as logging

-from nova import test

-from nova import utils

-from nova.auth import manager

-from nova.tests.network import base

-

-

-FLAGS = flags.FLAGS

-LOG = logging.getLogger('nova.tests.network')

-

-

-class FlatNetworkTestCase(base.NetworkTestCase):

-    """Test cases for network code"""

-    def test_public_network_association(self):

-        """Makes sure that we can allocate a public ip"""

-        # TODO(vish): better way of adding floating ips

-

-        self.context._project = self.projects[0]

-        self.context.project_id = self.projects[0].id

-        pubnet = IPy.IP(flags.FLAGS.floating_range)

-        address = str(pubnet[0])

-        try:

-            db.floating_ip_get_by_address(context.get_admin_context(), address)

-        except exception.NotFound:

-            db.floating_ip_create(context.get_admin_context(),

-                                  {'address': address,

-                                   'host': FLAGS.host})

-

-        self.assertRaises(NotImplementedError,

-                          self.network.allocate_floating_ip,

-                          self.context, self.projects[0].id)

-

-        fix_addr = self._create_address(0)

-        float_addr = address

-        self.assertRaises(NotImplementedError,

-                          self.network.associate_floating_ip,

-                          self.context, float_addr, fix_addr)

-

-        address = db.instance_get_floating_address(context.get_admin_context(),

-                                                   self.instance_id)

-        self.assertEqual(address, None)

-

-        self.assertRaises(NotImplementedError,

-                          self.network.disassociate_floating_ip,

-                          self.context, float_addr)

-

-        address = db.instance_get_floating_address(context.get_admin_context(),

-                                                   self.instance_id)

-        self.assertEqual(address, None)

-

-        self.assertRaises(NotImplementedError,

-                          self.network.deallocate_floating_ip,

-                          self.context, float_addr)

-

-        self.network.deallocate_fixed_ip(self.context, fix_addr)

-        db.floating_ip_destroy(context.get_admin_context(), float_addr)

-

-    def test_allocate_deallocate_fixed_ip(self):

-        """Makes sure that we can allocate and deallocate a fixed ip"""

-        address = self._create_address(0)

-        self.assertTrue(self._is_allocated_in_project(address,

-                                                      self.projects[0].id))

-        self._deallocate_address(0, address)

-

-        # check if the fixed ip address is really deallocated

-        self.assertFalse(self._is_allocated_in_project(address,

-                                                       self.projects[0].id))

-

-    def test_side_effects(self):

-        """Ensures allocating and releasing has no side effects"""

-        address = self._create_address(0)

-        address2 = self._create_address(1, self.instance2_id)

-

-        self.assertTrue(self._is_allocated_in_project(address,

-                                                      self.projects[0].id))

-        self.assertTrue(self._is_allocated_in_project(address2,

-                                                      self.projects[1].id))

-

-        self._deallocate_address(0, address)

-        self.assertFalse(self._is_allocated_in_project(address,

-                                                       self.projects[0].id))

-

-        # First address release shouldn't affect the second

-        self.assertTrue(self._is_allocated_in_project(address2,

-                                                      self.projects[0].id))

-

-        self._deallocate_address(1, address2)

-        self.assertFalse(self._is_allocated_in_project(address2,

-                                                 self.projects[1].id))

-

-    def test_ips_are_reused(self):

-        """Makes sure that ip addresses that are deallocated get reused"""

-        address = self._create_address(0)

-        self.network.deallocate_fixed_ip(self.context, address)

-

-        address2 = self._create_address(0)

-        self.assertEqual(address, address2)

-

-        self.network.deallocate_fixed_ip(self.context, address2)

-

-    def test_too_many_addresses(self):

-        """Test for a NoMoreAddresses exception when all fixed ips are used.

-        """

-        admin_context = context.get_admin_context()

-        network = db.project_get_network(admin_context, self.projects[0].id)

-        num_available_ips = db.network_count_available_ips(admin_context,

-                                                           network['id'])

-        addresses = []

-        instance_ids = []

-        for i in range(num_available_ips):

-            instance_ref = self._create_instance(0)

-            instance_ids.append(instance_ref['id'])

-            address = self._create_address(0, instance_ref['id'])

-            addresses.append(address)

-

-        ip_count = db.network_count_available_ips(context.get_admin_context(),

-                                                  network['id'])

-        self.assertEqual(ip_count, 0)

-        self.assertRaises(db.NoMoreAddresses,

-                          self.network.allocate_fixed_ip,

-                          self.context,

-                          'foo')

-

-        for i in range(num_available_ips):

-            self.network.deallocate_fixed_ip(self.context, addresses[i])

-            db.instance_destroy(context.get_admin_context(), instance_ids[i])

-        ip_count = db.network_count_available_ips(context.get_admin_context(),

-                                                  network['id'])

-        self.assertEqual(ip_count, num_available_ips)

-

-    def run(self, result=None):

-        if(FLAGS.network_manager == 'nova.network.manager.FlatManager'):

-            super(FlatNetworkTestCase, self).run(result)

+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# 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.
+"""
+Unit Tests for flat network code
+"""
+import IPy
+import os
+import unittest
+
+from nova import context
+from nova import db
+from nova import exception
+from nova import flags
+from nova import log as logging
+from nova import test
+from nova import utils
+from nova.auth import manager
+from nova.tests.network import base
+
+
+FLAGS = flags.FLAGS
+LOG = logging.getLogger('nova.tests.network')
+
+
+class FlatNetworkTestCase(base.NetworkTestCase):
+    """Test cases for network code"""
+    def test_public_network_association(self):
+        """Makes sure that we can allocate a public ip"""
+        # TODO(vish): better way of adding floating ips
+
+        self.context._project = self.projects[0]
+        self.context.project_id = self.projects[0].id
+        pubnet = IPy.IP(flags.FLAGS.floating_range)
+        address = str(pubnet[0])
+        try:
+            db.floating_ip_get_by_address(context.get_admin_context(), address)
+        except exception.NotFound:
+            db.floating_ip_create(context.get_admin_context(),
+                                  {'address': address,
+                                   'host': FLAGS.host})
+
+        self.assertRaises(NotImplementedError,
+                          self.network.allocate_floating_ip,
+                          self.context, self.projects[0].id)
+
+        fix_addr = self._create_address(0)
+        float_addr = address
+        self.assertRaises(NotImplementedError,
+                          self.network.associate_floating_ip,
+                          self.context, float_addr, fix_addr)
+
+        address = db.instance_get_floating_address(context.get_admin_context(),
+                                                   self.instance_id)
+        self.assertEqual(address, None)
+
+        self.assertRaises(NotImplementedError,
+                          self.network.disassociate_floating_ip,
+                          self.context, float_addr)
+
+        address = db.instance_get_floating_address(context.get_admin_context(),
+                                                   self.instance_id)
+        self.assertEqual(address, None)
+
+        self.assertRaises(NotImplementedError,
+                          self.network.deallocate_floating_ip,
+                          self.context, float_addr)
+
+        self.network.deallocate_fixed_ip(self.context, fix_addr)
+        db.floating_ip_destroy(context.get_admin_context(), float_addr)
+
+    def test_allocate_deallocate_fixed_ip(self):
+        """Makes sure that we can allocate and deallocate a fixed ip"""
+        address = self._create_address(0)
+        self.assertTrue(self._is_allocated_in_project(address,
+                                                      self.projects[0].id))
+        self._deallocate_address(0, address)
+
+        # check if the fixed ip address is really deallocated
+        self.assertFalse(self._is_allocated_in_project(address,
+                                                       self.projects[0].id))
+
+    def test_side_effects(self):
+        """Ensures allocating and releasing has no side effects"""
+        address = self._create_address(0)
+        address2 = self._create_address(1, self.instance2_id)
+
+        self.assertTrue(self._is_allocated_in_project(address,
+                                                      self.projects[0].id))
+        self.assertTrue(self._is_allocated_in_project(address2,
+                                                      self.projects[1].id))
+
+        self._deallocate_address(0, address)
+        self.assertFalse(self._is_allocated_in_project(address,
+                                                       self.projects[0].id))
+
+        # First address release shouldn't affect the second
+        self.assertTrue(self._is_allocated_in_project(address2,
+                                                      self.projects[0].id))
+
+        self._deallocate_address(1, address2)
+        self.assertFalse(self._is_allocated_in_project(address2,
+                                                 self.projects[1].id))
+
+    def test_ips_are_reused(self):
+        """Makes sure that ip addresses that are deallocated get reused"""
+        address = self._create_address(0)
+        self.network.deallocate_fixed_ip(self.context, address)
+
+        address2 = self._create_address(0)
+        self.assertEqual(address, address2)
+
+        self.network.deallocate_fixed_ip(self.context, address2)
+
+    def test_too_many_addresses(self):
+        """Test for a NoMoreAddresses exception when all fixed ips are used.
+        """
+        admin_context = context.get_admin_context()
+        network = db.project_get_network(admin_context, self.projects[0].id)
+        num_available_ips = db.network_count_available_ips(admin_context,
+                                                           network['id'])
+        addresses = []
+        instance_ids = []
+        for i in range(num_available_ips):
+            instance_ref = self._create_instance(0)
+            instance_ids.append(instance_ref['id'])
+            address = self._create_address(0, instance_ref['id'])
+            addresses.append(address)
+
+        ip_count = db.network_count_available_ips(context.get_admin_context(),
+                                                  network['id'])
+        self.assertEqual(ip_count, 0)
+        self.assertRaises(db.NoMoreAddresses,
+                          self.network.allocate_fixed_ip,
+                          self.context,
+                          'foo')
+
+        for i in range(num_available_ips):
+            self.network.deallocate_fixed_ip(self.context, addresses[i])
+            db.instance_destroy(context.get_admin_context(), instance_ids[i])
+        ip_count = db.network_count_available_ips(context.get_admin_context(),
+                                                  network['id'])
+        self.assertEqual(ip_count, num_available_ips)
+
+    def run(self, result=None):
+        if(FLAGS.network_manager == 'nova.network.manager.FlatManager'):
+            super(FlatNetworkTestCase, self).run(result)