fog-openstack 0.1.25 → 0.1.26

data/lib/fog/image/openstack/v1/requests/set_tenant.rb

@@ -15,7 +15,7 @@ module Fog
             true
           end
         end
-      end # class OpenStack
+      end
     end
-  end # module Image
-end # module Fog
+  end
+end

data/lib/fog/image/openstack/v1/requests/update_image_members.rb

@@ -18,7 +18,7 @@ module Fog
               :path    => "images/#{image_id}/members"
             )
           end
-        end # class Real
+        end
 
         class Mock
           def update_image_members(_image_id, _members)
@@ -32,8 +32,8 @@ module Fog
             }
             response
           end
-        end # class Mock
-      end # class OpenStack
+        end
+      end
     end
-  end # module Identity
-end # module Fog
+  end
+end

data/lib/fog/image/openstack/v2/requests/add_member_to_image.rb

@@ -11,16 +11,16 @@ module Fog
               :body    => Fog::JSON.encode(:member => tenant_id)
             )
           end
-        end # class Real
+        end
 
         class Mock
           def add_member_to_image(_image_id, _tenant_id)
             response = Excon::Response.new
             response.status = 200
             response
-          end # def list_tenants
-        end # class Mock
-      end # class OpenStack
+          end
+        end
+      end
     end
-  end # module Identity
-end # module Fog
+  end
+end

data/lib/fog/image/openstack/v2/requests/add_tag_to_image.rb

@@ -10,16 +10,16 @@ module Fog
               :path    => "images/#{image_id}/tags/#{tag}"
             )
           end
-        end # class Real
+        end
 
         class Mock
           def add_tag_to_image(_image_id, _tag)
             response = Excon::Response.new
             response.status = 204
             response
-          end # def add_tag_to_image
-        end # class Mock
-      end # class OpenStack
+          end
+        end
+      end
     end
-  end # module Image
-end # module Fog
+  end
+end

data/lib/fog/image/openstack/v2/requests/download_image.rb

@@ -13,7 +13,7 @@ module Fog
             request_hash[:response_block] = params[:response_block] if params[:response_block]
             request(request_hash).body
           end
-        end # class Real
+        end
 
         class Mock
           def download_image(_image_id, _content_range = nil)
@@ -21,9 +21,9 @@ module Fog
             response.status = [200, 204][rand(2)]
             response.body = ""
             response
-          end # def list_tenants
-        end # class Mock
-      end # class OpenStack
+          end
+        end
+      end
     end
-  end # module Identity
-end # module Fog
+  end
+end

data/lib/fog/image/openstack/v2/requests/get_image.rb

@@ -10,7 +10,7 @@ module Fog
               :path    => "images/#{image_id}"
             )
           end
-        end # class Real
+        end
 
         class Mock
           def get_image(_image_id)
@@ -39,9 +39,9 @@ module Fog
                                "X-Image-Meta-Id" => "0e09fbd6-43c5-448a-83e9-0d3d05f9747e"}
             response.body = ""
             response
-          end # def list_tenants
-        end # class Mock
-      end # class OpenStack
+          end
+        end
+      end
     end
-  end # module Identity
-end # module Fog
+  end
+end

data/lib/fog/image/openstack/v2/requests/get_image_by_id.rb

@@ -10,7 +10,7 @@ module Fog
               :path    => "images/#{image_id}"
             )
           end
-        end # class Real
+        end
 
         class Mock
           def get_image_by_id(_image_id)
@@ -27,9 +27,9 @@ module Fog
               }]
             }
             response
-          end # def list_tenants
-        end # class Mock
-      end # class OpenStack
+          end
+        end
+      end
     end
-  end # module Identity
-end # module Fog
+  end
+end

data/lib/fog/image/openstack/v2/requests/get_image_members.rb

@@ -10,7 +10,7 @@ module Fog
               :path    => "images/#{image_id}/members"
             )
           end
-        end # class Real
+        end
 
         class Mock
           def get_image_members(_image_id)
@@ -23,9 +23,9 @@ module Fog
               ]
             }
             response
-          end # def list_tenants
-        end # class Mock
-      end # class OpenStack
+          end
+        end
+      end
     end
-  end # module Identity
-end # module Fog
+  end
+end

data/lib/fog/image/openstack/v2/requests/get_member_details.rb

