fog-openstack 0.3.10 → 1.0.0

data/examples/introspection/basics.rb

@@ -15,10 +15,10 @@ project  = 'admin'
   :openstack_domain_id    => "default"
 }
 
-inspector = Fog::Introspection::OpenStack.new(@connection_params)
+inspector = Fog::OpenStack::Introspection.new(@connection_params)
 
 # Introspection of an Ironic node
-ironic = Fog::Baremetal::OpenStack.new(@connection_params)
+ironic = Fog::OpenStack::Baremetal.new(@connection_params)
 nodes = ironic.list_nodes
 node1_uuid = nodes.body["nodes"][0]["uuid"]
 

data/examples/metric/basics.rb

@@ -16,7 +16,7 @@ project  = 'admin'
 
 puts "### SERVICE CONNECTION ###"
 
-metric = Fog::Metric::OpenStack.new(@connection_params)
+metric = Fog::OpenStack::Metric.new(@connection_params)
 
 p metric
 

data/examples/network/network_rbac.rb

@@ -29,8 +29,8 @@ auth_options = {
   :connection_options     => {:ssl_verify_peer => ENV['SSL_VERIFY'] != 'false'}
 }
 
-identity_service = Fog::Identity::OpenStack::V3.new(auth_options)
-network_service  = Fog::Network::OpenStack.new(auth_options)
+identity_service = Fog::OpenStack::Identity::V3.new(auth_options)
+network_service  = Fog::OpenStack::Network.new(auth_options)
 
 own_project   = identity_service.projects.select { |p| p.name == ENV['OS_PROJECT_NAME'] }.first
 other_project = identity_service.projects.select { |p| p.name != ENV['OS_PROJECT_NAME'] }.first

data/examples/network/network_subnets_routers.rb

@@ -17,7 +17,7 @@ def create_tenant_network( tenant_name,
                            subnet_gateway = '10.0.0.1',
                            private_network_name = 'private' )
 
-  network = Fog::Network[:openstack]
+  network = Fog::OpenStack::Network.new
   id = Fog::Identity[:openstack]
 
   tenant = id.tenants.find { |t| t.name == tenant_name }

data/examples/shared_file_system/basics.rb

@@ -29,8 +29,8 @@ auth_options = {
   :connection_options     => {:ssl_verify_peer => ENV['SSL_VERIFY'] != 'false'}
 }
 
-network_service = Fog::Network::OpenStack.new(auth_options)
-share_service   = Fog::SharedFileSystem::OpenStack.new(auth_options)
+network_service = Fog::OpenStack::Network.new(auth_options)
+share_service   = Fog::OpenStack::SharedFileSystem.new(auth_options)
 
 net = network_service.networks.first
 raise 'no network exists' if net.nil?

data/examples/storage/set-account-quota.rb

@@ -28,14 +28,14 @@ Excon.defaults[:ssl_verify_peer] = false
 # to retrieve the list of tenants available and find
 # the tenant we want to set the quotas for.
 #
-id = Fog::Identity::OpenStack.new :openstack_auth_url => auth_url,
+id = Fog::OpenStack::Identity.new :openstack_auth_url => auth_url,
                                   :openstack_username => user,
                                   :openstack_api_key  => password
 
 #
 # Storage service (Swift)
 #
-st = Fog::Storage::OpenStack.new :openstack_auth_url => auth_url,
+st = Fog::OpenStack::Storage.new :openstack_auth_url => auth_url,
                                  :openstack_username => user,
                                  :openstack_api_key  => password
 

data/examples/volume/backups.rb

@@ -1,5 +1,5 @@
 require 'fog/openstack'
-require 'fog/workflow/openstack/v2'
+require 'fog/openstack/workflow/v2'
 
 auth_url = "http://192.0.2.1:5000/v3/auth/tokens"
 username = "admin"
@@ -14,7 +14,7 @@ project  = "admin"
   :openstack_domain_id    => "default",
 }
 
-cinder = Fog::Volume::OpenStack.new(@connection_params)
+cinder = Fog::OpenStack::Volume.new(@connection_params)
 
 puts "INFO: create backup of existing volume named test"
 

data/examples/workflow/workflow-examples.rb

@@ -1,5 +1,5 @@
 require 'fog/openstack'
