OpenStack Compute (nova)

Merge lp://qastaging/~rackspace-titan/nova/instance-uuids into lp://qastaging/~hudson-openstack/nova/trunk

instance-uuids
Merge into trunk

Proposed by Brian Lamar on 2011-09-14

Status:

Work in progress

Proposed branch:

lp://qastaging/~rackspace-titan/nova/instance-uuids

Merge into:

lp://qastaging/~hudson-openstack/nova/trunk

Diff against target:

10619 lines (+2448/-1783)

58 files modified

bin/nova-manage (+1/-1)
nova/api/ec2/__init__.py (+2/-2)
nova/api/ec2/cloud.py (+45/-23)
nova/api/ec2/ec2utils.py (+18/-1)
nova/api/openstack/contrib/volumes.py (+8/-8)
nova/api/openstack/images.py (+4/-1)
nova/api/openstack/schemas/v1.1/server.rng (+0/-1)
nova/api/openstack/servers.py (+107/-67)
nova/api/openstack/views/servers.py (+18/-8)
nova/compute/api.py (+234/-215)
nova/compute/manager.py (+203/-220)
nova/console/manager.py (+4/-4)
nova/console/vmrc.py (+2/-2)
nova/db/api.py (+91/-93)
nova/db/sqlalchemy/api.py (+121/-142)
nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py (+0/-1)
nova/db/sqlalchemy/migrate_repo/versions/050_renames_for_instance_uuids.py (+117/-0)
nova/db/sqlalchemy/migrate_repo/versions/050_sqlite_downgrade.sql (+266/-0)
nova/db/sqlalchemy/migrate_repo/versions/050_sqlite_upgrade.sql (+265/-0)
nova/db/sqlalchemy/migration.py (+5/-2)
nova/db/sqlalchemy/models.py (+38/-28)
nova/exception.py (+6/-9)
nova/network/api.py (+9/-9)
nova/network/manager.py (+64/-69)
nova/network/quantum/manager.py (+11/-11)
nova/network/quantum/nova_ipam_lib.py (+1/-1)
nova/notifier/api.py (+1/-1)
nova/scheduler/api.py (+22/-42)
nova/scheduler/driver.py (+6/-6)
nova/scheduler/zone.py (+2/-2)
nova/tests/api/ec2/test_cloud.py (+66/-49)
nova/tests/api/ec2/test_middleware.py (+1/-1)
nova/tests/api/openstack/contrib/test_volumes.py (+0/-1)
nova/tests/api/openstack/test_images.py (+8/-0)
nova/tests/api/openstack/test_server_actions.py (+24/-19)
nova/tests/api/openstack/test_servers.py (+185/-223)
nova/tests/api/openstack/test_zones.py (+6/-6)
nova/tests/fake_network.py (+5/-5)
nova/tests/integrated/test_volumes.py (+1/-1)
nova/tests/scheduler/test_scheduler.py (+28/-41)
nova/tests/test_compute.py (+274/-299)
nova/tests/test_console.py (+14/-14)
nova/tests/test_db_api.py (+9/-9)
nova/tests/test_libvirt.py (+34/-31)
nova/tests/test_metadata.py (+1/-0)
nova/tests/test_network.py (+20/-20)
nova/tests/test_quantum.py (+4/-4)
nova/tests/test_test_utils.py (+1/-1)
nova/tests/test_volume.py (+18/-18)
nova/tests/test_xenapi.py (+22/-15)
nova/tests/xenapi/stubs.py (+1/-1)
nova/utils.py (+1/-1)
nova/virt/fake.py (+1/-1)
nova/virt/libvirt/connection.py (+4/-4)
nova/virt/libvirt/firewall.py (+9/-9)
nova/virt/vmwareapi_conn.py (+0/-1)
nova/virt/xenapi/vmops.py (+39/-39)
nova/virt/xenapi_conn.py (+1/-1)

To merge this branch:

bzr merge lp://qastaging/~rackspace-titan/nova/instance-uuids

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Nova Core security contacts		2011-09-14	Pending
Review via email: mp+75430@code.qastaging.launchpad.net

