fog 1.6.0 → 1.7.0

data/lib/fog/openstack.rb

@@ -43,6 +43,7 @@ module Fog
 
     service(:compute , 'openstack/compute' , 'Compute' )
     service(:identity, 'openstack/identity', 'Identity')
+    service(:network, 'openstack/network', 'Network')
 
     # legacy v1.0 style auth
     def self.authenticate_v1(options, connection_options = {})
@@ -94,7 +95,7 @@ module Fog
         req_body = {
           'auth' => {
             'passwordCredentials'  => {
-              'username' => @openstack_username,
+              'username' => @openstack_username.to_s,
               'password' => @openstack_api_key.to_s
             }
           }
@@ -148,11 +149,13 @@ module Fog
       mgmt_url = svc['endpoints'].detect{|x| x[@endpoint_type]}[@endpoint_type]
       identity_url = identity_svc['endpoints'].detect{|x| x['publicURL']}['publicURL'] if identity_svc
       token = body['access']['token']['id']
+      expires = body['access']['token']['expires']
 
       {
         :user                     => user,
         :tenant                   => tenant,
         :token                    => token,
+        :expires                  => expires,
         :server_management_url    => mgmt_url,
         :identity_public_endpoint => identity_url,
         :current_user_id          => body['access']['user']['id']

data/lib/fog/openstack/compute.rb

@@ -152,9 +152,13 @@ module Fog
       # Hosts
       request :list_hosts
       request :get_host_details
-      
+
 
       class Mock
+        attr_reader :auth_token
+        attr_reader :auth_token_expiration
+        attr_reader :current_user
+        attr_reader :current_tenant
 
         def self.data
           @data ||= Hash.new do |hash, key|
@@ -205,6 +209,19 @@ module Fog
         def initialize(options={})
           @openstack_username = options[:openstack_username]
           @openstack_tenant   = options[:openstack_tenant]
+          @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
+
+          @auth_token = Fog::Mock.random_base64(64)
+          @auth_token_expiration = (Time.now.utc + 86400).iso8601
+
+          management_url = URI.parse(options[:openstack_auth_url])
+          management_url.port = 8774
+          management_url.path = '/v1.1/1'
+          @openstack_management_url = management_url.to_s
+
+          identity_public_endpoint = URI.parse(options[:openstack_auth_url])
+          identity_public_endpoint.port = 5000
+          @openstack_identity_public_endpoint = identity_public_endpoint.to_s
         end
 
         def data
@@ -226,6 +243,7 @@ module Fog
 
       class Real
         attr_reader :auth_token
+        attr_reader :auth_token_expiration
         attr_reader :current_user
         attr_reader :current_tenant
 
@@ -338,6 +356,7 @@ module Fog
 
             @openstack_must_reauthenticate = false
             @auth_token               = credentials[:token]
+            @auth_token_expiration    = credentials[:expires]
             @openstack_management_url = credentials[:server_management_url]
             @openstack_identity_public_endpoint  = credentials[:identity_public_endpoint]
             uri = URI.parse(@openstack_management_url)

data/lib/fog/openstack/identity.rb

@@ -53,32 +53,79 @@ module Fog
 
 
       class Mock
+        attr_reader :auth_token
+        attr_reader :auth_token_expiration
+        attr_reader :current_user
+        attr_reader :current_tenant
+
         def self.data
+          @users   ||= {}
+          @roles   ||= {}
+          @tenants ||= {}
+
           @data ||= Hash.new do |hash, key|
             hash[key] = {
-              :users => {},
-              :roles => {},
-              :tenants => {}
+              :users   => @users,
+              :roles   => @roles,
+              :tenants => @tenants
             }
           end
         end
 
-        def self.reset
-          @data = nil
+        def self.reset!
+          @data  = nil
+          @users = nil
+          @roles = nil
+          @tenants = nil
         end
 
         def initialize(options={})
-          @openstack_username = options[:openstack_username]
-
-          unless self.data[:users].values.detect {|user| user['name'] == @openstack_username}
-            id = Fog::Mock.random_numbers(6).to_s
-            self.data[:users][id] = {
-              'id'       => id,
-              'name'     => options[:openstack_username],
-              'email'    => "#{options[:openstack_username]}@mock.com",
+          require 'multi_json'
+          @openstack_username = options[:openstack_username] || 'admin'
+          @openstack_tenant   = options[:openstack_tenant]   || 'admin'
+          @openstack_auth_uri   = URI.parse(options[:openstack_auth_url])
+          @openstack_management_url = @openstack_auth_uri.to_s
+
+          @auth_token = Fog::Mock.random_base64(64)
+          @auth_token_expiration = (Time.now.utc + 86400).iso8601
+
+          @admin_tenant = self.data[:tenants].values.find do |u|
+            u['name'] == 'admin'
+          end
+
+          if @openstack_tenant
+            @current_tenant = self.data[:tenants].values.find do |u|
+              u['name'] == @openstack_tenant
+            end
+
+            unless @current_tenant
+              @current_tenant_id = Fog::Mock.random_hex(32)
+              @current_tenant = self.data[:tenants][@current_tenant_id] = {
+                'id'   => @current_tenant_id,
+                'name' => @openstack_tenant
+              }
+            else
+              @current_tenant_id = @current_tenant['id']
+            end
+          else
+            @current_tenant = @admin_tenant
+          end
+
+          @current_user = self.data[:users].values.find do |u|
+            u['name'] == @openstack_username
+          end
+
+          unless @current_user
+            @current_user_id = Fog::Mock.random_hex(32)
+            @current_user = self.data[:users][@current_user_id] = {
+              'id'       => @current_user_id,
+              'name'     => @openstack_username,
+              'email'    => "#{@openstack_username}@mock.com",
               'tenantId' => Fog::Mock.random_numbers(6).to_s,
               'enabled'  => true
             }
+          else
+            @current_user_id = @current_user['id']
           end
         end
 
@@ -91,11 +138,13 @@ module Fog
         end
 
         def credentials
-          { :provider                 => 'openstack',
-            :openstack_auth_url       => @openstack_auth_uri.to_s,
-            :openstack_auth_token     => @auth_token,
-            :openstack_management_url => @openstack_management_url,
-            :openstack_current_user_id => @openstack_current_user_id}
+          { :provider                  => 'openstack',
+            :openstack_auth_url        => @openstack_auth_uri.to_s,
+            :openstack_auth_token      => @auth_token,
+            :openstack_management_url  => @openstack_management_url,
+            :openstack_current_user_id => @openstack_current_user_id,
+            :current_user              => @current_user,
+            :current_tenant            => @current_tenant}
         end
       end
 

data/lib/fog/openstack/image.rb

@@ -3,7 +3,6 @@ require 'fog/openstack'
 module Fog
   module Image
     class OpenStack < Fog::Service
-
       requires :openstack_auth_url
       recognizes :openstack_auth_token, :openstack_management_url, :persistent,
                  :openstack_service_name, :openstack_tenant,
@@ -15,7 +14,6 @@ module Fog
       model       :image
       collection  :images
 
-
       request_path 'fog/openstack/requests/image'
 
       request :list_public_images
@@ -24,6 +22,7 @@ module Fog
       request :create_image
       request :update_image
       request :get_image_members
+      request :update_image_members
       request :get_shared_images
       request :add_member_to_image
       request :remove_member_from_image
@@ -35,8 +34,7 @@ module Fog
         def self.data
           @data ||= Hash.new do |hash, key|
             hash[key] = {
-              :users => {},
-              :tenants => {}
+              :images => {}
             }
           end
         end
@@ -48,6 +46,16 @@ module Fog
         def initialize(options={})
           require 'multi_json'
           @openstack_username = options[:openstack_username]
+          @openstack_tenant   = options[:openstack_tenant]
+          @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
+
+          @auth_token = Fog::Mock.random_base64(64)
+          @auth_token_expiration = (Time.now.utc + 86400).iso8601
+
+          management_url = URI.parse(options[:openstack_auth_url])
+          management_url.port = 9292
+          management_url.path = '/v1'
+          @openstack_management_url = management_url.to_s
 
           @data ||= { :users => {} }
           unless @data[:users].find {|u| u['name'] == options[:openstack_username]}

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

@@ -17,7 +17,7 @@ module Fog
         def save
           requires :name, :description
           data = connection.create_security_group(name, description)
-          merge_attributes(data.body['security_group'])
+          merge_attributes(data.body['security_groups'])
           true
         end
 

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

@@ -24,6 +24,8 @@ module Fog
         attribute :availability_zone
         attribute :user_data_encoded
         attribute :state,       :aliases => 'status'
+        attribute :created,     :type => :time
+        attribute :updated,     :type => :time
 
         attribute :tenant_id
         attribute :user_id
@@ -38,7 +40,7 @@ module Fog
         attribute :os_ext_sts_vm_state, :aliases => 'OS-EXT-STS:vm_state'
 
         attr_reader :password
-        attr_writer :private_key, :private_key_path, :public_key, :public_key_path, :username, :image_ref, :flavor_ref
+        attr_writer :image_ref, :flavor_ref, :os_scheduler_hints
 
 
         def initialize(attributes={})
@@ -48,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.os_scheduler_hints = attributes.delete(:os_scheduler_hints)
 
           super
         end
@@ -92,15 +95,6 @@ module Fog
           end
         end
 
-        def private_key_path
-          @private_key_path ||= Fog.credentials[:private_key_path]
-          @private_key_path &&= File.expand_path(@private_key_path)
-        end
-
-        def private_key
-          @private_key ||= private_key_path && File.read(private_key_path)
-        end
-
         def public_ip_address
           if addresses['public']
             #assume last is either original or assigned from floating IPs
@@ -111,15 +105,6 @@ module Fog
           end
         end
 
-        def public_key_path
-          @public_key_path ||= Fog.credentials[:public_key_path]
-          @public_key_path &&= File.expand_path(@public_key_path)
-        end
-
-        def public_key
-          @public_key ||= public_key_path && File.read(public_key_path)
-        end
-
         def image_ref
           @image_ref
         end
@@ -239,6 +224,7 @@ module Fog
             'security_groups' => @security_groups,
             'min_count'   => @min_count,
             'max_count'   => @max_count,
+            'os:scheduler_hints' => @os_scheduler_hints
           }
           options = options.reject {|key, value| value.nil?}
           data = connection.create_server(name, image_ref, flavor_ref, options)
@@ -260,10 +246,6 @@ module Fog
           retry
         end
 
-        def username
-          @username ||= 'root'
-        end
-
         private
 
         def adminPass=(new_admin_pass)

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

@@ -12,9 +12,11 @@ module Fog
         end
 
         def find_by_id(id)
-          self.find {|tenant| tenant.id == id} ||
-            Fog::Identity::OpenStack::Tenant.new(
-              connection.get_tenant(id).body['tenant'])
+          cached_tenant = self.find {|tenant| tenant.id == id}
+          return cached_tenant if cached_tenant
+          tenant_hash = connection.get_tenant(id).body['tenant']
+          Fog::Identity::OpenStack::Tenant.new(
+            tenant_hash.merge(:connection => connection))
         end
 
         def destroy(id)

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

@@ -17,7 +17,10 @@ module Fog
         def find_by_id(id)
           self.find {|user| user.id == id} ||
             Fog::Identity::OpenStack::User.new(
-              connection.get_user_by_id(id).body['user'])
+              connection.get_user_by_id(id).body['user'].merge(
+                'connection' => connection
+              )
+            )
         end
 
         def destroy(id)

data/lib/fog/openstack/models/image/image.rb

@@ -44,7 +44,7 @@ module Fog
         def create
           requires :name
           merge_attributes(connection.create_image(self.attributes).body['image'])
-            self
+          self
         end
 
         def update
@@ -69,6 +69,11 @@ module Fog
           connection.remove_member_from_image(self.id, member_id)
         end
 
+        def update_members(members)
+          requires :id
+          connection.update_image_members(self.id, members)
+        end
+
         def members
           requires :id
           connection.get_image_members(self.id).body['members']

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

@@ -0,0 +1,46 @@
+require 'fog/core/model'
+
+module Fog
+  module Network
+    class OpenStack
+      class Network < Fog::Model
+        identity :id
+
+        attribute :name
+        attribute :subnets
+        attribute :shared
+        attribute :status
+        attribute :admin_state_up
+        attribute :tenant_id
+
+        def initialize(attributes)
+          @connection = attributes[:connection]
+          super
+        end
+
+        def save
+          identity ? update : create
+        end
+
+        def create
+          merge_attributes(connection.create_network(self.attributes).body['network'])
+          self
+        end
+
+        def update
+          requires :id
+          merge_attributes(connection.update_network(self.id,
+                                                     self.attributes).body['network'])
+          self
+        end
+
+        def destroy
+          requires :id
+          connection.delete_network(self.id)
+          true
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+require 'fog/core/collection'
+require 'fog/openstack/models/network/network'
+
+module Fog
+  module Network
+    class OpenStack
+      class Networks < Fog::Collection
+
+        attribute :filters
+
+        model Fog::Network::OpenStack::Network
+
+        def initialize(attributes)
+          self.filters ||= {}
+          super
+        end
+
+        def all(filters = filters)
+          self.filters = filters
+          load(connection.list_networks(filters).body['networks'])
+        end
+
+        def get(network_id)
+          if network = connection.get_network(network_id).body['network']
+            new(network)
+          end
+        rescue Fog::Network::OpenStack::NotFound
+          nil
+        end
+
+      end
+    end
+  end
+end