fog 1.10.0 → 1.10.1

data/lib/fog/openstack/examples/image/upload-test-image.rb

@@ -0,0 +1,77 @@
+require 'securerandom'
+require 'rubygems/package'
+require 'zlib'
+require 'fog'
+
+#
+# Download CirrOS 0.3.0 image from launchpad (~6.5MB) to /tmp
+# and upload it to Glance (the OpenStack Image Service).
+#
+# You will need to source OpenStack credentials since the script
+# reads the following envionment variables:
+#
+#  OS_PASSWORD
+#  OS_USERNAME
+#  OS_AUTH_URL
+#  OS_TENANT_NAME
+#
+# Should work with Fog >= 1.9, ruby 1.8.7 and 2.0
+#
+image_url = "https://launchpadlibrarian.net/83305869/cirros-0.3.0-x86_64-uec.tar.gz"
+image_out = File.open("/tmp/cirros-image-#{SecureRandom.hex}", 'wb')
+extract_path = "/tmp/cirros-#{SecureRandom.hex}-dir"
+ami = "#{extract_path}/cirros-0.3.0-x86_64-blank.img"
+aki = "#{extract_path}/cirros-0.3.0-x86_64-vmlinuz"
+ari = "#{extract_path}/cirros-0.3.0-x86_64-initrd"
+
+FileUtils.mkdir_p extract_path
+
+# Efficient image write
+puts "Downloading Cirros image..."
+streamer = lambda do |chunk, remaining_bytes, total_bytes|
+  image_out.write chunk
+end
+Excon.get image_url, :response_block => streamer
+image_out.close
+puts "Image downloaded to #{image_out.path}"
+
+puts "Extracting image contents to #{extract_path}..."
+Gem::Package::TarReader.new(Zlib::GzipReader.open(image_out.path)).each do |entry|
+  FileUtils.mkdir_p "#{extract_path}/#{File.dirname(entry.full_name)}"
+  File.open "#{extract_path}/#{entry.full_name}", 'w' do |f|
+    f.write entry.read
+  end
+end
+
+image_service = Fog::Image.new({
+  :provider => 'OpenStack',
+  :openstack_api_key => ENV['OS_PASSWORD'],
+  :openstack_username => ENV["OS_USERNAME"],
+  :openstack_auth_url => ENV["OS_AUTH_URL"] + "/tokens",
+  :openstack_tenant => ENV["OS_TENANT_NAME"]
+})
+
+puts "Uploading AKI..."
+aki = image_service.images.create :name => 'cirros-0.3.0-amd64-aki',
+                                  :size => File.size(aki),
+                                  :disk_format => 'aki',
+                                  :container_format => 'aki',
+                                  :location => aki
+
+puts "Uploading ARI..."
+ari = image_service.images.create :name => 'cirros-0.3.0-amd64-ari',
+                                  :size => File.size(ari),
+                                  :disk_format => 'ari',
+                                  :container_format => 'ari',
+                                  :location => ari
+
+puts "Uploading AMI..."
+image_service.images.create :name => 'cirros-0.3.0-amd64',
+                            :size => File.size(ami),
+                            :disk_format => 'ami',
+                            :container_format => 'ami',
+                            :location => ami,
+                            :properties => {
+                              'kernel_id'  => aki.id,
+                              'ramdisk_id' => ari.id
+                            }

data/lib/fog/openstack/examples/network/network_subnets_routers.rb