-require 'fog/workflow/openstack/v2'
+require 'fog/openstack/workflow/v2'
 
 auth_url = "http://192.0.2.1:5000/v3/auth/tokens"
 username = "admin"
@@ -14,7 +14,7 @@ project  = "admin"
   :openstack_domain_id    => "default",
 }
 
-mistral = Fog::Workflow::OpenStack.new(@connection_params)
+mistral = Fog::OpenStack::Workflow.new(@connection_params)
 
 puts "INFO: create_execution"
 

data/fog-openstack.gemspec

@@ -21,11 +21,11 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.2.0'
 
-  spec.add_dependency 'fog-core',  '>= 1.45', '<=2.1.0'
+  spec.add_dependency 'fog-core',  '~> 2.1'
   spec.add_dependency 'fog-json',  '>= 1.0'
   spec.add_dependency 'ipaddress', '>= 0.8'
 
-  spec.add_development_dependency 'bundler', '~> 1'
+  spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency "mime-types"
   spec.add_development_dependency "mime-types-data"

data/lib/fog/openstack.rb

@@ -2,120 +2,6 @@ require 'fog/core'
 require 'fog/json'
 
 module Fog
-  # Monkey patch to reflect https://github.com/fog/fog-core/commit/06b7ab4
-  # needed because fog-core 2.1.1+ implies entire namespace change
-  # is only availabe from fog-openstack 1.0.0+
-  module Attributes
-    module InstanceMethods
-      def all_attributes
-        self.class.attributes.reduce({}) do |hash, attribute|
-          if masks[attribute].nil?
-            Fog::Logger.deprecation("Please define #{attribute} using the Fog DSL")
-            hash[attribute] = send(attribute)
-          else
-            hash[masks[attribute]] = send(attribute)
-          end
-
-          hash
-        end
-      end
-
-      def all_associations
-        self.class.associations.keys.reduce({}) do |hash, association|
-          if masks[association].nil?
-            Fog::Logger.deprecation("Please define #{association} using the Fog DSL")
-            hash[association] = associations[association] || send(association)
-          else
-            hash[masks[association]] = associations[association] || send(association)
-          end
-
-          hash
-        end
-      end
-    end
-  end
-
-  module Baremetal
-    autoload :OpenStack, 'fog/baremetal/openstack'
-  end
-
-  module Compute
-    autoload :OpenStack, 'fog/compute/openstack'
-  end
-
-  module ContainerInfra
-    autoload :OpenStack, 'fog/container_infra/openstack'
-  end
-
-  module DNS
-    autoload :OpenStack, 'fog/dns/openstack'
-  end
-
-  module Event
-    autoload :OpenStack, 'fog/event/openstack'
-  end
-
-  module Identity
-    autoload :OpenStack, 'fog/identity/openstack'
-  end
-
-  module Image
-    autoload :OpenStack, 'fog/image/openstack'
-  end
-
-  module Introspection
-    autoload :OpenStack, 'fog/introspection/openstack'
-  end
-
-  module KeyManager
-    autoload :OpenStack, 'fog/key_manager/openstack'
-  end
-
-  module Metering
-    autoload :OpenStack, 'fog/metering/openstack'
-  end
-
-  module Metric
-    autoload :OpenStack, 'fog/metric/openstack'
-  end
-
-  module Monitoring
-    autoload :OpenStack, 'fog/monitoring/openstack'
-  end
-
-  module Network
-    autoload :OpenStack, 'fog/network/openstack'
-  end
-
-  module NFV
-    autoload :OpenStack, 'fog/nfv/openstack'
-  end
-
-  module Orchestration
-    autoload :OpenStack, 'fog/orchestration/openstack'
-    autoload :Util, 'fog/orchestration/util/recursive_hot_file_loader'
-  end
-
-  module SharedFileSystem
-    autoload :OpenStack, 'fog/shared_file_system/openstack'
-  end
-
-  module Storage
-    autoload :OpenStack, 'fog/storage/openstack'
-  end
-
-  module Volume
-    autoload :OpenStack, 'fog/volume/openstack'
-  end
-
-  module Workflow
-    autoload :OpenStack, 'fog/workflow/openstack'
-
-    class OpenStack
-      autoload :V2, 'fog/workflow/openstack/v2'
-    end
-  end
-
   module OpenStack
     require 'fog/openstack/auth/token'
 
