Merge lp:~mcgrue/nova/volume-cleanup into lp:~hudson-openstack/nova/trunk

[Ben McGraw]

Stage 1 of the AES removal / volume cleanup work.

[lp:~mcgrue/nova/volume-cleanup]

1455. By Dan Prince on 2011-08-18

Cleanup the '_base' directory in libvirt tests.

1456. By Tushar Patil on 2011-08-18

Accept binary user_data in radix-64 format when you launch a new server using OSAPI. This user_data would be stored along with the other server properties in the database. Once the VM instance boots you can query for the user-data to do any custom installation of applications/servers or do some specific job like setting up networking route table.

You can query for user-data using curl with the URL:-
curl http://169.254.169.254/latest/user-data

1457. By John Tran on 2011-08-18

Fixed bug in which DescribeInstances was returning deleted instances. Added tests for pertinent api methods.

1458. By Matt Dietz on 2011-08-18

Fixes lp828207

The Host API reboot action was broken due to addition of a parameter to a utility method in compute/api.py

[Rick Harris (rconradharris)]

Looks good, just a couple of small pep8 violations:

nova/db/sqlalchemy/migrate_repo/versions/037_kill_export_devices.py:38:1: E302 expected 2 blank lines, found 1
def downgrade(migrate_engine):
^
    Separate top-level function and class definitions with two blank lines.

    Method definitions inside a class are separated by a single blank line.

    Extra blank lines may be used (sparingly) to separate groups of related
    functions. Blank lines may be omitted between a bunch of related
    one-liners (e.g. a set of dummy implementations).

    Use blank lines in functions, sparingly, to indicate logical sections.

    Okay: def a():\n pass\n\n\ndef b():\n pass
    Okay: def a():\n pass\n\n\n# Foo\n# Bar\n\ndef b():\n pass

    E301: class Foo:\n b = 0\n def bar():\n pass
    E302: def a():\n pass\n\ndef b(n):\n pass
    E303: def a():\n pass\n\n\n\ndef b(n):\n pass
    E303: def a():\n\n\n\n pass
    E304: @decorator\n\ndef a():\n pass
nova/db/sqlalchemy/migrate_repo/versions/037_kill_export_devices.py:47:1: E302 expected 2 blank lines, found 1
def upgrade(migrate_engine):
^
    Separate top-level function and class definitions with two blank lines.

    Method definitions inside a class are separated by a single blank line.

    Extra blank lines may be used (sparingly) to separate groups of related
    functions. Blank lines may be omitted between a bunch of related
    one-liners (e.g. a set of dummy implementations).

    Use blank lines in functions, sparingly, to indicate logical sections.

    Okay: def a():\n pass\n\n\ndef b():\n pass
    Okay: def a():\n pass\n\n\n# Foo\n# Bar\n\ndef b():\n pass

    E301: class Foo:\n b = 0\n def bar():\n pass
    E302: def a():\n pass\n\ndef b(n):\n pass
    E303: def a():\n pass\n\n\n\ndef b(n):\n pass
    E303: def a():\n\n\n\n pass
    E304: @decorator\n\ndef a():\n pass

review: Needs Fixing

[lp:~mcgrue/nova/volume-cleanup]

1459. By Rick Harris on 2011-08-18

Passes empty string instead of None to MySQLdb driver if the DB password isn't set.

1460. By Ed Leafe on 2011-08-18

Updated docs for the recent scheduler class changes.

[Ben McGraw (mcgrue)]

Sorry about that, Rick. Fixed as of revision 1361.

[lp:~mcgrue/nova/volume-cleanup]

1461. By Alex Meade on 2011-08-18

Fixes issue where ServersXMLSerializer was missing a method for update actions

1462. By Vish Ishaya on 2011-08-19

Makes all of the binary services launch using the same strategy.
 * Removes helper methods from utils for loading flags and logging
 * Changes service.serve to use Launcher
 * Changes service.wait to actually wait for all the services to exit
 * Changes nova-api to explicitly load flags and logging and use service.serve
 * Fixes the annoying IOError when /etc/nova/nova.conf doesn't exist

1463. By Josh Kearney on 2011-08-19

Currently, rescue/unrescue is only available over the admin API. Non-admin tenants also need to be able to access this functionality. This patch adds rescue functionality over an API extension.

1464. By dan wendlandt on 2011-08-19

Bugfix for lp 828429. Its still not clear to me exactly how this code path is actually invoked when nova is used, so I'm looking for input on whether we should be adding a test case for this, removing the code as unused, etc. Thanks.

1465. By Ryu Ishimoto on 2011-08-19

Added uuid column in virtual_interfaces table, and an OpenStack extension API for virtual interfaces to expose these IDs. Also set this UUID as one of the external IDs in the OVS vif driver.

1466. By Ed Leafe on 2011-08-19

Removes the incorrect hard-coded filter path.

1467. By Vish Ishaya on 2011-08-19

Next round of prep for keystone integration.

 * adds middleware for authenticating ec2 signature with keystone
 * adds middleware for converting keystone response into request context
 * gives examples of alternative pipelines for keystone integration

