fog-maestrodev 1.7.0.20121114190951 → 1.8.0.20130109172219

data/lib/fog/openstack/models/compute/metadata.rb

@@ -16,7 +16,7 @@ module Fog
 
         def all
           requires :parent
-          metadata = connection.list_metadata(collection_name, @parent.id).body['metadata']
+          metadata = service.list_metadata(collection_name, @parent.id).body['metadata']
           metas = []
           metadata.each_pair {|k,v| metas << {"key" => k, "value" => v} }
           load(metas)
@@ -24,7 +24,7 @@ module Fog
 
         def get(key)
           requires :parent
-          data = connection.get_meta(collection_name, @parent.id, key).body["meta"]
+          data = service.get_meta(collection_name, @parent.id, key).body["meta"]
           metas = []
           data.each_pair {|k,v| metas << {"key" => k, "value" => v} }
           new(metas[0])
@@ -34,12 +34,12 @@ module Fog
 
         def update(data=nil)
           requires :parent
-          connection.update_metadata(collection_name, @parent.id, meta_hash(data))
+          service.update_metadata(collection_name, @parent.id, meta_hash(data))
         end
 
         def set(data=nil)
           requires :parent
-          connection.set_metadata(collection_name, @parent.id, meta_hash(data))
+          service.set_metadata(collection_name, @parent.id, meta_hash(data))
         end
 
         def new(attributes = {})

data/lib/fog/openstack/models/compute/metadatum.rb

@@ -13,13 +13,13 @@ module Fog
 
         def destroy
           requires :identity
-          connection.delete_meta(collection_name, @parent.id, key)
+          service.delete_meta(collection_name, @parent.id, key)
           true
         end
 
         def save
           requires :identity, :value
-          connection.update_meta(collection_name, @parent.id, key, value)
+          service.update_meta(collection_name, @parent.id, key, value)
           true
         end
 

data/lib/fog/openstack/models/compute/security_group.rb

@@ -16,25 +16,25 @@ module Fog
 
         def save
           requires :name, :description
-          data = connection.create_security_group(name, description)
-          merge_attributes(data.body['security_groups'])
+          data = service.create_security_group(name, description)
+          merge_attributes(data.body['security_group'])
           true
         end
 
 
         def destroy
           requires :id
-          connection.delete_security_group(id)
+          service.delete_security_group(id)
           true
         end
 
         def create_security_group_rule(min, max, ip_protocol = "tcp", cidr = "0.0.0.0/0", group_id = nil)
           requires :id
-          connection.create_security_group_rule(id, ip_protocol, min, max, cidr, group_id)
+          service.create_security_group_rule(id, ip_protocol, min, max, cidr, group_id)
         end
 
         def delete_security_group_rule(rule_id)
-          connection.delete_security_group_rule(rule_id)
+          service.delete_security_group_rule(rule_id)
           true
         end
 

data/lib/fog/openstack/models/compute/security_groups.rb

@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::OpenStack::SecurityGroup
 
         def all
-          load(connection.list_security_groups.body['security_groups'])
+          load(service.list_security_groups.body['security_groups'])
         end
 
         def get(security_group_id)
           if security_group_id
-            new(connection.get_security_group(security_group_id).body['security_group'])
+            new(service.get_security_group(security_group_id).body['security_group'])
           end
         rescue Fog::Compute::OpenStack::NotFound
           nil

data/lib/fog/openstack/models/compute/server.rb

@@ -44,7 +44,8 @@ module Fog
 
 
         def initialize(attributes={})
-          @connection = attributes[:connection]
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
           attributes[:metadata] = {}
 
           self.security_groups = attributes.delete(:security_groups)
@@ -58,7 +59,7 @@ module Fog
         def metadata
           @metadata ||= begin
             Fog::Compute::OpenStack::Metadata.new({
-              :connection => connection,
+              :service => service,
               :parent => self
             })
           end
@@ -76,37 +77,33 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_server(id)
+          service.delete_server(id)
           true
         end
 
         def images
           requires :id
-          connection.images(:server => self)
+          service.images(:server => self)
         end
 
         def private_ip_address
           if addresses['private']
             #assume only a single private
-            address = addresses['private'].first
+            return addresses['private'].first
           elsif addresses['internet']
             #assume no private IP means private cloud
-            address = addresses['internet'].first
+            return addresses['internet'].first
           end
-          # rackspace returns a hash {"version", "addr"}
-          return address.kind_of?(Hash) ? address["addr"] : address
         end
 
         def public_ip_address
           if addresses['public']
             #assume last is either original or assigned from floating IPs
