deltacloud-core 0.3.0 → 0.4.0

data/lib/deltacloud/drivers/ec2/ec2_mock_driver.rb

@@ -16,7 +16,7 @@
 
 module RightAws
   class MockEc2
-    
+
     def initialize(opts={})
     end
 
@@ -161,7 +161,7 @@ module RightAws
         instance[:aws_launch_time] = instance_time_format
         instances = load_fixtures_for(:instances)
         instances.each_with_index do |inst, i|
-          instances[i] = instance if inst[:aws_instance_id].eql?(id)       
+          instances[i] = instance if inst[:aws_instance_id].eql?(id)
         end
         update_fixtures_for(:instances, instances)
         return instance
@@ -178,7 +178,7 @@ Deltacloud::Drivers::EC2::EC2Driver.class_eval do
 
   def new_client(credentials, opts={})
     if credentials.user != 'mockuser' and credentials.password != 'mockpassword'
-      raise Deltacloud::AuthException.new
+      raise "AuthFailure"
     end
     RightAws::MockEc2.new
   end

data/lib/deltacloud/drivers/eucalyptus/eucalyptus_driver.rb

@@ -22,12 +22,12 @@ module Deltacloud
       class EucalyptusDriver < EC2::EC2Driver
 
         def supported_collections
-          DEFAULT_COLLECTIONS + [ :keys, :buckets ]
+          DEFAULT_COLLECTIONS + [ :keys, :buckets, :addresses, :firewalls ]
         end
 
         feature :instances, :user_data
         feature :instances, :authentication_key
-        feature :instances, :security_group
+        feature :instances, :firewalls
         feature :instances, :instance_count
         feature :images, :owner_id
 
@@ -75,17 +75,13 @@ module Deltacloud
         end
 
         def default_image_owner
-          "self"
+          nil  # list all images
         end
 
         def default_image_type
           nil
         end
 
-        def tagging?
-          false
-        end
-
         def tag_instance(credentials, instance, name)
           # dummy
         end
@@ -126,6 +122,42 @@ module Deltacloud
                   "Loadbalancer not supported in Eucalyptus", "")
         end
 
+	# override EC2 implementation; Eucalyptus implements the older definition of EC2 security group;
+	# http://docs.amazonwebservices.com/AWSEC2/2009-07-15/APIReference/index.html?ApiReference-query-AuthorizeSecurityGroupIngress.html
+        # if the rule specifies a source group, port&protocol will be ignored. And source group and cidr range can't be mixed in a request
+        def create_firewall_rule(credentials, opts={})
+        # only either source groups or cidr IP range can be given, not both;
+          if !(opts['groups'].nil?) && opts['groups'].length>0
+            ec2 = new_client(credentials)
+            opts['groups'].each do |group,owner|
+              safely do
+                ec2.authorize_security_group_named_ingress(opts['id'], owner, group)
+              end
+            end
+          elsif !(opts['addresses'].nil?) && opts['addresses'].length>0
+            ec2 = new_client(credentials)
+            opts['addresses'].each do |ip|
+              ec2.authorize_security_group_IP_ingress(opts['id'], opts['port_from'], opts['port_to'], opts['protocol'], ip)
+            end
+          end
+        end
+
+        def delete_firewall_rule(credentials, opts={})
+          ec2 = new_client(credentials)
+          firewall = opts[:firewall]
+          protocol, from_port, to_port, addresses, groups = firewall_rule_params(opts[:rule_id])
+          unless groups.nil?
+            groups.each_index do |i|
+              ec2.revoke_security_group_named_ingress(firewall, groups[i]['owner'], groups[i]['group_name'])
+            end
+          end
+          unless addresses.nil?
+            addresses.each do |ip|
+              ec2.revoke_security_group_IP_ingress(firewall, from_port, to_port, protocol, ip )
+            end
+          end
+        end
+
         def new_client(credentials, type = :ec2)
           klass = case type
                   when :ec2 then Aws::Ec2
@@ -147,7 +179,7 @@ module Deltacloud
 
         def endpoint_for_service(service)
           service = service.to_s
-          endpoint = (Thread.current[:provider] || ENV['API_PROVIDER'])
+          endpoint = api_provider
           if endpoint && endpoint.include?(service)
             # example endpoint: 'ec2=192.168.1.1; s3=192.168.1.2'
             addr = Hash[endpoint.split(";").map { |svc| svc.strip.split("=") }][service]