Next steps:
 * provide default config with no keystone integration (perhaps setting every context to admin?)
 * write authmanager to keystone conversion code
 * add api extension to create and destroy access/secret keys
 * deprecate authmanager
 * rename project to tenant

1468. By Anthony Young on 2011-08-19

Assorted fixes to os-floating-ips to make it play nicely with an in-progress novaclient implementation, as well as some changes to make it more consistent with other os rest apis. Changes include:

* switch associate/disassociate to PUTs. Previously, it was doing create calls with one-off parameter resources.
* allow graceful handling when there are no floating ips for a tenant
* allow graceful handling when disassociating an already disassociated address

1469. By Tushar Patil on 2011-08-21

Added OS APIs to associate/disassociate security groups to/from instances.

I will add views to return list of security groups associated with the servers later after this branch is merged into trunk. The reason I will do this later is because my previous merge proposal (https://code.launchpad.net/~tpatil/nova/add-options-network-create-os-apis/+merge/68292) is dependent on this work. In this merge proposal I have added a new extension which still uses default OS v1.1 controllers and views, but I am going to override views in this extension to send extra information like security groups.

[Jay Pipes (jaypipes)]

Hi!

There is a merge conflict here... look for <<<<<<< TREE in the diff.

Also, is there a reason why we are removing functionality (as opposed to deprecating it)?

-jay

review: Needs Information

[lp:~mcgrue/nova/volume-cleanup]

1470. By Sandy Walsh on 2011-08-22

Fixes utils.to_primitive (again) to handle modules, builtins and whatever other crap might be hiding in an object.

1471. By Alex Meade on 2011-08-22

Adds accessIPv4 and accessIPv6 to servers requests and responses as per the current spec.

[Vish Ishaya (vishvananda)]

The reason for removal, is I'm rewriting the communication between compute and volume here:

https://code.launchpad.net/~vishvananda/nova/volume-cleanup-2/+merge/72270

maintaining AoE through this refactor seems silly since no one is using it.

[Jay Pipes (jaypipes)]

Are we positive absolutely *nobody* is running AoE? If not, deprecation seems the way to go...

[lp:~mcgrue/nova/volume-cleanup]

1472. By William Wolf on 2011-08-22

implemented tenant ids to be included in request uris.

1473. By Alex Meade on 2011-08-22

The FixedIpCommandsTestCase in test_nova_manage previously accessed the database. This branch stubs out the database for these tests, lowering their run time from 104 secs -> .02 secs total.

I have verified the tested functionality is still being tested.

1474. By Soren Hansen on 2011-08-23

Move documentation from nova.virt.fake into nova.virt.driver.

1475. By Alex Meade on 2011-08-23

Fixes bug 831627 where nova-manage does not exit when given a non-existent network address

1476. By Tushar Patil on 2011-08-23

Our goal is to add optional parameter to the Create server OS 1.0 and 1.1 API to achieve following objectives:-

1) Specify number and order of networks to the create server API.

In the current implementation every instance you launch for a project having 3 networks assigned to it will always have 3 vnics. In this case it is not possible to have one instance with 2 vnics ,another with 1 vnic and so on. This is not flexible enough and the network resources are not used effectively.

2) Specify fixed IP address to the vnic at the boot time. When you launch a server, you can specify the fixed IP address you want to be assigned to the vnic from a particular network. If this fixed IP address is already in use, it will give exception.

Example of Server Create API request XML:
<?xml version="1.0" encoding="UTF-8"?>

<server xmlns="http://docs.nttpflab.com/servers/api/v1.0"
        name="new-server-test" imageId="1" flavorId="1">
  <metadata>
    <meta key="My Server Name">Apache1</meta>
  </metadata>
  <personality>
    <file path="/etc/banner.txt">
        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
    </file>
  </personality>
  <networks>
      <network uuid="6622436e-5289-460f-8479-e4dcc63f16c5" fixed_ip="10.0.0.3">
      <network uuid="d97efefc-e071-4174-b6dd-b33af0a37706" fixed_ip="10.0.1.3">
  </networks>
</server>

3) Networks is an optional parameter, so if you don't provide any networks to the server Create API, it will behave exactly the same as of today.

This feature is supported to all of the network models.

1477. By Christopher MacGown <email address hidden> on 2011-08-23

Implements first-pass of config-drive that adds a vfat format drive to a vm when config_drive is True (or an image id).

1478. By Vish Ishaya on 2011-08-23

This branch does the final tear out of AuthManager from the main code. The NoAuth middlewares (active by default) allow a user to specify any user and project id through headers (os_api) or access key (ec2_api).

The plan is to leave the auth manager code in but mention that it is deprecated. There is a sample paste config in ini to still allow old auth. Immediately after the diablo release we can tear out all of the Auth related code and not support the deprecated auth anymore.

[Soren Hansen (soren)]

The conflict remains. You need to merge the current trunk into your branch and fix it.

review: Needs Fixing

[Soren Hansen (soren)]

As much as I'd love AoE to *die* *die* *die*, I do see Jay's point. I'm not sure what tools we have to actually deprecate stuff, though. Logging? Release notes? What else? The second iscsi support landed, AoE was deprecated, but I guess this might not have been communicated very well to users.

[lp:~mcgrue/nova/volume-cleanup]