-            address = addresses['public'].last
+            return addresses['public'].last
           elsif addresses['internet']
             #assume no public IP means private cloud
-            address = addresses['internet'].first
+            return addresses['internet'].first
           end
-          # rackspace returns a hash {"version", "addr"}
-          return address.kind_of?(Hash) ? address["addr"] : address
         end
 
         def image_ref
@@ -131,72 +128,89 @@ module Fog
 
         def change_password(admin_password)
           requires :id
-          connection.change_server_password(id, admin_password)
+          service.change_server_password(id, admin_password)
           true
         end
 
         def rebuild(image_ref, name, admin_pass=nil, metadata=nil, personality=nil)
           requires :id
-          connection.rebuild_server(id, image_ref, name, admin_pass, metadata, personality)
+          service.rebuild_server(id, image_ref, name, admin_pass, metadata, personality)
           true
         end
 
         def resize(flavor_ref)
           requires :id
-          connection.resize_server(id, flavor_ref)
+          service.resize_server(id, flavor_ref)
           true
         end
 
         def revert_resize
           requires :id
-          connection.revert_resize_server(id)
+          service.revert_resize_server(id)
           true
         end
 
         def confirm_resize
           requires :id
-          connection.confirm_resize_server(id)
+          service.confirm_resize_server(id)
           true
         end
 
+        def security_groups
+          requires :id
+
+          groups = service.list_security_groups(id).body['security_groups']
+
+          groups.map do |group|
+            sg = Fog::Compute::OpenStack::SecurityGroup.new group
+            sg.connection = service
+            sg
+          end
+        end
+
         def security_groups=(new_security_groups)
           @security_groups = new_security_groups
         end
 
         def reboot(type = 'SOFT')
           requires :id
-          connection.reboot_server(id, type)
+          service.reboot_server(id, type)
           true
         end
 
         def create_image(name, metadata={})
           requires :id
-          connection.create_image(id, name, metadata)
+          service.create_image(id, name, metadata)
         end
 
         def console(log_length = nil)
           requires :id
-          connection.get_console_output(id, log_length)
+          service.get_console_output(id, log_length)
         end
 
         def migrate
           requires :id
-          connection.migrate_server(id)
+          service.migrate_server(id)
         end
 
         def live_migrate(host, block_migration, disk_over_commit)
           requires :id
-          connection.live_migrate_server(id, host, block_migration, disk_over_commit)
+          service.live_migrate_server(id, host, block_migration, disk_over_commit)
         end
 
         def associate_address(floating_ip)
           requires :id
-          connection.associate_address id, floating_ip
+          service.associate_address id, floating_ip
         end
 
         def disassociate_address(floating_ip)
           requires :id
-          connection.disassociate_address id, floating_ip
+          service.disassociate_address id, floating_ip
+        end
+
+        def reset_vm_state(vm_state)
+          requires :id
+          service.reset_server_state id, vm_state
         end
 
         def min_count=(new_min_count)
@@ -208,12 +222,12 @@ module Fog
         end
 
         def networks
-          connection.networks(:server => self)
+          service.networks(:server => self)
         end
 
         # TODO: Implement /os-volumes-boot support with 'block_device_mapping'
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           requires :flavor_ref, :image_ref, :name
           meta_hash = {}
           metadata.each { |meta| meta_hash.store(meta.key, meta.value) }
@@ -231,7 +245,7 @@ module Fog
             'os:scheduler_hints' => @os_scheduler_hints
           }
           options = options.reject {|key, value| value.nil?}
-          data = connection.create_server(name, image_ref, flavor_ref, options)
+          data = service.create_server(name, image_ref, flavor_ref, options)
           merge_attributes(data.body['server'])
           true
         end

data/lib/fog/openstack/models/compute/servers.rb

@@ -18,7 +18,7 @@ module Fog
 
         def all(filters = filters)
           self.filters = filters
-          data = connection.list_servers_detail(filters).body['servers']
+          data = service.list_servers_detail(filters).body['servers']
           load(data)
         end
 
@@ -30,7 +30,7 @@ module Fog
         end
 
         def get(server_id)
-          if server = connection.get_server_details(server_id).body['server']
+          if server = service.get_server_details(server_id).body['server']
             new(server)
           end
         rescue Fog::Compute::OpenStack::NotFound

data/lib/fog/openstack/models/compute/snapshot.rb

@@ -18,20 +18,21 @@ module Fog
 
 
         def initialize(attributes)
-          @connection = attributes[:connection]
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
           super
         end
 
         def save(force=false)
           requires :volume_id, :name, :description