data/lib/deltacloud/drivers/gogrid/gogrid_client.rb

@@ -42,25 +42,25 @@ class GoGridClient
 
   def initialize(server='https://api.gogrid.com/api',
                  apikey='YOUR API KEY',
-                 secret='YOUR SHARED SECRET', 
+                 secret='YOUR SHARED SECRET',
                  format='json',
                  version='1.6')
     @server = server
     @secret = secret
     @default_params = {'format'=>format, 'v'=>version,'api_key' => apikey}
-  end    
-  
+  end
+
   def getRequestURL(method,params)
     requestURL = @server+'/'+method+'?'
   	call_params = @default_params.merge(params)
   	call_params['sig']=getSignature(@default_params['api_key'],@secret)
   	requestURL = requestURL+encode_params(call_params)
   end
-  
+
   def getSignature(key,secret)
     Digest::MD5.hexdigest(key+secret+"%.0f"%Time.new.to_f)
   end
-  
+
   def sendAPIRequest(method,params={})
     OpenURI.without_ssl_verification do
       open(getRequestURL(method,params)).read
@@ -76,9 +76,9 @@ class GoGridClient
     request = sendAPIRequest(method, params)
     JSON::parse(request)
   end
-  
+
   def encode_params(params)
     params.map {|k,v| "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}" }.join("&")
   end
-    
+
 end

data/lib/deltacloud/drivers/gogrid/gogrid_driver.rb

@@ -35,6 +35,11 @@ class GogridDriver < Deltacloud::BaseDriver
 
   feature :instances, :authentication_password
   feature :instances, :sandboxing
+  feature :instances, :user_name do
+    constraint :max_length, 20
+  end
+
+  USER_NAME_MAX = feature(:instances, :user_name).constraints[:max_length]
 
   def hardware_profiles(credentials, opts={})
     client = new_client(credentials)
@@ -43,7 +48,7 @@ class GogridDriver < Deltacloud::BaseDriver
       server_rams = client.request('common/lookup/list', { 'lookup' => 'server.ram' })
       @hardware_profiles = []
       server_types['list'].each do |type|
-        memory_values = server_rams['list'].collect do |r| 
+        memory_values = server_rams['list'].collect do |r|
             r['name'] =~ /MB$/ ? r['name'].gsub(/MB$/, '').to_i : (r['name'].gsub(/(\w{2})$/, '')).to_i*1024
         end
         @hardware_profiles << ::Deltacloud::HardwareProfile.new(type['name'].tr(' ', '-').downcase) do
@@ -79,11 +84,14 @@ class GogridDriver < Deltacloud::BaseDriver
   end
 
   def realms(credentials, opts=nil)
+    realms = []
+    client = new_client(credentials)
     safely do
-      new_client(credentials).request('common/lookup/list', { 'lookup' => 'ip.datacenter' })['list'].collect do |realm|
-        convert_realm(realm)
+        client.request('common/lookup/list', { 'lookup' => 'ip.datacenter' })['list'].collect do |realm|
+         realms << convert_realm(realm)
       end
     end
+    realms = filter_on(realms, :id, opts)
   end
 
   def create_instance(credentials, image_id, opts={})
@@ -94,14 +102,24 @@ class GogridDriver < Deltacloud::BaseDriver
     else
       server_ram = "512MB"
     end
+
+    name = opts[:name]
+    if not name
+      name = "Server #{Time.now.to_i.to_s.reverse[0..3]}#{rand(9)}"
+    end
+
+    if name.length > USER_NAME_MAX
+      raise "Parameter name must be #{USER_NAME_MAX} characters or less"
+    end
+
     client = new_client(credentials)
     params = {
-      'name' => opts[:name] || get_random_instance_name,
+      'name' => name,
       'image' => image_id,
       'server.ram' => server_ram,
       'ip' => get_free_ip_from_realm(credentials, opts[:realm_id] || '1')
     }
-    params.merge!('isSandbox' => 'true') if opts[:sandbox] 
+    params.merge!('isSandbox' => 'true') if opts[:sandbox]
     safely do
       instance = client.request('grid/server/add', params)['list'].first
       if instance