@@ -0,0 +1,63 @@
+require 'fog/openstack'
+
+#
+# Quantum demo
+#
+# Create some routers, networks and subnets for
+# a couple of tenants.
+#
+# Needs Fog >= 1.11.0
+# Needs OpenStack credentials in ~/.fog
+#
+
+def create_tenant_network( tenant_name,
+                           external_net,
+                           router_name = 'router1',
+                           subnet_range = '10.0.0.0/21',
+                           subnet_gateway = '10.0.0.1',
+                           private_network_name = 'private' )
+
+  network = Fog::Network[:openstack]
+  id = Fog::Identity[:openstack]
+  
+  tenant = id.tenants.find { |t| t.name == tenant_name }
+
+  # Create a router for the tenant
+  router = network.routers.create :name => router_name,
+                                  :tenant_id => tenant.id,
+                                  :external_gateway_info => { 
+                                    'network_id' => external_net.id
+                                  }
+
+  # Create a private network for the tenant
+  net = network.networks.create :name => private_network_name,
+                                :tenant_id => tenant.id
+
+  # Create a subnet for the previous network and associate it
+  # with the tenant
+  subnet = network.subnets.create :name => 'net_10',
+                                  :network_id  => net.id,
+                                  :ip_version  => 4,
+                                  :gateway_ip  => subnet_gateway,
+                                  :cidr        => subnet_range,
+                                  :tenant_id => tenant.id,
+                                  :enable_dhcp => true
+
+  network.add_router_interface router.id, subnet.id
+end
+
+# Create a public shared network
+public_net = network.networks.create :name => 'nova',
+                                     :router_external => true
+
+# Create the public subnet
+public_subnet = network.subnets.create :name => 'floating_ips_net',
+                                       :network_id  => public_net.id,
+                                       :ip_version  => 4,
+                                       :cidr        => '1.2.3.0/24',
+                                       :enable_dhcp => false
+
+
+# Create tenant networks
+create_tenant_network, 'admin@example.net', public_net
+create_tenant_network, 'demo@example.net', public_net

data/lib/fog/openstack/examples/storage/set-account-quota.rb

@@ -0,0 +1,66 @@
+require 'fog'
+require 'pp'
+
+#
+# This example sets the account quota (in bytes) for the tenant demo@test.lan
+# using an admin account (admin has the reseller user role).
+#
+# Uses the account impersonation feature recently added to the
+# OpenStack Storage service in Fog (See https://github.com/fog/fog/pull/1632).
+# 
+# Should be available in Fog 1.10.0+1.
+#
+# Setting account quotas is only supported in Swift 1.8.0+ 
+# using the brand new account_quota middleware introduced in 
+# OpenStack Grizzly (currently unreleased as of 2013/04/03).
+#
+# https://github.com/openstack/swift/blob/master/swift/common/middleware/account_quotas.py
+#
+
+auth_url = 'https://identity.test.lan/v2.0/tokens'
+user = 'admin@test.lan'
+password = 'secret'
+
+Excon.defaults[:ssl_verify_peer] = false
+
+# 
+# We are going to use the Identity (Keystone) service
+# to retrieve the list of tenants available and find
+# the tenant we want to set the quotas for.
+#
+id = Fog::Identity.new :provider => 'OpenStack',
+                       :openstack_auth_url => auth_url,
+                       :openstack_username => user,
+                       :openstack_api_key  => password
+
+#
+# Storage service (Swift)
+#
+st = Fog::Storage.new :provider => 'OpenStack',
+                      :openstack_auth_url => auth_url,
+                      :openstack_username => user,
+                      :openstack_api_key  => password
+
+id.tenants.each do |t|
+  # We want to set the account quota for tenant demo@test.lan
+  next unless t.name == 'demo@test.lan'
+
+  # We've found the tenant, impersonate the account
+  # (the account prefix AUTH_ may be different for you, double check it).
+  puts "Changing account to #{t.name}"
+  st.change_account "AUTH_#{t.id}"
+
+  # Now we're adding the required header to the demo@test.lan 
+  # tenant account, limiting the account bytes to 1048576 (1MB)
+  #
+  # Uploading more than 1MB will return 413: Request Entity Too Large
+  st.request :method => 'POST',
+             :headers => { 'X-Account-Meta-Quota-Bytes' => '1048576' }
+
+  # We can list the account details to verify the new 
+  # header has been added
+  pp st.request :method => 'HEAD'
+end
+
+# Restore the account we were using initially (admin@test.lan)
+st.reset_account_name