-          data = connection.create_volume_snapshot(volume_id, name, description, force)
+          data = service.create_volume_snapshot(volume_id, name, description, force)
           merge_attributes(data.body['snapshot'])
           true
         end
 
         def destroy
           requires :id
-          connection.delete_snapshot(id)
+          service.delete_snapshot(id)
           true
         end
 

data/lib/fog/openstack/models/compute/snapshots.rb

@@ -9,11 +9,11 @@ module Fog
         model Fog::Compute::OpenStack::Snapshot
 
         def all(detailed=true)
-          load(connection.list_snapshots(detailed).body['snapshots'])
+          load(service.list_snapshots(detailed).body['snapshots'])
         end
 
         def get(snapshot_id)
-          if snapshot = connection.get_snapshot_details(snapshot_id).body['snapshot']
+          if snapshot = service.get_snapshot_details(snapshot_id).body['snapshot']
             new(snapshot)
           end
         rescue Fog::Compute::OpenStack::NotFound

data/lib/fog/openstack/models/compute/tenant.rb

@@ -16,7 +16,7 @@ module Fog
 
         def usage(start_date, end_date)
           requires :id
-          connection.get_usage(self.id, start_date, end_date).body['tenant_usage']
+          service.get_usage(self.id, start_date, end_date).body['tenant_usage']
         end
       end # class Tenant
     end # class OpenStack

data/lib/fog/openstack/models/compute/tenants.rb

@@ -8,12 +8,16 @@ module Fog
         model Fog::Compute::OpenStack::Tenant
 
         def all
-          load(connection.list_tenants.body['tenants'])
+          load(service.list_tenants.body['tenants'])
         end
 
         def usages(start_date = nil, end_date = nil, details = false)
-          connection.list_usages(start_date, end_date, details).body['tenant_usages']
-        end 
+          service.list_usages(start_date, end_date, details).body['tenant_usages']
+        end
+
+        def find_by_id(id)
+          self.find {|tenant| tenant.id == id}
+        end
       end # class Tenants
     end # class OpenStack
   end # module Compute

data/lib/fog/openstack/models/compute/volume.rb

@@ -21,33 +21,34 @@ module Fog
 
 
         def initialize(attributes)
-          @connection = attributes[:connection]
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
           super
         end
 
         def save
           requires :name, :description, :size
-          data = connection.create_volume(name, description, size, attributes)
+          data = service.create_volume(name, description, size, attributes)
           merge_attributes(data.body['volume'])
           true
         end
 
         def destroy
           requires :id
-          connection.delete_volume(id)
+          service.delete_volume(id)
           true
         end
 
         def attach(server_id, name)
           requires :id
-          data = connection.attach_volume(id, server_id, name)
+          data = service.attach_volume(id, server_id, name)
           merge_attributes(:attachments => attachments << data.body['volumeAttachment'])
           true
         end
 
         def detach(server_id, attachment_id)
           requires :id
-          connection.detach_volume(server_id, attachment_id)
+          service.detach_volume(server_id, attachment_id)
           true
         end
       end

data/lib/fog/openstack/models/compute/volumes.rb

@@ -9,11 +9,11 @@ module Fog
         model Fog::Compute::OpenStack::Volume
 
         def all(detailed=true)
-          load(connection.list_volumes(detailed).body['volumes'])
+          load(service.list_volumes(detailed).body['volumes'])
         end
 
         def get(volume_id)
-          if volume = connection.get_volume_details(volume_id).body['volume']
+          if volume = service.get_volume_details(volume_id).body['volume']
             new(volume)
           end
         rescue Fog::Compute::OpenStack::NotFound

data/lib/fog/openstack/models/identity/ec2_credential.rb

@@ -0,0 +1,44 @@
+require 'fog/core/model'
+
+module Fog
+  module Identity
+    class OpenStack
+      class Ec2Credential < Fog::Model
+        identity :access, :aliases => 'access_key'
+
+        attribute :secret, :aliases => 'secret_key'
+        attribute :tenant_id
+        attribute :user_id
+
+        def initialize(attributes)
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
+          super
+        end
+
+        def destroy
+          requires :access
+          requires :user_id
+          service.delete_ec2_credential user_id, access
+          true
+        end
+
+        def save
+          raise Fog::Errors::Error, 'Existing credentials cannot be altered' if
+            access
+
+          self.user_id   ||= user.id
+          self.tenant_id ||= user.tenant_id
+
+          requires :user_id, :tenant_id
+
+          data = service.create_ec2_credential user_id, tenant_id
+
+          merge_attributes(data.body['credential'])
+
+          true
+        end
+      end
+    end
+  end
+end