Description of the change

This needs to be updated. This is a work in progress.

lp://qastaging/~rackspace-titan/nova/instance-uuids updated on 2011-09-22

1568. By Brian Lamar on 2011-09-15: Merged trunk.
1569. By Brian Lamar on 2011-09-15: Merged trunk.
1570. By Brian Lamar on 2011-09-20: SQLite migrations.
1571. By Brian Waldon on 2011-09-20: merging trunk
1572. By Brian Waldon on 2011-09-20: fixing typo
1573. By Brian Waldon on 2011-09-20: removing useless stub
1574. By Brian Lamar on 2011-09-20: Compute API fix.
1575. By Brian Waldon on 2011-09-20: tests passing!
1576. By Brian Waldon on 2011-09-20: merging Lamar
1577. By Brian Waldon on 2011-09-20: fixing delete test
1578. By Brian Waldon on 2011-09-20: most compute tests work
1579. By Brian Waldon on 2011-09-20: merging lamar
1580. By Brian Lamar on 2011-09-20: Fixed notifier
1581. By Brian Lamar on 2011-09-20: instance_id -> instance_uuid change batch
1582. By Brian Lamar on 2011-09-20: More ID -> UUID updates.
1583. By Brian Lamar on 2011-09-20: Merged with Waldon.
1584. By Brian Lamar on 2011-09-20: Added instance_actions table to all migrations.
1585. By Brian Waldon on 2011-09-21: fixing tests
1586. By Brian Waldon on 2011-09-21: merging lamar
1587. By Brian Waldon on 2011-09-21: merging trunk
1588. By Brian Waldon on 2011-09-21: merging lamar
1589. By Brian Lamar on 2011-09-21: Updated instance_id -> instance_uuid in new 'soft delete' functionality.
1590. By Brian Lamar on 2011-09-21: fixes?
1591. By Brian Lamar on 2011-09-21: Merged with Waldon.
1592. By Brian Lamar on 2011-09-21: Arg, last two XenAPI tests working.
1593. By Brian Lamar on 2011-09-21: Small compute layer fix
1594. By Brian Lamar on 2011-09-21: Merged trunk.
1595. By Brian Lamar on 2011-09-21: Moved migrations
1596. By Brian Lamar on 2011-09-21: Making test_get_instance_mapping not as hacky.
1597. By Brian Lamar on 2011-09-21: Merged trunk and resolved conflicts.
1598. By Brian Lamar on 2011-09-21: Updated migration numbers.
1599. By Brian Lamar on 2011-09-21: Bad merge.
1600. By Brian Lamar on 2011-09-21: Fixed xen_api tests.
1601. By Brian Lamar on 2011-09-21: Libvirt tests running
1602. By Brian Lamar on 2011-09-22: Fix for test_ip_association_and_allocation_of_other_project
1603. By Brian Lamar on 2011-09-22: ID -> UUID updates.
1604. By Brian Lamar on 2011-09-22: Merged Trunk.
1605. By Brian Lamar on 2011-09-22: Can't have chain name use the UUID, it will be too long.
1606. By Brian Lamar on 2011-09-22: Update xenapi_conn.py to use UUIDs where needed.

Unmerged revisions

1606. By Brian Lamar on 2011-09-22: Update xenapi_conn.py to use UUIDs where needed.
1605. By Brian Lamar on 2011-09-22: Can't have chain name use the UUID, it will be too long.
1604. By Brian Lamar on 2011-09-22: Merged Trunk.
1603. By Brian Lamar on 2011-09-22: ID -> UUID updates.
1602. By Brian Lamar on 2011-09-22: Fix for test_ip_association_and_allocation_of_other_project
1601. By Brian Lamar on 2011-09-21: Libvirt tests running
1600. By Brian Lamar on 2011-09-21: Fixed xen_api tests.
1599. By Brian Lamar on 2011-09-21: Bad merge.
1598. By Brian Lamar on 2011-09-21: Updated migration numbers.
1597. By Brian Lamar on 2011-09-21: Merged trunk and resolved conflicts.