data/lib/fog/openstack/image.rb

@@ -206,6 +206,10 @@ module Fog
           @host   = uri.host
           @path   = uri.path
           @path.sub!(/\/$/, '')
+          unless @path.match(/v1(\.1)*/)
+            raise Fog::OpenStack::Errors::ServiceUnavailable.new(
+                  "OpenStack binding only supports version 1.1 (a.k.a. 1)")
+          end
           @port   = uri.port
           @scheme = uri.scheme
           true

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

@@ -40,7 +40,7 @@ module Fog
         attribute :os_ext_sts_vm_state, :aliases => 'OS-EXT-STS:vm_state'
 
         attr_reader :password
-        attr_writer :image_ref, :flavor_ref, :os_scheduler_hints
+        attr_writer :image_ref, :flavor_ref, :nics, :os_scheduler_hints
 
 
         def initialize(attributes={})
@@ -50,6 +50,7 @@ module Fog
           self.security_groups = attributes.delete(:security_groups)
           self.min_count = attributes.delete(:min_count)
           self.max_count = attributes.delete(:max_count)
+          self.nics = attributes.delete(:nics)
           self.os_scheduler_hints = attributes.delete(:os_scheduler_hints)
 
           super
@@ -256,7 +257,8 @@ module Fog
             'security_groups' => @security_groups,
             'min_count'   => @min_count,
             'max_count'   => @max_count,
-            'os:scheduler_hints' => @os_scheduler_hints
+            'nics' => @nics,
+            'os:scheduler_hints' => @os_scheduler_hints,
           }
           options['metadata'] = metadata.to_hash unless @metadata.nil?
           options = options.reject {|key, value| value.nil?}

data/lib/fog/openstack/models/network/floating_ip.rb

@@ -29,7 +29,7 @@ module Fog
 
         def create
           requires :floating_network_id