1479. By Thierry Carrez on 2011-08-23

Refresh translations

1480. By Dan Prince on 2011-08-23

Move use_ipv6 into flags. Its used in multiple places (network manager and the OSAPI) and should be defined at the top level.

1481. By Brian Waldon on 2011-08-23

Fixes bug that causes 400 status code when an instance wasn't attached to a network.

1482. By Nachi Ueno on 2011-08-23

I added notifications decorator for each API call using monkey_patching.
By this merge, users can get API call notification from any modules.

1483. By Vish Ishaya on 2011-08-23

Adds a use_deprecated_auth flag to make sure creds generated using nova-manage commands will work with noauth.

[Ben McGraw (mcgrue)]

(How did bzr let me commit something with conflicts?)

[Jay Pipes (jaypipes)]

> (How did bzr let me commit something with conflicts?)

The same way git lets you commit something with conflicts.

[Vish Ishaya (vishvananda)]

The diff shows what happens when the branch is merged into trunk, so if recent additions have been added to trunk it will show conflicts. Speaking of which, looks like there is still another one. Also need to bump the version number of the migrate script. I think we're on 39?

[lp:~mcgrue/nova/volume-cleanup]

1484. By Ben McGraw on 2011-08-23

resolving conflicts.

[Thierry Carrez (ttx)]

This should wait for Essex, based on the meeting we had on 2011-08-23 ?

review: Disapprove

[Thierry Carrez (ttx)]

review: Disapprove (ffe)

Unmerged revisions

1484. By Ben McGraw on 2011-08-23

resolving conflicts.

=== modified file 'Authors'
--- Authors	2011-08-23 04:17:57 +0000
+++ Authors	2011-08-23 22:45:41 +0000
@@ -10,6 +10,7 @@
 Antony Messerli <[e-mail]>
 Armando Migliaccio <[e-mail]>
 Arvind Somya <[e-mail]>
+Ben McGraw <[e-mail]>
 Bilal Akhtar <[e-mail]>
 Brian Lamar <[e-mail]>
 Brian Schott <[e-mail]>

=== modified file 'bin/nova-manage'
--- bin/nova-manage	2011-08-23 07:21:13 +0000
+++ bin/nova-manage	2011-08-23 22:45:41 +0000
@@ -860,9 +860,8 @@
             msg = _('Only KVM and QEmu are supported for now. Sorry!')
             raise exception.Error(msg)
 
-        if (FLAGS.volume_driver != 'nova.volume.driver.AOEDriver' and \
-            FLAGS.volume_driver != 'nova.volume.driver.ISCSIDriver'):
-            msg = _("Support only AOEDriver and ISCSIDriver. Sorry!")
+        if FLAGS.volume_driver != 'nova.volume.driver.ISCSIDriver':
+            msg = _("Support only ISCSIDriver. Sorry!")
             raise exception.Error(msg)
 
         rpc.call(ctxt,

=== modified file 'doc/source/runnova/getting.started.rst'
--- doc/source/runnova/getting.started.rst	2011-02-21 20:30:20 +0000
+++ doc/source/runnova/getting.started.rst	2011-08-23 22:45:41 +0000
@@ -73,7 +73,6 @@
 * dnsmasq
 * vlan
 * open-iscsi and iscsitarget (if you use iscsi volumes)
-* aoetools and vblade-persist (if you use aoe-volumes)
 
 Nova uses cutting-edge versions of many packages. There are ubuntu packages in
 the nova-core trunk ppa.  You can use add this ppa to your sources list on an

=== modified file 'nova/db/api.py'
--- nova/db/api.py	2011-08-22 23:35:09 +0000
+++ nova/db/api.py	2011-08-23 22:45:41 +0000
@@ -55,18 +55,13 @@
                            sqlalchemy='nova.db.sqlalchemy.api')
 
 
-class NoMoreBlades(exception.Error):
-    """No more available blades."""
-    pass
-
-
 class NoMoreNetworks(exception.Error):
     """No more available networks."""
     pass
 
 
 class NoMoreTargets(exception.Error):
-    """No more available blades"""
+    """No more available targets"""
     pass
 
 
@@ -763,25 +758,6 @@
 ###################
 
 
-def export_device_count(context):
-    """Return count of export devices."""
-    return IMPL.export_device_count(context)
-
-
-def export_device_create_safe(context, values):
-    """Create an export_device from the values dictionary.
-
-    The device is not returned. If the create violates the unique
-    constraints because the shelf_id and blade_id already exist,
-    no exception is raised.
-
-    """
-    return IMPL.export_device_create_safe(context, values)
-
-
-###################
-
-
 def iscsi_target_count_by_host(context, host):
     """Return count of export devices."""
     return IMPL.iscsi_target_count_by_host(context, host)
@@ -857,11 +833,6 @@
 ###################
 
 
-def volume_allocate_shelf_and_blade(context, volume_id):
-    """Atomically allocate a free shelf and blade from the pool."""
-    return IMPL.volume_allocate_shelf_and_blade(context, volume_id)
-
-
 def volume_allocate_iscsi_target(context, volume_id, host):
     """Atomically allocate a free iscsi_target from the pool."""
     return IMPL.volume_allocate_iscsi_target(context, volume_id, host)