@@ -123,7 +9,28 @@ module Fog
 
     autoload :Core, 'fog/openstack/core'
     autoload :Errors, 'fog/openstack/errors'
-    autoload :Planning, 'fog/planning/openstack'
+
+    autoload :Baremetal, 'fog/openstack/baremetal/baremetal'
+    autoload :Compute, 'fog/openstack/compute/compute'
+    autoload :ContainerInfra, 'fog/openstack/container_infra/container_infra'
+    autoload :DNS, 'fog/openstack/dns/dns'
+    autoload :Event, 'fog/openstack/event/event'
+    autoload :Identity, 'fog/openstack/identity/identity'
+    autoload :Image, 'fog/openstack/image/image'
+    autoload :Introspection, 'fog/openstack/introspection/introspection'
+    autoload :KeyManager, 'fog/openstack/key_manager/key_manager'
+    autoload :Metering, 'fog/openstack/metering/metering'
+    autoload :Metric, 'fog/openstack/metric/metric'
+    autoload :Monitoring, 'fog/openstack/monitoring/monitoring'
+    autoload :Network, 'fog/openstack/network/network'
+    autoload :NFV, 'fog/openstack/nfv/nfv'
+    autoload :Orchestration, 'fog/openstack/orchestration/orchestration'
+    autoload :OrchestrationUtil, 'fog/openstack/orchestration/util/recursive_hot_file_loader'
+    autoload :Planning, 'fog/openstack/planning/planning'
+    autoload :SharedFileSystem, 'fog/openstack/shared_file_system/shared_file_system'
+    autoload :Storage, 'fog/openstack/storage/storage'
+    autoload :Workflow, 'fog/openstack/workflow/workflow'
+    autoload :Volume, 'fog/openstack/volume/volume'
 
     extend Fog::Provider
 

data/lib/fog/openstack/auth/token.rb

@@ -13,41 +13,42 @@ module Fog
         class StandardError < RuntimeError; end
         class URLError < RuntimeError; end
 
-        def self.build(auth, options)
+        def self.build(auth)
           if auth[:openstack_identity_api_version] =~ /(v)*2(\.0)*/i ||
              auth[:openstack_tenant_id] || auth[:openstack_tenant]
-            Fog::OpenStack::Auth::Token::V2.new(auth, options)
+            Fog::OpenStack::Auth::Token::V2.new(auth)
           else
-            Fog::OpenStack::Auth::Token::V3.new(auth, options)
+            Fog::OpenStack::Auth::Token::V3.new(auth)
           end
         end
 
-        def initialize(auth, options)
+        def initialize(auth)
           raise URLError, 'No URL provided' if auth[:openstack_auth_url].nil? || auth[:openstack_auth_url].empty?
           @creds = {
             :data => build_credentials(auth),
             :uri  => URI.parse(auth[:openstack_auth_url])
           }
-          response = authenticate(@creds, options)
+          response = authenticate(@creds)
           set(response)
         end
 
         def get
-          set(authenticate(@creds, {})) if expired?
+          set(authenticate(@creds)) if expired?
           @token
         end
 
         private
 
-        def authenticate(creds, options)
-          connection = Fog::Core::Connection.new(creds[:uri].to_s, false, options)
+        def authenticate(creds)
+          connection_options = {}
+          connection = Fog::Core::Connection.new(creds[:uri].to_s, false, connection_options)
 
           request = {
             :expects => [200, 201],
             :headers => {'Content-Type' => 'application/json'},
             :body    => Fog::JSON.encode(creds[:data]),
             :method  => 'POST',
-            :path    => creds[:uri].path + prefix_path(creds[:uri]) + path
+            :path    => creds[:uri].path + path
           }
 
           connection.request(request)

data/lib/fog/openstack/auth/token/v2.rb

@@ -29,16 +29,8 @@ module Fog
             {'auth' => identity}
           end
 
-          def prefix_path(uri)
-            if uri.path =~ /\/v2(\.0)*(\/)*.*$/
-              ''
-            else
-              '/v2.0'
-            end
-          end
-
           def path
-            '/tokens'
+            '/v2.0/tokens'
           end
 
           def user_credentials

data/lib/fog/openstack/auth/token/v3.rb