@@ -10,7 +10,7 @@ module Fog
               :path    => "images/#{image_id}/members/#{member_id}"
             ).body
           end
-        end # class Real
+        end
 
         class Mock
           def get_member_details(_image_id, _member_id)
@@ -25,9 +25,9 @@ module Fog
               :schema     => "/v2/schemas/member"
             }
             response
-          end # def list_tenants
-        end # class Mock
-      end # class OpenStack
+          end
+        end
+      end
     end
-  end # module Identity
-end # module Fog
+  end
+end

data/lib/fog/image/openstack/v2/requests/get_shared_images.rb

@@ -10,7 +10,7 @@ module Fog
               :path    => "shared-images/#{tenant_id}"
             )
           end
-        end # class Real
+        end
 
         class Mock
           def get_shared_images(_tenant_id)
@@ -23,9 +23,9 @@ module Fog
               ]
             }
             response
-          end # def list_tenants
-        end # class Mock
-      end # class OpenStack
+          end
+        end
+      end
     end
-  end # module Identity
-end # module Fog
+  end
+end

data/lib/fog/image/openstack/v2/requests/list_images.rb

@@ -11,7 +11,7 @@ module Fog
               :query   => options
             )
           end
-        end # class Real
+        end
 
         class Mock
           def list_images(_options = {})
@@ -28,9 +28,9 @@ module Fog
               }]
             }
             response
-          end # def list_tenants
-        end # class Mock
-      end # class OpenStack
+          end
+        end
+      end
     end
-  end # module Identity
-end # module Fog
+  end
+end

data/lib/fog/image/openstack/v2/requests/remove_member_from_image.rb

@@ -10,16 +10,16 @@ module Fog
               :path    => "images/#{image_id}/members/#{member_id}"
             )
           end
-        end # class Real
+        end
 
         class Mock
           def remove_member_from_image(_image_id, _member_id)
             response = Excon::Response.new
             response.status = [200, 204][rand(2)]
             response
-          end # def list_tenants
-        end # class Mock
-      end # class OpenStack
+          end
+        end
+      end
     end
-  end # module Identity
-end # module Fog
+  end
+end

data/lib/fog/image/openstack/v2/requests/remove_tag_from_image.rb

@@ -10,16 +10,16 @@ module Fog
               :path    => "images/#{image_id}/tags/#{tag}"
             )
           end
-        end # class Real
+        end
 
         class Mock
           def remove_tag_from_image(_image_id, _tag)
             response = Excon::Response.new
             response.status = 204
             response
-          end # def remove_tag_from_image
-        end # class Mock
-      end # class OpenStack
+          end
+        end
+      end
     end
-  end # module Image
-end # module Fog
+  end
+end

data/lib/fog/image/openstack/v2/requests/set_tenant.rb

@@ -15,7 +15,7 @@ module Fog
             true
           end
         end
-      end # class OpenStack
+      end
     end
-  end # module Compute
-end # module Fog
+  end
+end

data/lib/fog/image/openstack/v2/requests/update_image_member.rb

@@ -11,7 +11,7 @@ module Fog
               :path    => "images/#{image_id}/members/#{member['member_id']}"
             )
           end
-        end # class Real
+        end
 
         class Mock
           def update_image_members(image_id, member)
@@ -27,8 +27,8 @@ module Fog
             }
             response
           end
-        end # class Mock
-      end # class OpenStack
+        end
+      end
     end
-  end # module Identity
-end # module Fog
+  end
+end

data/lib/fog/openstack.rb

@@ -1,115 +1,95 @@
-require 'fog/openstack/version'
 require 'fog/core'
 require 'fog/json'
 
-require 'fog/openstack/core'
-require 'fog/openstack/errors'
-
-require 'fog/planning/openstack'
-
 module Fog
   module Baremetal
-    autoload :OpenStack, File.expand_path('../baremetal/openstack', __FILE__)
+    autoload :OpenStack, 'fog/baremetal/openstack'
   end
 
   module Compute
-    autoload :OpenStack, File.expand_path('../compute/openstack', __FILE__)
+    autoload :OpenStack, 'fog/compute/openstack'
   end
 
   module ContainerInfra
-    autoload :OpenStack, File.expand_path('../container_infra/openstack', __FILE__)
+    autoload :OpenStack, 'fog/container_infra/openstack'
   end
 
   module DNS