@@ -927,11 +898,6 @@
     return IMPL.volume_get_instance(context, volume_id)
 
 
-def volume_get_shelf_and_blade(context, volume_id):
-    """Get the shelf and blade allocated to the volume."""
-    return IMPL.volume_get_shelf_and_blade(context, volume_id)
-
-
 def volume_get_iscsi_target_num(context, volume_id):
     """Get the target num (tid) allocated to the volume."""
     return IMPL.volume_get_iscsi_target_num(context, volume_id)

=== modified file 'nova/db/sqlalchemy/api.py'
--- nova/db/sqlalchemy/api.py	2011-08-22 23:35:09 +0000
+++ nova/db/sqlalchemy/api.py	2011-08-23 22:45:41 +0000
@@ -1936,28 +1936,6 @@
 
 
 @require_admin_context
-def export_device_count(context):
-    session = get_session()
-    return session.query(models.ExportDevice).\
-                   filter_by(deleted=can_read_deleted(context)).\
-                   count()
-
-
-@require_admin_context
-def export_device_create_safe(context, values):
-    export_device_ref = models.ExportDevice()
-    export_device_ref.update(values)
-    try:
-        export_device_ref.save()
-        return export_device_ref
-    except IntegrityError:
-        return None
-
-
-###################
-
-
-@require_admin_context
 def iscsi_target_count_by_host(context, host):
     session = get_session()
     return session.query(models.IscsiTarget).\
@@ -2093,24 +2071,6 @@
 
 
 @require_admin_context
-def volume_allocate_shelf_and_blade(context, volume_id):
-    session = get_session()
-    with session.begin():
-        export_device = session.query(models.ExportDevice).\
-                                filter_by(volume=None).\
-                                filter_by(deleted=False).\
-                                with_lockmode('update').\
-                                first()
-        # NOTE(vish): if with_lockmode isn't supported, as in sqlite,
-        #             then this has concurrency issues
-        if not export_device:
-            raise db.NoMoreBlades()
-        export_device.volume_id = volume_id
-        session.add(export_device)
-    return (export_device.shelf_id, export_device.blade_id)
-
-
-@require_admin_context
 def volume_allocate_iscsi_target(context, volume_id, host):
     session = get_session()
     with session.begin():
@@ -2174,9 +2134,6 @@
                 update({'deleted': True,
                         'deleted_at': utils.utcnow(),
                         'updated_at': literal_column('updated_at')})
-        session.query(models.ExportDevice).\
-                filter_by(volume_id=volume_id).\
-                update({'volume_id': None})
         session.query(models.IscsiTarget).\
                 filter_by(volume_id=volume_id).\
                 update({'volume_id': None})
@@ -2277,18 +2234,6 @@
 
 
 @require_admin_context
-def volume_get_shelf_and_blade(context, volume_id):
-    session = get_session()
-    result = session.query(models.ExportDevice).\
-                     filter_by(volume_id=volume_id).\
-                     first()
-    if not result:
-        raise exception.ExportDeviceNotFoundForVolume(volume_id=volume_id)
-
-    return (result.shelf_id, result.blade_id)
-
-
-@require_admin_context
 def volume_get_iscsi_target_num(context, volume_id):
     session = get_session()
     result = session.query(models.IscsiTarget).\

=== added file 'nova/db/sqlalchemy/migrate_repo/versions/042_kill_export_devices.py'
--- nova/db/sqlalchemy/migrate_repo/versions/042_kill_export_devices.py	1970-01-01 00:00:00 +0000
+++ nova/db/sqlalchemy/migrate_repo/versions/042_kill_export_devices.py	2011-08-23 22:45:41 +0000
@@ -0,0 +1,51 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2011 University of Southern California
+#
+#    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 Boolean, Column, DateTime, ForeignKey, Integer
+from sqlalchemy import MetaData, String, Table
+from nova import log as logging
+
+meta = MetaData()
+
+# Table definition
+export_devices = Table('export_devices', 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('shelf_id', Integer()),
+        Column('blade_id', Integer()),
+        Column('volume_id',
+               Integer(),
+               ForeignKey('volumes.id'),
+               nullable=True),
+        )
+
+
+def downgrade(migrate_engine):
+    meta.bind = migrate_engine
+    try:
+        export_devices.create()
+    except Exception:
+        logging.info(repr(export_devices))
+        logging.exception('Exception while creating table')
+        raise
+
+
+def upgrade(migrate_engine):
+    meta.bind = migrate_engine
+    export_devices.drop()

=== modified file 'nova/db/sqlalchemy/migration.py'
--- nova/db/sqlalchemy/migration.py	2011-06-24 12:01:51 +0000
+++ nova/db/sqlalchemy/migration.py	2011-08-23 22:45:41 +0000
@@ -55,7 +55,7 @@
         engine = sqlalchemy.create_engine(FLAGS.sql_connection, echo=False)
         meta.reflect(bind=engine)
         try:
