You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@deltacloud.apache.org by mf...@redhat.com on 2012/08/24 12:19:29 UTC
[PATCH core 1/2] Core: Fixed dependencies in gemspec
From: Michal Fojtik <mf...@redhat.com>
* Added rbvomi for VSphere
* Bumped rbovirt version
* Bumped sinatra version
* Bumped required_ruby_version to 1.8.6
Signed-off-by: Michal fojtik <mf...@redhat.com>
---
server/deltacloud-core.gemspec | 32 +++++++++++++++++++-------------
1 file changed, 19 insertions(+), 13 deletions(-)
diff --git a/server/deltacloud-core.gemspec b/server/deltacloud-core.gemspec
index ddc709d..61bcbf1 100644
--- a/server/deltacloud-core.gemspec
+++ b/server/deltacloud-core.gemspec
@@ -62,11 +62,11 @@ Gem::Specification.new do |s|
s.executables = 'deltacloudd'
s.test_files= Dir.glob("tests/**/*_test.rb")
s.extra_rdoc_files = Dir["LICENSE", "DISCLAIMER", "NOTICE"]
- s.required_ruby_version = '>= 1.8.1'
+ s.required_ruby_version = '>= 1.8.6'
s.has_rdoc = 'false'
s.add_dependency('rake', '>= 0.8.7')
s.add_dependency('haml', '>= 2.2.17')
- s.add_dependency('sinatra', '>= 0.9.4')
+ s.add_dependency('sinatra', '>= 1.3.0')
s.add_dependency('sinatra-rabbit', '>= 1.0.10')
s.add_dependency('crack')
s.add_dependency('rack', '>= 1.0.0')
@@ -77,33 +77,39 @@ Gem::Specification.new do |s|
s.add_dependency('nokogiri', '>= 1.4.3')
s.add_dependency('require_relative') if RUBY_VERSION < '1.9'
-# dependencies for various cloud providers:
-# RHEV-M
- s.add_dependency('rbovirt', '>=0.0.6')
+ # dependencies for various cloud providers:
-# Amazon EC2 S3
+ # RHEV-M and oVirt
+ s.add_dependency('rbovirt', '>=0.0.12')
+
+ # Amazon EC2 S3
s.add_dependency('aws', '>=2.5.4')
-# Microsoft Azure
+ # Microsoft Azure
s.add_dependency('waz-storage', '>=1.1.0')
-# Rackspace Cloudservers Cloudfiles
+ # Rackspace Cloudservers Cloudfiles
s.add_dependency('cloudservers')
s.add_dependency('cloudfiles')
-# Terremark Vcloud Express
+ # Terremark Vcloud Express
s.add_dependency('fog', '>= 1.4.0')
s.add_dependency('excon', '>= 0.14.2' )
-# Rhevm and Condor Cloud
+ # Rhevm and Condor Cloud
s.add_dependency('rest-client')
-# Condor Cloud
+ # Condor Cloud
s.add_dependency('uuidtools', '>= 2.1.1')
-# Openstack Compute and Object-Storage
+ # Openstack Compute and Object-Storage
s.add_dependency('openstack', '>= 1.0.1')
-# Aruba Cloud
+ # Aruba Cloud
s.add_dependency('savon', '>= 1.0.0')
+ # VSphere
+ s.add_dependency('rbvmomi')
+
+
+
end
--
1.7.10.2
Re: [PATCH core 1/2] Core: Fixed dependencies in gemspec
Posted by "marios@redhat.com" <ma...@redhat.com>.
ACK both
On 08/24/2012 01:19 PM, mfojtik@redhat.com wrote:
> From: Michal Fojtik <mf...@redhat.com>
>
> * Added rbvomi for VSphere
> * Bumped rbovirt version
> * Bumped sinatra version
> * Bumped required_ruby_version to 1.8.6
>
> Signed-off-by: Michal fojtik <mf...@redhat.com>
> ---
> server/deltacloud-core.gemspec | 32 +++++++++++++++++++-------------
> 1 file changed, 19 insertions(+), 13 deletions(-)
>
> diff --git a/server/deltacloud-core.gemspec b/server/deltacloud-core.gemspec
> index ddc709d..61bcbf1 100644
> --- a/server/deltacloud-core.gemspec
> +++ b/server/deltacloud-core.gemspec
> @@ -62,11 +62,11 @@ Gem::Specification.new do |s|
> s.executables = 'deltacloudd'
> s.test_files= Dir.glob("tests/**/*_test.rb")
> s.extra_rdoc_files = Dir["LICENSE", "DISCLAIMER", "NOTICE"]
> - s.required_ruby_version = '>= 1.8.1'
> + s.required_ruby_version = '>= 1.8.6'
> s.has_rdoc = 'false'
> s.add_dependency('rake', '>= 0.8.7')
> s.add_dependency('haml', '>= 2.2.17')
> - s.add_dependency('sinatra', '>= 0.9.4')
> + s.add_dependency('sinatra', '>= 1.3.0')
> s.add_dependency('sinatra-rabbit', '>= 1.0.10')
> s.add_dependency('crack')
> s.add_dependency('rack', '>= 1.0.0')
> @@ -77,33 +77,39 @@ Gem::Specification.new do |s|
> s.add_dependency('nokogiri', '>= 1.4.3')
> s.add_dependency('require_relative') if RUBY_VERSION < '1.9'
>
> -# dependencies for various cloud providers:
> -# RHEV-M
> - s.add_dependency('rbovirt', '>=0.0.6')
> + # dependencies for various cloud providers:
>
> -# Amazon EC2 S3
> + # RHEV-M and oVirt
> + s.add_dependency('rbovirt', '>=0.0.12')
> +
> + # Amazon EC2 S3
> s.add_dependency('aws', '>=2.5.4')
> -# Microsoft Azure
> + # Microsoft Azure
> s.add_dependency('waz-storage', '>=1.1.0')
>
> -# Rackspace Cloudservers Cloudfiles
> + # Rackspace Cloudservers Cloudfiles
> s.add_dependency('cloudservers')
> s.add_dependency('cloudfiles')
>
> -# Terremark Vcloud Express
> + # Terremark Vcloud Express
> s.add_dependency('fog', '>= 1.4.0')
> s.add_dependency('excon', '>= 0.14.2' )
>
> -# Rhevm and Condor Cloud
> + # Rhevm and Condor Cloud
> s.add_dependency('rest-client')
>
> -# Condor Cloud
> + # Condor Cloud
> s.add_dependency('uuidtools', '>= 2.1.1')
>
> -# Openstack Compute and Object-Storage
> + # Openstack Compute and Object-Storage
> s.add_dependency('openstack', '>= 1.0.1')
>
> -# Aruba Cloud
> + # Aruba Cloud
> s.add_dependency('savon', '>= 1.0.0')
>
> + # VSphere
> + s.add_dependency('rbvmomi')
> +
> +
> +
> end
>
[PATCH core 2/2] VSphere: Minor tweaks to the driver
Posted by mf...@redhat.com.
From: Michal Fojtik <mf...@redhat.com>
* Removed unused local variables and methods
* Fixed way how we require client lib
Signed-off-by: Michal fojtik <mf...@redhat.com>
---
server/lib/deltacloud/drivers/vsphere/vsphere_driver.rb | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/server/lib/deltacloud/drivers/vsphere/vsphere_driver.rb b/server/lib/deltacloud/drivers/vsphere/vsphere_driver.rb
index 2e868ca..43818fe 100644
--- a/server/lib/deltacloud/drivers/vsphere/vsphere_driver.rb
+++ b/server/lib/deltacloud/drivers/vsphere/vsphere_driver.rb
@@ -15,7 +15,7 @@
#
require 'rbvmomi'
-require 'deltacloud/drivers/vsphere/vsphere_client'
+require_relative './vsphere_client.rb'
module Deltacloud::Drivers::Vsphere
@@ -74,7 +74,6 @@ module Deltacloud::Drivers::Vsphere
# Images are virtual machines with 'template' flag set to be true.
# Thus we're getting them using find_vm and list_virtual_machines
def images(credentials, opts={})
- cloud = new_client(credentials)
img_arr = []
profiles = hardware_profiles(credentials)
# Skip traversing through all instances in all datacenters when ID
@@ -86,9 +85,8 @@ module Deltacloud::Drivers::Vsphere
template_vms = list_virtual_machines(credentials).select { |vm| vm[:instance] && vm[:instance].summary.config[:template] }
end
img_arr = template_vms.collect do |image_hash|
- image, realm = image_hash[:instance], image_hash[:datastore]
+ image = image_hash[:instance]
config = image.summary.config
- instance_state = convert_state(:instance, image.summary.runtime[:powerState])
# Preload all properties to save multiple SOAP calls to vSphere
properties = {
:name => config[:name],
@@ -115,7 +113,6 @@ module Deltacloud::Drivers::Vsphere
end
def create_image(credentials, opts={})
- vsphere = new_client(credentials)
safely do
find_vm(credentials, opts[:id])[:instance].MarkAsTemplate
end
@@ -132,7 +129,7 @@ module Deltacloud::Drivers::Vsphere
else
rootFolder = vsphere.serviceInstance.content.rootFolder
rootFolder.childEntity.grep(RbVmomi::VIM::Datacenter).collect do |dc|
- dc.datastoreFolder.childEntity.collect { |datastore| convert_realm(datastore) }
+ dc.datastoreFolder.childEntity.collect { |ds| convert_realm(ds) }
end.flatten
end
end
@@ -141,7 +138,6 @@ module Deltacloud::Drivers::Vsphere
# List all running instances, across all datacenters. DeltaCloud API does
# not yet support filtering instances by realm.
def instances(credentials, opts={})
- cloud = new_client(credentials)
inst_arr, machine_vms, pending_vms = [], [], []
safely do
# Using find_vm is a way faster than listing all virtual machines
@@ -213,12 +209,10 @@ module Deltacloud::Drivers::Vsphere
def create_instance(credentials, image_id, opts={})
- vsphere = new_client(credentials)
safely do
if opts[:hwp_cpu]
raise "Invalid CPU value. Must be in integer format" unless valid_cpu_value?(opts[:hwp_cpu])
end
- rootFolder = vsphere.serviceInstance.content.rootFolder
vm = find_vm(credentials, opts[:image_id])
raise "ERROR: Could not find the image in given datacenter" unless vm[:instance]
# New instance need valid resource pool and datastore to be placed.
--
1.7.10.2