-          merge_attributes(connection.create_floating_ip(self.floating_network_id,
+          merge_attributes(service.create_floating_ip(self.floating_network_id,
 
 
                                                     self.attributes).body['floatingip'])
@@ -42,7 +42,7 @@ module Fog
 
         def destroy
           requires :id
-          connection.delete_floating_ip(self.id)
+          service.delete_floating_ip(self.id)
           true
         end
 

data/lib/fog/openstack/models/network/floating_ips.rb

@@ -17,7 +17,7 @@ module Fog
 
         def all(filters = filters)
           self.filters = filters
-          load(connection.list_floating_ips(filters).body['floatingips'])
+          load(service.list_floating_ips(filters).body['floatingips'])
         end
 
         def get(floating_network_id)

data/lib/fog/openstack/models/network/router.rb

@@ -0,0 +1,56 @@
+require 'fog/core/model'
+
+module Fog
+  module Network
+    class OpenStack
+      # The Layer-3 Networking Extensions (router)
+      #
+      # A logical entity for forwarding packets across internal 
+      # subnets and NATting them on external networks through 
+      # an appropriate external gateway.
+      #
+      # @see http://docs.openstack.org/api/openstack-network/2.0/content/router_ext.html
+      class Router < Fog::Model
+        identity :id
+
+        attribute :name
+        attribute :admin_state_up
+        attribute :tenant_id
+        attribute :external_gateway_info
+        attribute :status
+
+        def initialize(attributes)
+          # Old 'connection' is renamed as service and should be used instead
+          prepare_service_value(attributes)
+          super
+        end
+
+        def save
+          requires :name
+          identity ? update : create
+        end
+
+        def create
+          requires :name
+          merge_attributes(service.create_router(self.name,
+                                                  self.attributes).body['router'])
+          self
+        end
+
+        def update
+          requires :id
+          merge_attributes(service.update_router(self.id,
+                                                  self.attributes).body['router'])
+          self
+        end
+
+        def destroy
+          requires :id
+          service.delete_router(self.id)
+          true
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/network/routers.rb

@@ -0,0 +1,34 @@
+require 'fog/core/collection'
+require 'fog/openstack/models/network/router'
+
+module Fog
+  module Network
+    class OpenStack
+      class Routers < Fog::Collection
+
+        attribute :filters
+
+        model Fog::Network::OpenStack::Router
+
+        def initialize(attributes)
+          self.filters ||= {}
+          super
+        end
+
+        def all(filters = filters)
+          self.filters = filters
+          load(service.list_routers(filters).body['routers'])
+        end
+
+        def get(router_id)
+          if router = service.get_router(router_id).body['router']
+            new(router)
+          end
+        rescue Fog::Network::OpenStack::NotFound
+          nil
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/openstack/network.rb

@@ -7,7 +7,7 @@ module Fog
       requires :openstack_auth_url
       recognizes :openstack_auth_token, :openstack_management_url, :persistent,
                  :openstack_service_type, :openstack_service_name, :openstack_tenant,
-                 :openstack_api_key, :openstack_username,
+                 :openstack_api_key, :openstack_username, :openstack_endpoint_type,
                  :current_user, :current_tenant
 
       ## MODELS
@@ -21,6 +21,8 @@ module Fog
       collection  :subnets
       model       :floating_ip
       collection  :floating_ips
+      model       :router
+      collection  :routers
 
       ## REQUESTS
       #
@@ -55,6 +57,15 @@ module Fog
       request :associate_floating_ip
       request :disassociate_floating_ip
 
+      # Router CRUD
+      request :list_routers
+      request :create_router
+      request :delete_router
+      request :get_router
+      request :update_router
+      request :add_router_interface
+      request :remove_router_interface
+
       # Tenant
       request :set_tenant
 
@@ -66,6 +77,7 @@ module Fog
               :ports => {},
               :subnets => {},
               :floating_ips => {},
+              :routers => {},
             }
           end
         end
@@ -120,6 +132,7 @@ module Fog
           @openstack_must_reauthenticate  = false
           @openstack_service_type         = options[:openstack_service_type] || ['network']
           @openstack_service_name         = options[:openstack_service_name]
+          @openstack_endpoint_type        = options[:openstack_endpoint_type] || 'adminURL'
 
           @connection_options = options[:connection_options] || {}
 
@@ -192,7 +205,7 @@ module Fog
               :openstack_auth_token => @openstack_auth_token,
               :openstack_service_type => @openstack_service_type,
               :openstack_service_name => @openstack_service_name,
-              :openstack_endpoint_type => 'adminURL'
+              :openstack_endpoint_type => @openstack_endpoint_type
             }
 
             credentials = Fog::OpenStack.authenticate_v2(options, @connection_options)

data/lib/fog/openstack/requests/compute/create_server.rb

@@ -41,6 +41,17 @@ module Fog
             end
           end
 
+          if options['nics']
+            data['server']['networks'] =
+            Array(options['nics']).map do |nic|
+              {
+                'uuid' => nic['net_id'],
+                'fixed_ip' => nic['v4_fixed_ip'],
+                'port' => nic['port_id']
+              }
+            end
+          end
+
           if options['os:scheduler_hints']
             data['os:scheduler_hints'] = options['os:scheduler_hints']
           end

data/lib/fog/openstack/requests/compute/rebuild_server.rb

@@ -11,7 +11,15 @@ module Fog
           }}
           body['rebuild']['adminPass'] = admin_pass if admin_pass
           body['rebuild']['metadata'] = metadata if metadata
-          body['rebuild']['personality'] = personality if personality
+          if personality
+            body['rebuild']['personality'] = []
+            for file in personality
+              body['rebuild']['personality'] << {
+                'contents'  => Base64.encode64(file['contents']),
+                'path'      => file['path']
+              }
+            end
+          end
           server_action(server_id, body, 202)
         end