-            for table in ('auth_tokens', 'zones', 'export_devices',
+            for table in ('auth_tokens', 'zones',
                           'fixed_ips', 'floating_ips', 'instances',
                           'key_pairs', 'networks', 'projects', 'quotas',
                           'security_group_instance_association',

=== modified file 'nova/db/sqlalchemy/models.py'
--- nova/db/sqlalchemy/models.py	2011-08-23 04:17:57 +0000
+++ nova/db/sqlalchemy/models.py	2011-08-23 22:45:41 +0000
@@ -400,22 +400,6 @@
     no_device = Column(Boolean, nullable=True)
 
 
-class ExportDevice(BASE, NovaBase):
-    """Represates a shelf and blade that a volume can be exported on."""
-    __tablename__ = 'export_devices'
-    __table_args__ = (schema.UniqueConstraint("shelf_id", "blade_id"),
-                      {'mysql_engine': 'InnoDB'})
-    id = Column(Integer, primary_key=True)
-    shelf_id = Column(Integer)
-    blade_id = Column(Integer)
-    volume_id = Column(Integer, ForeignKey('volumes.id'), nullable=True)
-    volume = relationship(Volume,
-                          backref=backref('export_device', uselist=False),
-                          foreign_keys=volume_id,
-                          primaryjoin='and_(ExportDevice.volume_id==Volume.id,'
-                                           'ExportDevice.deleted==False)')
-
-
 class IscsiTarget(BASE, NovaBase):
     """Represates an iscsi target for a given host"""
     __tablename__ = 'iscsi_targets'

=== modified file 'nova/exception.py'
--- nova/exception.py	2011-08-22 23:35:09 +0000
+++ nova/exception.py	2011-08-23 22:45:41 +0000
@@ -346,10 +346,6 @@
     message = _("deleting volume %(volume_name)s that has snapshot")
 
 
-class ExportDeviceNotFoundForVolume(NotFound):
-    message = _("No export device found for volume %(volume_id)s.")
-
-
 class ISCSITargetNotFoundForVolume(NotFound):
     message = _("No target id found for volume %(volume_id)s.")
 

=== modified file 'nova/tests/fake_flags.py'
--- nova/tests/fake_flags.py	2011-07-27 16:44:14 +0000
+++ nova/tests/fake_flags.py	2011-08-23 22:45:41 +0000
@@ -33,11 +33,7 @@
 FLAGS['num_networks'].SetDefault(2)
 FLAGS['fake_network'].SetDefault(True)
 FLAGS['image_service'].SetDefault('nova.image.fake.FakeImageService')
-flags.DECLARE('num_shelves', 'nova.volume.driver')
-flags.DECLARE('blades_per_shelf', 'nova.volume.driver')
 flags.DECLARE('iscsi_num_targets', 'nova.volume.driver')
-FLAGS['num_shelves'].SetDefault(2)
-FLAGS['blades_per_shelf'].SetDefault(4)
 FLAGS['iscsi_num_targets'].SetDefault(8)
 FLAGS['verbose'].SetDefault(True)
 FLAGS['sqlite_db'].SetDefault("tests.sqlite")

=== modified file 'nova/tests/integrated/test_volumes.py'
--- nova/tests/integrated/test_volumes.py	2011-08-03 21:06:56 +0000
+++ nova/tests/integrated/test_volumes.py	2011-08-23 22:45:41 +0000
@@ -262,22 +262,22 @@
 
         LOG.debug("Logs: %s" % driver.LoggingVolumeDriver.all_logs())
 
-        # Discover_volume and undiscover_volume are called from compute
+        # prepare_attach and prepare_detach are called from compute
         #  on attach/detach
 
         disco_moves = driver.LoggingVolumeDriver.logs_like(
-                            'discover_volume',
+                            'prepare_attach',
                             id=volume_id)
-        LOG.debug("discover_volume actions: %s" % disco_moves)
+        LOG.debug("prepare_attach actions: %s" % disco_moves)
 
         self.assertEquals(1, len(disco_moves))
         disco_move = disco_moves[0]
         self.assertEquals(disco_move['id'], volume_id)
 
         last_days_of_disco_moves = driver.LoggingVolumeDriver.logs_like(
-                            'undiscover_volume',
+                            'prepare_detach',
                             id=volume_id)
-        LOG.debug("undiscover_volume actions: %s" % last_days_of_disco_moves)
+        LOG.debug("prepare_detach actions: %s" % last_days_of_disco_moves)
 
         self.assertEquals(1, len(last_days_of_disco_moves))
         undisco_move = last_days_of_disco_moves[0]

=== modified file 'nova/tests/test_volume.py'
--- nova/tests/test_volume.py	2011-08-05 14:23:48 +0000
+++ nova/tests/test_volume.py	2011-08-23 22:45:41 +0000
@@ -257,7 +257,7 @@
 
 class DriverTestCase(test.TestCase):
     """Base Test class for Drivers."""
-    driver_name = "nova.volume.driver.FakeAOEDriver"
+    driver_name = "nova.volume.driver.FakeBaseDriver"
 
     def setUp(self):
         super(DriverTestCase, self).setUp()
@@ -295,83 +295,6 @@
             self.volume.delete_volume(self.context, volume_id)
 
 
-class AOETestCase(DriverTestCase):
-    """Test Case for AOEDriver"""
-    driver_name = "nova.volume.driver.AOEDriver"
-
-    def setUp(self):
-        super(AOETestCase, self).setUp()
-
-    def tearDown(self):
-        super(AOETestCase, self).tearDown()
-
-    def _attach_volume(self):
-        """Attach volumes to an instance. This function also sets
-           a fake log message."""
-        volume_id_list = []
-        for index in xrange(3):
-            vol = {}
-            vol['size'] = 0
-            volume_id = db.volume_create(self.context,
-                                         vol)['id']
-            self.volume.create_volume(self.context, volume_id)
-
-            # each volume has a different mountpoint
-            mountpoint = "/dev/sd" + chr((ord('b') + index))
-            db.volume_attached(self.context, volume_id, self.instance_id,
-                               mountpoint)
-
-            (shelf_id, blade_id) = db.volume_get_shelf_and_blade(self.context,
-                                                                 volume_id)
-            self.output += "%s %s eth0 /dev/nova-volumes/vol-foo auto run\n" \
-                      % (shelf_id, blade_id)
-
-            volume_id_list.append(volume_id)
-
-        return volume_id_list
-
-    def test_check_for_export_with_no_volume(self):
-        """No log message when no volume is attached to an instance."""
-        self.stream.truncate(0)
-        self.volume.check_for_export(self.context, self.instance_id)
-        self.assertEqual(self.stream.getvalue(), '')
-
-    def test_check_for_export_with_all_vblade_processes(self):
-        """No log message when all the vblade processes are running."""
-        volume_id_list = self._attach_volume()
-
-        self.stream.truncate(0)
-        self.volume.check_for_export(self.context, self.instance_id)
-        self.assertEqual(self.stream.getvalue(), '')
-
-        self._detach_volume(volume_id_list)
-
-    def test_check_for_export_with_vblade_process_missing(self):
-        """Output a warning message when some vblade processes aren't
-           running."""
-        volume_id_list = self._attach_volume()
-
-        # the first vblade process isn't running
-        self.output = self.output.replace("run", "down", 1)
-        (shelf_id, blade_id) = db.volume_get_shelf_and_blade(self.context,
-                                                             volume_id_list[0])
-
-        msg_is_match = False
-        self.stream.truncate(0)
-        try:
-            self.volume.check_for_export(self.context, self.instance_id)
-        except exception.ProcessExecutionError, e:
-            volume_id = volume_id_list[0]
-            msg = _("Cannot confirm exported volume id:%(volume_id)s. "
-                    "vblade process for e%(shelf_id)s.%(blade_id)s "
-                    "isn't running.") % locals()
-
-            msg_is_match = (0 <= e.message.find(msg))
-
-        self.assertTrue(msg_is_match)
-        self._detach_volume(volume_id_list)
-
-
 class ISCSITestCase(DriverTestCase):
     """Test Case for ISCSIDriver"""
     driver_name = "nova.volume.driver.ISCSIDriver"
@@ -408,7 +331,7 @@
         self.assertEqual(self.stream.getvalue(), '')
 
     def test_check_for_export_with_all_volume_exported(self):
-        """No log message when all the vblade processes are running."""
+        """No log message when all the processes are running."""
         volume_id_list = self._attach_volume()
 
         self.mox.StubOutWithMock(self.volume.driver, '_execute')
@@ -431,7 +354,6 @@
            by ietd."""
         volume_id_list = self._attach_volume()
 
-        # the first vblade process isn't running
         tid = db.volume_get_iscsi_target_num(self.context, volume_id_list[0])
         self.mox.StubOutWithMock(self.volume.driver, '_execute')
         self.volume.driver._execute("ietadm", "--op", "show",

=== modified file 'nova/volume/driver.py'
--- nova/volume/driver.py	2011-08-05 14:23:48 +0000
+++ nova/volume/driver.py	2011-08-23 22:45:41 +0000
@@ -33,18 +33,10 @@
 FLAGS = flags.FLAGS
 flags.DEFINE_string('volume_group', 'nova-volumes',
                     'Name for the VG that will contain exported volumes')
-flags.DEFINE_string('aoe_eth_dev', 'eth0',
-                    'Which device to export the volumes on')
 flags.DEFINE_string('num_shell_tries', 3,
                     'number of times to attempt to run flakey shell commands')
 flags.DEFINE_string('num_iscsi_scan_tries', 3,
                     'number of times to rescan iSCSI target to find volume')
-flags.DEFINE_integer('num_shelves',
-                    100,
-                    'Number of vblade shelves')
-flags.DEFINE_integer('blades_per_shelf',
-                    16,
-                    'Number of vblade blades per shelf')
 flags.DEFINE_integer('iscsi_num_targets',
                     100,
                     'Number of iscsi target ids per host')
@@ -200,132 +192,17 @@
         """Removes an export for a logical volume."""
         raise NotImplementedError()
 
-    def discover_volume(self, context, volume):
-        """Discover volume on a remote host."""
-        raise NotImplementedError()
-
-    def undiscover_volume(self, volume):
-        """Undiscover volume on a remote host."""
-        raise NotImplementedError()
-
-    def check_for_export(self, context, volume_id):
-        """Make sure volume is exported."""
-        raise NotImplementedError()
-
-
-class AOEDriver(VolumeDriver):
-    """Implements AOE specific volume commands."""
-
-    def ensure_export(self, context, volume):
-        # NOTE(vish): we depend on vblade-persist for recreating exports
-        pass
-
-    def _ensure_blades(self, context):
-        """Ensure that blades have been created in datastore."""
-        total_blades = FLAGS.num_shelves * FLAGS.blades_per_shelf
-        if self.db.export_device_count(context) >= total_blades:
-            return
-        for shelf_id in xrange(FLAGS.num_shelves):
-            for blade_id in xrange(FLAGS.blades_per_shelf):
-                dev = {'shelf_id': shelf_id, 'blade_id': blade_id}
-                self.db.export_device_create_safe(context, dev)
-
-    def create_export(self, context, volume):
-        """Creates an export for a logical volume."""
-        self._ensure_blades(context)
-        (shelf_id,
-         blade_id) = self.db.volume_allocate_shelf_and_blade(context,
-                                                             volume['id'])
-        self._try_execute(
-                 'vblade-persist', 'setup',
-                 shelf_id,
-                 blade_id,
-                 FLAGS.aoe_eth_dev,
-                 "/dev/%s/%s" %
-                 (FLAGS.volume_group,
-                  volume['name']),
-                 run_as_root=True)
-        # NOTE(vish): The standard _try_execute does not work here
-        #             because these methods throw errors if other
-        #             volumes on this host are in the process of
-        #             being created.  The good news is the command
-        #             still works for the other volumes, so we
-        #             just wait a bit for the current volume to
-        #             be ready and ignore any errors.
-        time.sleep(2)
-        self._execute('vblade-persist', 'auto', 'all',
-                      check_exit_code=False, run_as_root=True)
-        self._execute('vblade-persist', 'start', 'all',
-                      check_exit_code=False, run_as_root=True)
-
-    def remove_export(self, context, volume):
-        """Removes an export for a logical volume."""
-        (shelf_id,
-         blade_id) = self.db.volume_get_shelf_and_blade(context,
-                                                        volume['id'])
-        self._try_execute('vblade-persist', 'stop',
-                          shelf_id, blade_id, run_as_root=True)
-        self._try_execute('vblade-persist', 'destroy',
-                          shelf_id, blade_id, run_as_root=True)
-
-    def discover_volume(self, context, _volume):
-        """Discover volume on a remote host."""
-        (shelf_id,
-         blade_id) = self.db.volume_get_shelf_and_blade(context,
-                                                        _volume['id'])
-        self._execute('aoe-discover', run_as_root=True)
-        out, err = self._execute('aoe-stat', check_exit_code=False,
-                                 run_as_root=True)
-        device_path = 'e%(shelf_id)d.%(blade_id)d' % locals()
-        if out.find(device_path) >= 0:
-            return "/dev/etherd/%s" % device_path
-        else:
-            return
-
-    def undiscover_volume(self, _volume):
-        """Undiscover volume on a remote host."""
-        pass
-
-    def check_for_export(self, context, volume_id):
-        """Make sure volume is exported."""
-        (shelf_id,
-         blade_id) = self.db.volume_get_shelf_and_blade(context,
-                                                        volume_id)
-        cmd = ('vblade-persist', 'ls', '--no-header')
-        out, _err = self._execute(*cmd, run_as_root=True)
-        exported = False
-        for line in out.split('\n'):
-            param = line.split(' ')
-            if len(param) == 6 and param[0] == str(shelf_id) \
-                    and param[1] == str(blade_id) and param[-1] == "run":
-                exported = True
-                break
-        if not exported:
-            # Instance will be terminated in this case.
-            desc = _("Cannot confirm exported volume id:%(volume_id)s. "
-                     "vblade process for e%(shelf_id)s.%(blade_id)s "
-                     "isn't running.") % locals()
-            raise exception.ProcessExecutionError(out, _err, cmd=cmd,
-                                                  description=desc)
-
-
-class FakeAOEDriver(AOEDriver):
-    """Logs calls instead of executing."""
-
-    def __init__(self, *args, **kwargs):
-        super(FakeAOEDriver, self).__init__(execute=self.fake_execute,
-                                            sync_exec=self.fake_execute,
-                                            *args, **kwargs)
-
-    def check_for_setup_error(self):
-        """No setup necessary in fake mode."""
-        pass
-
-    @staticmethod
-    def fake_execute(cmd, *_args, **_kwargs):
-        """Execute that simply logs the command."""
-        LOG.debug(_("FAKE AOE: %s"), cmd)
-        return (None, None)
+    def prepare_attach(self, context, volume):
+        """Discover volume on a remote host."""
+        raise NotImplementedError()
+
+    def prepare_detach(self, volume):
+        """Undiscover volume on a remote host."""
+        raise NotImplementedError()
+
+    def check_for_export(self, context, volume_id):
+        """Make sure volume is exported."""
+        raise NotImplementedError()
 
 
 class ISCSIDriver(VolumeDriver):
@@ -505,7 +382,12 @@
                          '-v', property_value)
         return self._run_iscsiadm(iscsi_properties, iscsi_command)
 
-    def discover_volume(self, context, volume):
+    def prepare_attach(self, context, volume):
+        #print "HODOR"
+
+        #if 1 == 1:
+        #    return
+
         """Discover volume on a remote host."""
         iscsi_properties = self._get_iscsi_properties(volume)
 
@@ -557,7 +439,7 @@
 
         return mount_device
 
-    def undiscover_volume(self, volume):
+    def prepare_detach(self, volume):
         """Undiscover volume on a remote host."""
         iscsi_properties = self._get_iscsi_properties(volume)
         self._iscsiadm_update(iscsi_properties, "node.startup", "manual")
@@ -591,11 +473,11 @@
         """No setup necessary in fake mode."""
         pass
 
-    def discover_volume(self, context, volume):
+    def prepare_attach(self, context, volume):
         """Discover volume on a remote host."""
         return "/dev/disk/by-path/volume-id-%d" % volume['id']
 
-    def undiscover_volume(self, volume):
+    def prepare_detach(self, volume):
         """Undiscover volume on a remote host."""
         pass
 
@@ -661,11 +543,11 @@
         """Removes an export for a logical volume"""
         pass
 
-    def discover_volume(self, context, volume):
+    def prepare_attach(self, context, volume):
         """Discover volume on a remote host"""
         return "rbd:%s/%s" % (FLAGS.rbd_pool, volume['name'])
 
-    def undiscover_volume(self, volume):
+    def prepare_detach(self, volume):
         """Undiscover volume on a remote host"""
         pass
 
@@ -724,11 +606,11 @@
         """Removes an export for a logical volume"""
         pass
 
-    def discover_volume(self, context, volume):
+    def prepare_attach(self, context, volume):
         """Discover volume on a remote host"""
         return "sheepdog:%s" % volume['name']
 
-    def undiscover_volume(self, volume):
+    def prepare_detach(self, volume):
         """Undiscover volume on a remote host"""
         pass
 
@@ -758,11 +640,11 @@
     def remove_export(self, context, volume):
         self.log_action('remove_export', volume)
 
-    def discover_volume(self, context, volume):
-        self.log_action('discover_volume', volume)
+    def prepare_attach(self, context, volume):
+        self.log_action('prepare_attach', volume)
 
-    def undiscover_volume(self, volume):
-        self.log_action('undiscover_volume', volume)
+    def prepare_detach(self, volume):
+        self.log_action('prepare_detach', volume)
 
     def check_for_export(self, context, volume_id):
         self.log_action('check_for_export', volume_id)

=== modified file 'nova/volume/manager.py'
--- nova/volume/manager.py	2011-06-02 21:23:05 +0000
+++ nova/volume/manager.py	2011-08-23 22:45:41 +0000
@@ -1,4 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
+# vim: tabstop=4 shiftwidth=4 softtabstop=4O
 
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
@@ -28,17 +28,13 @@
 :volume_topic:  What :mod:`rpc` topic to listen to (default: `volume`).
 :volume_manager:  The module name of a class derived from
                   :class:`manager.Manager` (default:
-                  :class:`nova.volume.manager.AOEManager`).
+                  :class:`nova.volume.manager.Manager`).
 :storage_availability_zone:  Defaults to `nova`.
-:volume_driver:  Used by :class:`AOEManager`.  Defaults to
-                 :class:`nova.volume.driver.AOEDriver`.
-:num_shelves:  Number of shelves for AoE (default: 100).
-:num_blades:  Number of vblades per shelf to allocate AoE storage from
-              (default: 16).
+:volume_driver:  Used by :class:`Manager`.  Defaults to
+                 :class:`nova.volume.driver.ISCSIDriver`.
 :volume_group:  Name of the group that will contain exported volumes (default:
                 `nova-volumes`)
-:aoe_eth_dev:  Device name the volumes will be exported on (default: `eth0`).
-:num_shell_tries:  Number of times to attempt to run AoE commands (default: 3)
+:num_shell_tries:  Number of times to attempt to run commands (default: 3)
 
 """
 
@@ -214,7 +210,7 @@
         if volume_ref['host'] == self.host and FLAGS.use_local_volumes:
             path = self.driver.local_path(volume_ref)
         else:
-            path = self.driver.discover_volume(context, volume_ref)
+            path = self.driver.prepare_attach(context, volume_ref)
         return path
 
     def remove_compute_volume(self, context, volume_id):
@@ -224,7 +220,7 @@
         if volume_ref['host'] == self.host and FLAGS.use_local_volumes:
             return True
         else:
-            self.driver.undiscover_volume(volume_ref)
+            self.driver.prepare_detach(volume_ref)
 
     def check_for_export(self, context, instance_id):
         """Make sure whether volume is exported."""

=== modified file 'nova/volume/san.py'
--- nova/volume/san.py	2011-04-13 16:31:28 +0000
+++ nova/volume/san.py	2011-08-23 22:45:41 +0000
@@ -61,9 +61,6 @@
     def _build_iscsi_target_name(self, volume):
         return "%s%s" % (FLAGS.iscsi_target_prefix, volume['name'])
 
-    # discover_volume is still OK
-    # undiscover_volume is still OK
-
     def _connect_to_ssh(self):
         ssh = paramiko.SSHClient()
         #TODO(justinsb): We need a better SSH key policy