@@ -213,7 +231,7 @@ class GogridDriver < Deltacloud::BaseDriver
       if opts['instance_id']
         l_instance = instance(credentials, :id => opts['instance_id'])
         real_ip = {
-          'realiplist.0.port' => opts['listener_inst_port'],
+          'realiplist.0.port' => opts['listener_instance_port'].to_i,
           'realiplist.0.ip' => l_instance ? l_instance.public_addresses.first : ""
         }
       else
@@ -222,7 +240,7 @@ class GogridDriver < Deltacloud::BaseDriver
       request = {
         'name' => opts['name'],
         'virtualip.ip' => virtip,
-        'virtualip.port' => opts['listener_lbr_port'],
+        'virtualip.port' => opts['listener_balancer_port'].to_i,
       }
       request.merge!(real_ip) if real_ip
       balancer = gogrid.request('grid/loadbalancer/add', request)['list'].first
@@ -237,9 +255,7 @@ class GogridDriver < Deltacloud::BaseDriver
     balancer = nil
     safely do
       balancer = gogrid.request('grid/loadbalancer/delete', { 'name' => id })
-      balancer = load_balancer(credentials, :id => id) unless balancer
     end
-    convert_load_balancer(credentials, balancer)
   end
 
   def load_balancers(credentials, opts={})
@@ -334,7 +350,7 @@ class GogridDriver < Deltacloud::BaseDriver
 
   def convert_load_balancer(credentials, loadbalancer)
     if loadbalancer['datacenter']
-      b_realm = realm(credentials, :id => loadbalancer['datacenter']['id'])
+      b_realm = realm(credentials, :id => loadbalancer['datacenter']['id'].to_s)
     else
       # Report first Realm until loadbalancer become ready
       b_realm = realm(credentials, :id => 1)
@@ -347,18 +363,23 @@ class GogridDriver < Deltacloud::BaseDriver
     balancer.listeners = []
     balancer.instances = []
     instance_ips = []
-    loadbalancer['realiplist'].each do |instance_ip|
-      balancer.add_listener({
-        :protocol => 'TCP',
-        :load_balancer_port => loadbalancer['virtualip']['port'],
-        :instance_port => instance_ip['port']
-      })
-      instance_ips << instance_ip['ip']['ip']
-    end if loadbalancer['realiplist']
-    balancer.instances = get_load_balancer_instances(instance_ips, loadbalancer['instances'])
+    if loadbalancer['realiplist'].size > 0
+      loadbalancer['realiplist'].each do |instance_ip|
+       balancer.add_listener({
+          :protocol => 'TCP',
+          :load_balancer_port => loadbalancer['virtualip']['port'],
+          :instance_port => instance_ip['port']
+        })
+        instance_ips << instance_ip['ip']['ip']
+      end
+    else
+      balancer.add_listener({:protocol=>'TCP', :load_balancer_port =>loadbalancer['virtualip']['port'],
+                             :instance_port => "unassigned"})
+    end
+    balancer.instances = get_load_balancer_instances(instance_ips, loadbalancer['instances']) if loadbalancer['instances']
     return balancer
   end
- 
+
   def get_load_balancer_instances(instance_ips, instances)
     instances.select { |i| instance_ips.include?(i.public_addresses.first) } if instances
   end
@@ -410,7 +431,7 @@ class GogridDriver < Deltacloud::BaseDriver
 
   def convert_realm(realm)
     Realm.new(
-      :id => realm['id'],
+      :id => realm['id'].to_s,
       :name => realm['name'],
       :state => :unlimited,
       :storage => :unlimited
@@ -458,10 +479,6 @@ class GogridDriver < Deltacloud::BaseDriver
     )
   end
 
-  def get_random_instance_name
-    "Server #{Time.now.to_i.to_s.reverse[0..3]}#{rand(9)}"
-  end
-
   def convert_server_state(state, id)
     return 'PENDING' unless id
     state.eql?('Off') ? 'STOPPED' : 'RUNNING'

data/lib/deltacloud/drivers/mock/data/{buckets/blobs → blobs}/blob1.yml

@@ -1,8 +1,10 @@
 ---
-:content_type: text/plain
 :content_length: 17
-:bucket: bucket1
-:user_metadata:
-  SOMENEWKEY: NEWVALUE
+:content_type: text/plain
 :last_modified: 2010-09-23 16:44:54 +0100
 :content: content of blob 1
+:name: blob1
+:user_metadata:
+  SOMENEWKEY: NEWVALUE
+:bucket: bucket1
+:id: blob1

data/lib/deltacloud/drivers/mock/data/{buckets/blobs → blobs}/blob2.yml