@@ -37,16 +37,8 @@ module Fog
             end
           end
 
-          def prefix_path(uri)
-            if uri.path =~ /\/v3(\/)*.*$/
-              ''
-            else
-              '/v3'
-            end
-          end
-
           def path
-            '/auth/tokens'
+            '/v3/auth/tokens'
           end
 
           def scope

data/lib/fog/openstack/baremetal/baremetal.rb

@@ -0,0 +1,260 @@
+module Fog
+  module OpenStack
+    class Baremetal < Fog::Service
+      SUPPORTED_VERSIONS = /(.)*/
+
+      requires :openstack_auth_url
+      recognizes :openstack_auth_token, :openstack_management_url,
+                 :persistent, :openstack_service_type, :openstack_service_name,
+                 :openstack_tenant, :openstack_tenant_id,
+                 :openstack_api_key, :openstack_username, :openstack_identity_endpoint,
+                 :current_user, :current_tenant, :openstack_region,
+                 :openstack_endpoint_type, :openstack_cache_ttl,
+                 :openstack_project_name, :openstack_project_id,
+                 :openstack_project_domain, :openstack_user_domain, :openstack_domain_name,
+                 :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id,
+                 :openstack_identity_api_version
+
+      ## MODELS
+      #
+      model_path 'fog/openstack/baremetal/models'
+      model       :chassis
+      collection  :chassis_collection
+      model       :driver
+      collection  :drivers
+      model       :node
+      collection  :nodes
+      model       :port
+      collection  :ports
+
+      ## REQUESTS
+      #
+      request_path 'fog/openstack/baremetal/requests'
+
+      # Node requests
+      request :create_node
+      request :delete_node
+      request :get_node
+      request :list_nodes
+      request :list_nodes_detailed
+      request :patch_node
+      request :set_node_power_state
+      request :set_node_provision_state
+      request :set_node_maintenance
+      request :unset_node_maintenance
+
+      # Chassis requests
+      request :create_chassis
+      request :delete_chassis
+      request :get_chassis
+      request :list_chassis
+      request :list_chassis_detailed
+      request :patch_chassis
+
+      # Driver requests
+      request :get_driver
+      request :get_driver_properties
+      request :list_drivers
+
+      # Port requests
+      request :create_port
+      request :delete_port
+      request :get_port
+      request :list_ports
+      request :list_ports_detailed
+      request :patch_port
+
+      ## TODO not implemented API requests:
+      ## Chassis
+      # request :list_chassis_nodes
+      # request :list_chassis_nodes_details
+
+      ## Node requests
+      # request :validate_node
+      # request :get_boot_device
+      # request :set_boot_device
+      # request :list_supported_boot_devices
+      # request :list_node_states
+      # request :get_console_info
+      # request :change_console_state
+      # request :get_vendor_passthru_methods
+
+      ## Driver requests
+      # request :get_vendor_passthru_methods
+
+      class Mock
+        def self.data
+          @data ||= Hash.new do |hash, key|
+            chassis_uuid = Fog::UUID.uuid
+            instance_uuid = Fog::UUID.uuid
+            node_uuid = Fog::UUID.uuid
+
+            hash[key] = {
+              :chassis_collection => [
+                {
+                  "created_at"  => "2000-01-01T12:00:00",
+                  "description" => "Sample chassis",
+                  "extra"       => {},
+                  "links"       => [
+                    {
+                      "href" => "http://localhost:6385/v1/chassis/eaaca217-e7d8-47b4-bb41-3f99f20eed89",
+                      "rel"  => "self"
+                    },
+                    {
+                      "href" => "http://localhost:6385/chassis/eaaca217-e7d8-47b4-bb41-3f99f20eed89",
+                      "rel"  => "bookmark"
+                    }
+                  ],
+                  "nodes"       => [
+                    {
+                      "href" => "http://localhost:6385/v1/chassis/eaaca217-e7d8-47b4-bb41-3f99f20eed89/nodes",
+                      "rel"  => "self"
+                    },
+                    {
+                      "href" => "http://localhost:6385/chassis/eaaca217-e7d8-47b4-bb41-3f99f20eed89/nodes",
+                      "rel"  => "bookmark"
+                    }
+                  ],
+                  "updated_at"  => "2000-01-01T12:00:00",
+                  "uuid"        => chassis_uuid
+                }
+              ],
+              :drivers            => [
+                {
+                  "hosts" => [
+                    "fake-host"
+                  ],
+                  "name"  => "sample-driver"
+                }
+              ],
+              :nodes              => [{
+                "chassis_uuid"           => chassis_uuid,
+                "console_enabled"        => false,
+                "created_at"             => "2000-01-01T12:00:00",
+                "driver"                 => "sample-driver",
+                "driver_info"            => {},
+                "extra"                  => {},
+                "instance_info"          => {},
+                "instance_uuid"          => instance_uuid,
+                "last_error"             => nil,
+                "links"                  => [
+                  {
+                    "href" => "http://localhost:6385/v1/nodes/1be26c0b-03f2-4d2e-ae87-c02d7f33c123",
+                    "rel"  => "self"
+                  },
+                  {
+                    "href" => "http://localhost:6385/nodes/1be26c0b-03f2-4d2e-ae87-c02d7f33c123",
+                    "rel"  => "bookmark"
+                  }
+                ],
+                "maintenance"            => false,
+                "maintenance_reason"     => nil,
+                "ports"                  => [
+                  {
+                    "href" => "http://localhost:6385/v1/nodes/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/ports",
+                    "rel"  => "self"
+                  },
+                  {
+                    "href" => "http://localhost:6385/nodes/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/ports",
+                    "rel"  => "bookmark"
+                  }
+                ],
+                "power_state"            => "power on",
+                "properties"             => {
+                  "cpus"      => "1",
+                  "local_gb"  => "10",
+                  "memory_mb" => "1024"
+                },
+                "provision_state"        => "active",
+                "provision_updated_at"   => "2000-01-01T12:00:00",
+                "reservation"            => nil,
+                "target_power_state"     => nil,
+                "target_provision_state" => nil,
+                "updated_at"             => "2000-01-01T12:00:00",
+                "uuid"                   => node_uuid
+              }],
+              :ports              => [{
+                "address"    => "fe:54:00:77:07:d9",
+                "created_at" => "2014-12-23T19:35:30.734116",
+                "extra"      => {
+                  "foo" => "bar"
+                },
+                "links"      => [
+                  {
+                    "href" => "http://localhost:6385/v1/ports/27e3153e-d5bf-4b7e-b517-fb518e17f34c",
+                    "rel"  => "self"
+                  },
+                  {
+                    "href" => "http://localhost:6385/ports/27e3153e-d5bf-4b7e-b517-fb518e17f34c",
+                    "rel"  => "bookmark"
+                  }
+                ],
+                "node_uuid"  => "7ae81bb3-dec3-4289-8d6c-da80bd8001ae",
+                "updated_at" => "2014-12-23T19:35:30.734119",
+                "uuid"       => "27e3153e-d5bf-4b7e-b517-fb518e17f34c"
+              }]
+            }
+          end
+        end
+
+        def self.reset
+          @data = nil
+        end
+
+        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 = 9292
+          management_url.path = '/v1'
+          @openstack_management_url = management_url.to_s
+
+          @data ||= {:users => {}}
+          unless @data[:users].find { |u| u['name'] == options[:openstack_username] }
+            id = Fog::Mock.random_numbers(6).to_s
+            @data[:users][id] = {
+              'id'       => id,
+              'name'     => options[:openstack_username],
+              'email'    => "#{options[:openstack_username]}@mock.com",
+              'tenantId' => Fog::Mock.random_numbers(6).to_s,
+              'enabled'  => true
+            }
+          end
+        end
+
+        def data
+          self.class.data[@openstack_username]
+        end
+
+        def reset_data
+          self.class.data.delete(@openstack_username)
+        end
+
+        def credentials
+          {:provider                 => 'openstack',
+           :openstack_auth_url       => @openstack_auth_uri.to_s,
+           :openstack_auth_token     => @auth_token,
+           :openstack_region         => @openstack_region,
+           :openstack_management_url => @openstack_management_url}
+        end
+      end
+
+      class Real
+        include Fog::OpenStack::Core
+
+        def self.not_found_class
+          Fog::OpenStack::Baremetal::NotFound
+        end
+
+        def default_service_type
+          %w[baremetal]
+        end
+      end
+    end
+  end
+end