On 21/12/10 07:26 -0500, [email protected] wrote:
From: Tobias Crawley <[email protected]>
This patchset combines all of Michal's changes with a few fixes that I
implemented to get it working.
Michal Fojtik (10):
Revamped EC2 driver using 'aws' gem
Added public_ip feature for EC2 (Set public IP for instance)
Request parameters are reported when backend error exception raised
Fixed storage_volumes and storage_snapshots collections for EC2
Added storage_volume Cucumber features
Refreshed Mock data for EC2 Cucumber tests. Fixed some features
Added names for EC2 instances
Fixed storage_volume state to be amazon-ec2 compatible Added
valid_credentials? to EC2 driver Removed public_ip feature from EC2
Fixed client when mounting storage_volume
Imported convert_object to EC2 driver.
Imported endpoint patches from Tobi from previous EC2 gem
Tobias Crawley (4):
Rework endpoint selection for new ec2 driver.
Don't convert in_use to in-use, because the client will kindly
convert it back.
Show the realm_id for the storage volume.
Fix failing storage_volume test.
ACK.
All things working fine. Pushing this patch (finally ;-)
-- Michal
client/lib/deltacloud.rb | 6 +-
server/lib/deltacloud/base_driver/mock_driver.rb | 63 +-
server/lib/deltacloud/drivers/ec2/ec2_driver.rb | 1125 ++++++++---------
.../lib/deltacloud/helpers/application_helper.rb | 7 +-
server/lib/deltacloud/models/storage_volume.rb | 2 +
server/server.rb | 90 ++
server/views/errors/backend_error.html.haml | 3 +
server/views/keys/index.html.haml | 2 +-
server/views/storage_snapshots/index.html.haml | 3 +
server/views/storage_snapshots/new.html.haml | 9 +
server/views/storage_volumes/attach.html.haml | 20 +
server/views/storage_volumes/index.html.haml | 17 +-
server/views/storage_volumes/index.xml.haml | 11 +-
server/views/storage_volumes/new.html.haml | 17 +
server/views/storage_volumes/show.html.haml | 4 +
server/views/storage_volumes/show.xml.haml | 11 +-
tests/ec2/api.feature | 5 +-
tests/ec2/instances.feature | 19 +-
tests/ec2/keys.feature | 8 +-
tests/ec2/step_definitions/images_steps.rb | 3 +-
tests/ec2/step_definitions/instances_steps.rb | 15 +-
tests/ec2/step_definitions/keys_steps.rb | 12 +-
.../ec2/step_definitions/storage_volumes_steps.rb | 89 ++
tests/ec2/storage_volumes.feature | 52 +
...tances.da39a3ee5e6b4b0d3255bfef95601890afd80709 | 91 +-
...volume.9572af574ac24074f128e91230ecf1bfaa3027ca | 4 +
...images.1d05fa88d294d07beed14334421b46d322385188 | 1364 --------------------
...images.45eee35ec8f8243c05d85cf5486c54368be8207e | 11 -
...images.c4b6748639aec6ee0563714c9b6663e90253577b | 8 +
..._owner.ffb952b433edf7fe6cb4e04c86f82ac9ce0faa51 | 358 +++++
...tances.da39a3ee5e6b4b0d3255bfef95601890afd80709 | 75 +-
...tances.378a10da4274bad1f6351b08d0168a5b65a85aaf | 11 +
...tances.21188ff86150e494ea6476e04c8c17301684d74e | 15 -
...tances.87b1de1a54375d34c277a02f2148f0badd91405f | 16 -
...images.c4b6748639aec6ee0563714c9b6663e90253577b | 8 +
..._owner.ffb952b433edf7fe6cb4e04c86f82ac9ce0faa51 | 358 +++++
...tances.da39a3ee5e6b4b0d3255bfef95601890afd80709 | 13 +
...tances.c4b6748639aec6ee0563714c9b6663e90253577b | 11 +
...volume.a4845bca9d929ab74a5a42691c1d2484ea6b4034 | 3 +
...images.1d05fa88d294d07beed14334421b46d322385188 | 1364 --------------------
...images.45eee35ec8f8243c05d85cf5486c54368be8207e | 11 -
...images.c4b6748639aec6ee0563714c9b6663e90253577b | 8 +
..._owner.ffb952b433edf7fe6cb4e04c86f82ac9ce0faa51 | 358 +++++
...tances.da39a3ee5e6b4b0d3255bfef95601890afd80709 | 58 +-
...olumes.da39a3ee5e6b4b0d3255bfef95601890afd80709 | 4 +
...y_pair.62cbf61fbce67eeb64a226a50e1cb41fc80fc6fd | 40 +
...y_pair.c25a79c57906ba7027b36d380230db92bbc0fd64 | 40 +
...eypair.ea562e354ea8280c8e3f9c054f485ab6d9e5b41f | 42 -
...tances.c4b6748639aec6ee0563714c9b6663e90253577b | 11 +
...tances.21188ff86150e494ea6476e04c8c17301684d74e | 15 -
...tances.87b1de1a54375d34c277a02f2148f0badd91405f | 16 -
...volume.a4845bca9d929ab74a5a42691c1d2484ea6b4034 | 3 +
..._zones.da39a3ee5e6b4b0d3255bfef95601890afd80709 | 16 +-
..._zones.fe7704c2394fbc2dd726f797e7080c707d4ee4a5 | 2 +
...images.1d05fa88d294d07beed14334421b46d322385188 | 1364 --------------------
...images.38a8ddc376dd7142783b9ebd6f28d9947dfee768 | 7 +
...images.45eee35ec8f8243c05d85cf5486c54368be8207e | 11 -
...images.491d1c515d961d5875891b26586ece2a2994be84 | 79 --
...images.c4b6748639aec6ee0563714c9b6663e90253577b | 8 +
..._owner.12fef75ad6850ccb88e5261ab3b9906125134088 | 40 +
..._owner.ffb952b433edf7fe6cb4e04c86f82ac9ce0faa51 | 358 +++++
...tances.da39a3ee5e6b4b0d3255bfef95601890afd80709 | 82 +-
..._pairs.03d67c263c27a453ef65b29e30334727333ccbcd | 3 +
..._pairs.da39a3ee5e6b4b0d3255bfef95601890afd80709 | 6 +
...ypairs.6a3266ae8a1b4bbb036d5e207301f1753f888247 | 5 -
...ypairs.da39a3ee5e6b4b0d3255bfef95601890afd80709 | 5 -
...olumes.d977638a708a0f3686756aa5d92c0bac5398c51b | 6 +
...olumes.da39a3ee5e6b4b0d3255bfef95601890afd80709 | 3 +
...y_pair.03d67c263c27a453ef65b29e30334727333ccbcd | 1 +
...eypair.ea562e354ea8280c8e3f9c054f485ab6d9e5b41f | 3 -
...tances.36bf61775f2eb8a12d432bfae62e46c6e7533049 | 27 -
...tances.da39a3ee5e6b4b0d3255bfef95601890afd80709 | 59 +-
..._pairs.da39a3ee5e6b4b0d3255bfef95601890afd80709 | 6 +
...ypairs.da39a3ee5e6b4b0d3255bfef95601890afd80709 | 5 -
...tances.36bf61775f2eb8a12d432bfae62e46c6e7533049 | 6 -
...tances.a99ba014d5951cb243e259a31574a4188169a0dc | 2 +
...volume.11746b0aadd1008bdc6b92a590475d53b15235ad | 4 +
...tances.c4b6748639aec6ee0563714c9b6663e90253577b | 11 +
...tances.36bf61775f2eb8a12d432bfae62e46c6e7533049 | 23 -
...tances.da39a3ee5e6b4b0d3255bfef95601890afd80709 | 59 +-
...tances.36bf61775f2eb8a12d432bfae62e46c6e7533049 | 3 -
...tances.a99ba014d5951cb243e259a31574a4188169a0dc | 1 +
...tances.da39a3ee5e6b4b0d3255bfef95601890afd80709 | 91 +-
...tances.a71f3be6115205ab43b6ab92515b9f3f50cbf22d | 6 -
...tances.ec26047f5e456d1e7e56c67c3a571e8739947460 | 2 +
tests/mock/storage_volumes.feature | 3 +-
86 files changed, 2835 insertions(+), 5381 deletions(-)
create mode 100644 server/views/storage_snapshots/new.html.haml
create mode 100644 server/views/storage_volumes/attach.html.haml
create mode 100644 server/views/storage_volumes/new.html.haml
create mode 100644 tests/ec2/step_definitions/storage_volumes_steps.rb
create mode 100644 tests/ec2/storage_volumes.feature
create mode 100644
tests/ec2/support/ec2/attach_volume.9572af574ac24074f128e91230ecf1bfaa3027ca
delete mode 100644
tests/ec2/support/ec2/create-hwp_describe_images.1d05fa88d294d07beed14334421b46d322385188
delete mode 100644
tests/ec2/support/ec2/create-hwp_describe_images.45eee35ec8f8243c05d85cf5486c54368be8207e
create mode 100644
tests/ec2/support/ec2/create-hwp_describe_images.c4b6748639aec6ee0563714c9b6663e90253577b
create mode 100644
tests/ec2/support/ec2/create-hwp_describe_images_by_owner.ffb952b433edf7fe6cb4e04c86f82ac9ce0faa51
create mode 100644
tests/ec2/support/ec2/create-hwp_launch_instances.378a10da4274bad1f6351b08d0168a5b65a85aaf
delete mode 100644
tests/ec2/support/ec2/create-hwp_run_instances.21188ff86150e494ea6476e04c8c17301684d74e
delete mode 100644
tests/ec2/support/ec2/create-hwp_run_instances.87b1de1a54375d34c277a02f2148f0badd91405f
create mode 100644
tests/ec2/support/ec2/create-public_ip_describe_images.c4b6748639aec6ee0563714c9b6663e90253577b
create mode 100644
tests/ec2/support/ec2/create-public_ip_describe_images_by_owner.ffb952b433edf7fe6cb4e04c86f82ac9ce0faa51
create mode 100644
tests/ec2/support/ec2/create-public_ip_describe_instances.da39a3ee5e6b4b0d3255bfef95601890afd80709
create mode 100644
tests/ec2/support/ec2/create-public_ip_launch_instances.c4b6748639aec6ee0563714c9b6663e90253577b
create mode 100644
tests/ec2/support/ec2/create_create_volume.a4845bca9d929ab74a5a42691c1d2484ea6b4034
delete mode 100644
tests/ec2/support/ec2/create_describe_images.1d05fa88d294d07beed14334421b46d322385188
delete mode 100644
tests/ec2/support/ec2/create_describe_images.45eee35ec8f8243c05d85cf5486c54368be8207e
create mode 100644
tests/ec2/support/ec2/create_describe_images.c4b6748639aec6ee0563714c9b6663e90253577b
create mode 100644
tests/ec2/support/ec2/create_describe_images_by_owner.ffb952b433edf7fe6cb4e04c86f82ac9ce0faa51
create mode 100644
tests/ec2/support/ec2/create_describe_volumes.da39a3ee5e6b4b0d3255bfef95601890afd80709
create mode 100644
tests/ec2/support/ec2/create_key_pair.62cbf61fbce67eeb64a226a50e1cb41fc80fc6fd
create mode 100644
tests/ec2/support/ec2/create_key_pair.c25a79c57906ba7027b36d380230db92bbc0fd64
delete mode 100644
tests/ec2/support/ec2/create_keypair.ea562e354ea8280c8e3f9c054f485ab6d9e5b41f
create mode 100644
tests/ec2/support/ec2/create_launch_instances.c4b6748639aec6ee0563714c9b6663e90253577b
delete mode 100644
tests/ec2/support/ec2/create_run_instances.21188ff86150e494ea6476e04c8c17301684d74e
delete mode 100644
tests/ec2/support/ec2/create_run_instances.87b1de1a54375d34c277a02f2148f0badd91405f
create mode 100644
tests/ec2/support/ec2/create_volume.a4845bca9d929ab74a5a42691c1d2484ea6b4034
create mode 100644
tests/ec2/support/ec2/describe_availability_zones.fe7704c2394fbc2dd726f797e7080c707d4ee4a5
delete mode 100644
tests/ec2/support/ec2/describe_images.1d05fa88d294d07beed14334421b46d322385188
create mode 100644
tests/ec2/support/ec2/describe_images.38a8ddc376dd7142783b9ebd6f28d9947dfee768
delete mode 100644
tests/ec2/support/ec2/describe_images.45eee35ec8f8243c05d85cf5486c54368be8207e
delete mode 100644
tests/ec2/support/ec2/describe_images.491d1c515d961d5875891b26586ece2a2994be84
create mode 100644
tests/ec2/support/ec2/describe_images.c4b6748639aec6ee0563714c9b6663e90253577b
create mode 100644
tests/ec2/support/ec2/describe_images_by_owner.12fef75ad6850ccb88e5261ab3b9906125134088
create mode 100644
tests/ec2/support/ec2/describe_images_by_owner.ffb952b433edf7fe6cb4e04c86f82ac9ce0faa51
create mode 100644
tests/ec2/support/ec2/describe_key_pairs.03d67c263c27a453ef65b29e30334727333ccbcd
create mode 100644
tests/ec2/support/ec2/describe_key_pairs.da39a3ee5e6b4b0d3255bfef95601890afd80709
delete mode 100644
tests/ec2/support/ec2/describe_keypairs.6a3266ae8a1b4bbb036d5e207301f1753f888247
delete mode 100644
tests/ec2/support/ec2/describe_keypairs.da39a3ee5e6b4b0d3255bfef95601890afd80709
create mode 100644
tests/ec2/support/ec2/describe_volumes.d977638a708a0f3686756aa5d92c0bac5398c51b
create mode 100644
tests/ec2/support/ec2/describe_volumes.da39a3ee5e6b4b0d3255bfef95601890afd80709
create mode 100644
tests/ec2/support/ec2/destroy_delete_key_pair.03d67c263c27a453ef65b29e30334727333ccbcd
delete mode 100644
tests/ec2/support/ec2/destroy_delete_keypair.ea562e354ea8280c8e3f9c054f485ab6d9e5b41f
delete mode 100644
tests/ec2/support/ec2/destroy_describe_instances.36bf61775f2eb8a12d432bfae62e46c6e7533049
create mode 100644
tests/ec2/support/ec2/destroy_describe_key_pairs.da39a3ee5e6b4b0d3255bfef95601890afd80709
delete mode 100644
tests/ec2/support/ec2/destroy_describe_keypairs.da39a3ee5e6b4b0d3255bfef95601890afd80709
delete mode 100644
tests/ec2/support/ec2/destroy_terminate_instances.36bf61775f2eb8a12d432bfae62e46c6e7533049
create mode 100644
tests/ec2/support/ec2/destroy_terminate_instances.a99ba014d5951cb243e259a31574a4188169a0dc
create mode 100644
tests/ec2/support/ec2/detach_volume.11746b0aadd1008bdc6b92a590475d53b15235ad
create mode 100644
tests/ec2/support/ec2/launch_instances.c4b6748639aec6ee0563714c9b6663e90253577b
delete mode 100644
tests/ec2/support/ec2/reboot_describe_instances.36bf61775f2eb8a12d432bfae62e46c6e7533049
delete mode 100644
tests/ec2/support/ec2/reboot_reboot_instances.36bf61775f2eb8a12d432bfae62e46c6e7533049
create mode 100644
tests/ec2/support/ec2/reboot_reboot_instances.a99ba014d5951cb243e259a31574a4188169a0dc
delete mode 100644
tests/ec2/support/ec2/stop_terminate_instances.a71f3be6115205ab43b6ab92515b9f3f50cbf22d
create mode 100644
tests/ec2/support/ec2/stop_terminate_instances.ec26047f5e456d1e7e56c67c3a571e8739947460
--
1.7.3.2
--
--------------------------------------------------------
Michal Fojtik, [email protected]
Deltacloud API: http://deltacloud.org
--------------------------------------------------------
