EC2 api call TerminateInstances returns the wrong response

[Clint Byrum]

The EC2 api reference states that this should return a requestId and instancesSet which is a list of instance state changes.

TerminateInstances on nova-api returns a requestId and <return>true</return>.

[Clint Byrum (clint-fewbar)]

This causes juju to fail to wait for the entire environment to be shutdown because the initial terminate_instances does not return a list of shutting down instances.

$ juju -v destroy-environment
2011-09-29 18:32:08,229 DEBUG Initializing juju destroy-environment runtime
WARNING: this command will destroy the 'canonistack' environment (type: ec2).
This includes all machines, services, data, and other resources. Continue [y/N]y
2011-09-29 18:32:10,608 INFO Destroying environment 'canonistack' (type: ec2)...
2011-09-29 18:32:12,802 INFO Waiting on 0 EC2 instances to transition to terminated state, this may take a while
2011-09-29 18:32:13,169 DEBUG Deleted environment security group 'juju-canonistack'
2011-09-29 18:32:13,170 INFO 'destroy_environment' command finished successfully

With EC2 it would have waited for the 4 machines I had in the environment to terminate.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/3575

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/3575
Committed: http://github.com/openstack/nova/commit/59c0a723cc6d9e0c298d581952bde6853c2288c7
Submitter: Jenkins
Branch: master

commit 59c0a723cc6d9e0c298d581952bde6853c2288c7
Author: Hengqing Hu <email address hidden>
Date: Tue Jan 31 21:20:04 2012 +0800

    Return instancesSet in TerminateInstances ec2 api

    Fixe bug #862680

    Return instancesSet to follow ec2 TerminateInstances api specification:
        'http://docs.amazonwebservices.com/AmazonEC2/dg/2007-01-03/ApiReference-SOAP-TerminateInstances.html'

    Remove dead test_terminate_instances code in test_cloud.py

    Change-Id: Iabc0ccdbd80946b60af63bdc49bc7820c65ca006