@@ -1,8 +1,10 @@
---- 
-:user_metadata: 
-  VERSION: "1.2"
-:content_type: text/html
+---
 :content_length: 56
-:bucket: bucket1
+:content_type: text/html
 :last_modified: 2010-09-23 16:55:05 +0100
 :content: <html><head></head><body>content of blob 2</body></html>
+:name: blob2
+:user_metadata:
+  VERSION: "1.2"
+:bucket: bucket1
+:id: blob2

data/lib/deltacloud/drivers/mock/data/{buckets/blobs → blobs}/blob3.yml

@@ -1,7 +1,9 @@
-:bucket: bucket1
+---
 :content_length: 17
 :content_type: text/plain
 :last_modified: 2010-08-14 02:14:31 +0100
-:content:
-    content of blob 3
-:user_metadata: ''
+:content: content of blob 3
+:name: blob3
+:user_metadata: ""
+:bucket: bucket1
+:id: blob3

data/lib/deltacloud/drivers/mock/data/{buckets/blobs → blobs}/blob4.yml

@@ -1,8 +1,10 @@
-:bucket: bucket2
+---
 :content_length: 17
 :content_type: application/octet-stream
 :last_modified: 2010-09-21 06:17:24 +0100
-:content:
-    content of blob 4
+:content: content of blob 4
+:name: blob4
 :user_metadata:
-    some: "value"
+  some: value
+:bucket: bucket2
+:id: blob4

data/lib/deltacloud/drivers/mock/data/{buckets/blobs → blobs}/blob5.yml

@@ -1,7 +1,9 @@
-:bucket: bucket2
+---
 :content_length: 17
 :content_type: application/pdf
 :last_modified: 2009-07-21 11:12:13 +0100
-:content:
-    content of blob 5
-:user_metadata: ''
+:content: content of blob 5
+:name: blob5
+:user_metadata: ""
+:id: blob5
+:bucket: bucket2

data/lib/deltacloud/drivers/mock/data/buckets/bucket1.yml

@@ -1,2 +1,8 @@
-:blob_list: [blob1, blob2, blob3]
+---
+:blob_list:
+- blob1
+- blob2
+- blob3
 :size: 3
+:name: bucket1
+:id: bucket1

data/lib/deltacloud/drivers/mock/data/buckets/bucket2.yml

@@ -1,2 +1,7 @@
-:blob_list: [blob4, blob5]
+---
+:blob_list:
+- blob4
+- blob5
 :size: 2
+:name: bucket2
+:id: bucket2

data/lib/deltacloud/drivers/mock/data/images/img1.yml

@@ -1,3 +1,7 @@
-:description: Fedora 10
-:owner_id: fedoraproject
+---
 :architecture: x86_64
+:owner_id: fedoraproject
+:state: AVAILABLE
+:id: img1
+:name: img1
+:description: Fedora 10

data/lib/deltacloud/drivers/mock/data/images/img2.yml

@@ -1,3 +1,7 @@
-:description: Fedora 10
-:owner_id: fedoraproject
+---
 :architecture: i386
+:owner_id: fedoraproject
+:state: AVAILABLE
+:id: img2
+:name: img2
+:description: Fedora 10

data/lib/deltacloud/drivers/mock/data/images/img3.yml

@@ -1,3 +1,7 @@
-:description: JBoss
-:owner_id: mockuser
+---
 :architecture: i386
+:owner_id: mockuser
+:state: AVAILABLE
+:id: img3
+:name: img3
+:description: JBoss

data/lib/deltacloud/drivers/mock/data/instances/inst0.yml

@@ -1,17 +1,18 @@
 ---
-:realm_id: us
-:public_addresses:
-- img1.inst0.public.com
-:state: RUNNING
-:name: "Mock Instance With Profile Change"
-:private_addresses:
-- img1.inst0.private.com
-:image_id: img1
 :instance_profile: !ruby/object:InstanceProfile
-  id: m1-large
   memory: "12288"
-:owner_id: mockuser
+  id: m1-large
+:realm_id: us
 :actions:
 - :reboot
 - :stop
+:owner_id: mockuser
+:public_addresses:
+- img1.inst0.public.com
+:private_addresses:
+- img1.inst0.private.com
 :create_image: true
+:image_id: img1
+:name: Mock Instance With Profile Change
+:id: inst0
+:state: RUNNING