-    autoload :OpenStack, File.expand_path('../dns/openstack', __FILE__)
-
-    class OpenStack
-      autoload :V1, File.expand_path('../dns/openstack/v1', __FILE__)
-      autoload :V2, File.expand_path('../dns/openstack/v2', __FILE__)
-    end
+    autoload :OpenStack, 'fog/dns/openstack'
   end
 
   module Event
-    autoload :OpenStack, File.expand_path('../event/openstack', __FILE__)
+    autoload :OpenStack, 'fog/event/openstack'
   end
 
   module Identity
-    autoload :OpenStack, File.expand_path('../identity/openstack', __FILE__)
-
-    class OpenStack
-      autoload :V2, File.expand_path('../identity/openstack/v2', __FILE__)
-      autoload :V3, File.expand_path('../identity/openstack/v3', __FILE__)
-    end
+    autoload :OpenStack, 'fog/identity/openstack'
   end
 
   module Image
-    autoload :OpenStack, File.expand_path('../image/openstack', __FILE__)
-
-    class OpenStack
-      autoload :V1, File.expand_path('../image/openstack/v1', __FILE__)
-      autoload :V2, File.expand_path('../image/openstack/v2', __FILE__)
-    end
+    autoload :OpenStack, 'fog/image/openstack'
   end
 
   module Introspection
-    autoload :OpenStack, File.expand_path('../introspection/openstack', __FILE__)
+    autoload :OpenStack, 'fog/introspection/openstack'
   end
 
   module KeyManager
-    autoload :OpenStack, File.expand_path('../key_manager/openstack', __FILE__)
+    autoload :OpenStack, 'fog/key_manager/openstack'
   end
 
   module Metering
-    autoload :OpenStack, File.expand_path('../metering/openstack', __FILE__)
+    autoload :OpenStack, 'fog/metering/openstack'
   end
 
   module Metric
-    autoload :OpenStack, File.expand_path('../metric/openstack', __FILE__)
+    autoload :OpenStack, 'fog/metric/openstack'
   end
 
   module Monitoring
-    autoload :OpenStack, File.expand_path('../monitoring/openstack', __FILE__)
+    autoload :OpenStack, 'fog/monitoring/openstack'
   end
 
   module Network
-    autoload :OpenStack, File.expand_path('../network/openstack', __FILE__)
+    autoload :OpenStack, 'fog/network/openstack'
   end
 
   module NFV
-    autoload :OpenStack, File.expand_path('../nfv/openstack', __FILE__)
+    autoload :OpenStack, 'fog/nfv/openstack'
   end
 
   module Orchestration
-    autoload :OpenStack, File.expand_path('../orchestration/openstack', __FILE__)
-    autoload :Util, File.expand_path('../orchestration/util/recursive_hot_file_loader', __FILE__)
+    autoload :OpenStack, 'fog/orchestration/openstack'
+    autoload :Util, 'fog/orchestration/util/recursive_hot_file_loader'
   end
 
   module SharedFileSystem
-    autoload :OpenStack, File.expand_path('../shared_file_system/openstack', __FILE__)
+    autoload :OpenStack, 'fog/shared_file_system/openstack'
   end
 
   module Storage
-    autoload :OpenStack, File.expand_path('../storage/openstack', __FILE__)
+    autoload :OpenStack, 'fog/storage/openstack'
   end
 
   module Volume
-    autoload :OpenStack, File.expand_path('../volume/openstack', __FILE__)
-
-    class OpenStack
-      autoload :V1, File.expand_path('../volume/openstack/v1', __FILE__)
-      autoload :V2, File.expand_path('../volume/openstack/v2', __FILE__)
-    end
+    autoload :OpenStack, 'fog/volume/openstack'
   end
 
   module Workflow
-    autoload :OpenStack, File.expand_path('../workflow/openstack', __FILE__)
+    autoload :OpenStack, 'fog/workflow/openstack'
 
     class OpenStack
-      autoload :V2, File.expand_path('../workflow/openstack/v2', __FILE__)
+      autoload :V2, 'fog/workflow/openstack/v2'
     end
   end
 
   module OpenStack
+    autoload :VERSION, 'fog/openstack/version'
+
+    autoload :Core, 'fog/openstack/core'
+    autoload :Errors, 'fog/openstack/errors'
+    autoload :Planning, 'fog/planning/openstack'
+
     extend Fog::Provider
 
     service(:baremetal,          'Baremetal')