fog-openstack 0.3.0 → 0.3.1

data/docs/introspection.md

@@ -92,7 +92,7 @@ require 'fog/openstack'
 Find the available Baremetal nodes.
 
 ```ruby
-iron = Fog::Baremetal::OpenStack.new(@connection_params)
+iron = Fog::OpenStack::Baremetal.new(@connection_params)
 
 nodes = iron.node_list
 ```
@@ -109,7 +109,7 @@ http://docs.openstack.org/developer/ironic/deploy/install-guide.html#hardware-in
 
 ```ruby
 node_id = nodes.body["nodes"][0]["uuid"]
-inspector = Fog::Introspection::OpenStack.new(@connection_params)
+inspector = Fog::OpenStack::Introspection.new(@connection_params)
 
 introspection1 = inspector.create_introspection(node_id)
 ```

data/docs/metering.md

@@ -9,7 +9,7 @@ Fog uses the [OpenStack Metering API](http://docs.openstack.org/developer/ceilom
 Get a handle on the Metering service:
 
 ```ruby
-service = Fog::Metering::OpenStack.new({
+service = Fog::OpenStack::Metering.new({
   :openstack_auth_url  => 'http://KEYSTONE_HOST:KEYSTONE_PORT/v2.0/tokens', # OpenStack Keystone endpoint
   :openstack_username  => OPEN_STACK_USER,                                  # Your OpenStack Username
   :openstack_tenant    => OPEN_STACK_TENANT,                                # Your tenant id

data/docs/network.md

@@ -16,7 +16,7 @@ require 'fog/openstack'
 
 Next, create a connection to the Network Service:
 ```
-service = Fog::Network::OpenStack.new(
+service = Fog::OpenStack::Network.new(
 	:openstack_auth_url     => 'http://KEYSTONE_HOST:KEYSTONE_PORT/v3/auth/tokens', # OpenStack Keystone v3 endpoint
 	:openstack_username     => OPEN_STACK_USER,                                     # Your OpenStack Username
 	:openstack_domain_name  => OPEN_STACK_DOMAIN,                                   # Your OpenStack Domain name
@@ -104,7 +104,7 @@ This will return:
   {"id"=>"e624a36d-762b-481f-9b50-4154ceb78bbb", "name"=>"network_1", "subnets"=>["2e4ec6a4-0150-47f5-8523-e899ac03026e"], "shared"=>false, "status"=>"ACTIVE", "admin_state_up"=>true, "tenant_id"=>"f8b26a6032bc47718a7702233ac708b9"}]
 }
 ```
-To learn more about Network request methods refer to [rdoc](http://www.rubydoc.info/gems/fog-openstack/Fog/Network/OpenStack/Real). To learn more about Excon refer to [Excon GitHub repo](https://github.com/geemus/excon).
+To learn more about Network request methods refer to [rdoc](http://www.rubydoc.info/gems/fog-openstack/fog/openstack/network/Real). To learn more about Excon refer to [Excon GitHub repo](https://github.com/geemus/excon).
 
 ### Model Layer
 
@@ -182,14 +182,14 @@ networks = service.networks
 ```
 This returns in the following `Fog::OpenStack::Model`:
 ```
-<Fog::Network::OpenStack::Networks
+<Fog::OpenStack::Network::Networks
   filters={}
-  [<Fog::Network::OpenStack::Network
+  [<Fog::OpenStack::Network::Network
       id="f9c54735-a230-443e-9379-b87f741cc1b1",
       name="Public",
-      subnets=        <Fog::Network::OpenStack::Subnets
+      subnets=        <Fog::OpenStack::Network::Subnets
         filters={}
-        [<Fog::Network::OpenStack::Subnet ... >]
+        [<Fog::OpenStack::Network::Subnet ... >]
       >,
       shared=true,
       status="ACTIVE",
@@ -200,10 +200,10 @@ This returns in the following `Fog::OpenStack::Model`:
       provider_segmentation_id=nil,
       router_external=false
     >,
-                <Fog::Network::OpenStack::Network
+                <Fog::OpenStack::Network::Network
       id="e624a36d-762b-481f-9b50-4154ceb78bbb",
       name="network_1",
-      subnets=        <Fog::Network::OpenStack::Subnets
+      subnets=        <Fog::OpenStack::Network::Subnets
         filters={}
         []
       >,

data/docs/orchestration.md

@@ -25,7 +25,7 @@ _Source: [OpenStack Wiki](https://wiki.openstack.org/wiki/Heat)_
 Get a handle on the Orchestration service:
 
 ```ruby
-service = Fog::Orchestration::OpenStack.new({
+service = Fog::OpenStack::Orchestration.new({
   :openstack_auth_url  => 'http://KEYSTONE_HOST:KEYSTONE_PORT/v2.0/tokens', # OpenStack Keystone endpoint
   :openstack_username  => OPEN_STACK_USER,                                  # Your OpenStack Username
   :openstack_tenant    => OPEN_STACK_TENANT,                                # Your tenant id
@@ -46,9 +46,9 @@ service.stacks
 ```
 This returns a list of stacks with minimum attributes, leaving other attributes empty
 ```ruby
-=> <Fog::Orchestration::OpenStack::Stacks
+=> <Fog::OpenStack::Orchestration::Stacks
     [
-      <Fog::Orchestration::OpenStack::Stack
+      <Fog::OpenStack::Orchestration::Stack
         id="0b8e4060-419b-416b-a927-097d4afbf26d",
         capabilities=nil,
         description="Simple template to deploy a single compute instance",
@@ -93,7 +93,7 @@ stack = service.stacks.get("stack4", "0b8e4060-419b-416b-a927-097d4afbf26d")
 ```
 This returns a stack with all attributes filled
 ```ruby
-=>   <Fog::Orchestration::OpenStack::Stack
+=>   <Fog::OpenStack::Orchestration::Stack
     id="0b8e4060-419b-416b-a927-097d4afbf26d",
     capabilities=[],
     description="Simple template to deploy a single compute instance",
@@ -143,9 +143,9 @@ A stack knows about related `events`:
 
 ```ruby
 stack.events
-=>   <Fog::Orchestration::OpenStack::Events
+=>   <Fog::OpenStack::Orchestration::Events
     [
-      <Fog::Orchestration::OpenStack::Event
+      <Fog::OpenStack::Orchestration::Event
         id="251",
         resource_name="my_instance",
         event_time="2015-01-21T20:08:51Z",
@@ -160,9 +160,9 @@ A stack knows about related `resources`:
 
 ```ruby
 stack.resources
-=>   <Fog::Orchestration::OpenStack::Resources
+=>   <Fog::OpenStack::Orchestration::Resources
     [
-      <Fog::Orchestration::OpenStack::Resource
+      <Fog::OpenStack::Orchestration::Resource
         id=nil,
         resource_name="my_instance",
         description=nil,
@@ -182,7 +182,7 @@ You can get a stack's `template`
 
 ```ruby
 stack.template
-=>   <Fog::Orchestration::OpenStack::Template
+=>   <Fog::OpenStack::Orchestration::Template
     format="HOT",
     description="Simple template to deploy a single compute instance",
     template_version="2013-05-23",
@@ -201,7 +201,7 @@ Reload any object by calling `reload` on it:
 
 ```ruby
 stacks.reload
-=>   <Fog::Orchestration::OpenStack::Stacks
+=>   <Fog::OpenStack::Orchestration::Stacks
     [...]
   >
 ```
@@ -212,9 +212,9 @@ You can list `Events` of a `stack`:
 
 ```ruby
 stack.events
-=>   <Fog::Orchestration::OpenStack::Events
+=>   <Fog::OpenStack::Orchestration::Events
     [
-      <Fog::Orchestration::OpenStack::Event
+      <Fog::OpenStack::Orchestration::Event
         id="15",
         resource_name="my_instance",
         event_time="2014-09-12T20:43:58Z",
@@ -230,7 +230,7 @@ stack.events
 
 ```ruby
 event = service.events.get(stack, resource, event_id)
-=>   <Fog::Orchestration::OpenStack::Event
+=>   <Fog::OpenStack::Orchestration::Event
     id="15",
     resource_name="my_instance",
     event_time="2014-09-12T20:43:58Z",
@@ -246,7 +246,7 @@ An `event` knows about its associated `stack`:
 
 ```ruby
 event.stack
-=>   <Fog::Orchestration::OpenStack::Stack
+=>   <Fog::OpenStack::Orchestration::Stack
     id="0c9ee370-ef64-4a80-a6cc-65d2277caeb9",
     description="Simple template to deploy a single compute instance",
     links=[{"href"=>"http://10.8.96.4:8004/v1/5d139d95546240748508b2a518aa5bef/stacks/progenerated/0c9ee370-ef64-4a80-a6cc-65d2277caeb9", "rel"=>"self"}],
@@ -260,7 +260,7 @@ An  `event` has an associated `resource`:
 
 ```ruby
 resource = event.resource
-=>   <Fog::Orchestration::OpenStack::Resource
+=>   <Fog::OpenStack::Orchestration::Resource
     id=nil,
     resource_name="my_instance",
     description="",
@@ -280,9 +280,9 @@ resource = event.resource
 
 ```ruby
 service.resources.all(stack, {:nested_depth => 1})
-=>   <Fog::Orchestration::OpenStack::Resources
+=>   <Fog::OpenStack::Orchestration::Resources
     [
-      <Fog::Orchestration::OpenStack::Resource
+      <Fog::OpenStack::Orchestration::Resource
         id=nil,
         resource_name="my_instance",
         description=nil,
@@ -302,7 +302,7 @@ A `resource` knows about its associated `stack`:
 
 ```ruby
 resource.stack
-=>   <Fog::Orchestration::OpenStack::Stack
+=>   <Fog::OpenStack::Orchestration::Stack
     id="0c9ee370-ef64-4a80-a6cc-65d2277caeb9",
     description="Simple template to deploy a single compute instance",
     links=[{"href"=>"http://10.8.96.4:8004/v1/5d139d95546240748508b2a518aa5bef/stacks/progenerated/0c9ee370-ef64-4a80-a6cc-65d2277caeb9", "rel"=>"self"}],
@@ -332,7 +332,7 @@ You can validate a template (either HOT or CFN) before using it:
 
 ```ruby
 service.templates.validate(:template => content)
-=>   <Fog::Orchestration::OpenStack::Template
+=>   <Fog::OpenStack::Orchestration::Template
     format=nil,
     description="Simple template to deploy a single compute instance",
     template_version=nil,

data/docs/planning.md

@@ -48,7 +48,7 @@ Fog provides both a **model** and **request** abstraction. The request abstracti
 
 ### Request Layer
 
-The `Fog::OpenStack[:planning]` object supports a number of methods that wrap individual HTTP requests to the Tuskar API.
+The `Fog::OpenStack::Planning.new` object supports a number of methods that wrap individual HTTP requests to the Tuskar API.
 
 To see a list of requests supported by the planning service:
 
@@ -170,7 +170,7 @@ This will return hash similar to:
 ```
 
 [//]: # (TODO: Specify URL to rubydoc.info when OpenStack Planning service is part of release and pages are built)
-To learn more about `Fog::OpenStack[:planning]` request methods refer to [rdoc](http://rubydoc.info/gems/fog/Fog). To learn more about Excon refer to [Excon GitHub repo](https://github.com/geemus/excon).
+To learn more about `Fog::OpenStack::Planning.new` request methods refer to [rdoc](http://rubydoc.info/gems/fog/Fog). To learn more about Excon refer to [Excon GitHub repo](https://github.com/geemus/excon).
 
 ### Model Layer
 

data/docs/shared_file_system.md

@@ -22,7 +22,7 @@ require 'fog/openstack'
 
 Next, create a connection to the Shared File System Service:
 ```
-service = Fog::SharedFileSystem::OpenStack.new(
+service = Fog::OpenStack::SharedFileSystem.new(
 	:openstack_auth_url     => 'http://KEYSTONE_HOST:KEYSTONE_PORT/v3/auth/tokens', # OpenStack Keystone v3 endpoint
 	:openstack_username     => OPEN_STACK_USER,                                     # Your OpenStack Username
 	:openstack_domain_name  => OPEN_STACK_DOMAIN,                                   # Your OpenStack Domain name

data/docs/storage.md

@@ -29,7 +29,7 @@ require 'fog/openstack'
 Next, create a connection to Swift:
 
 ```ruby
-service = Fog::Storage::OpenStack.new({
+service = Fog::OpenStack::Storage.new({
   :openstack_username  => USERNAME,      # Your OpenStack Username
   :openstack_api_key   => PASSWORD,      # Your OpenStack Password
   :openstack_auth_url  => 'http://YOUR_OPENSTACK_ENDPOINT:PORT/v2.0/tokens',
@@ -126,7 +126,7 @@ This will return:
 {"X-Account-Bytes-Used"=>"2563554", "Date"=>"Thu, 21 Feb 2013 21:57:02 GMT", "X-Account-Meta-Temp-Url-Key"=>"super_secret_key", "X-Timestamp"=>"1354552916.82056", "Content-Length"=>"0", "Content-Type"=>"application/json; charset=utf-8", "X-Trans-Id"=>"txe934924374a744c8a6c40dd8f29ab94a", "Accept-Ranges"=>"bytes", "X-Account-Container-Count"=>"7", "X-Account-Object-Count"=>"5"}
 ```
 
-To learn more about `Fog::Storage` request methods refer to [rdoc](http://rubydoc.info/gems/fog/Fog/Storage/OpenStack/Real). To learn more about Excon refer to [Excon GitHub repo](https://github.com/geemus/excon).
+To learn more about `Fog::Storage` request methods refer to [rdoc](http://rubydoc.info/gems/fog/fog/openstack/storage/Real). To learn more about Excon refer to [Excon GitHub repo](https://github.com/geemus/excon).
 
 ### Model Layer
 
@@ -184,7 +184,7 @@ To retrieve a list of directories:
 service.directories
 ```
 
-This returns a collection of `Fog::Storage::OpenStack::Directory` models:
+This returns a collection of `Fog::OpenStack::Storage::Directory` models:
 
 ## Get Directory
 
@@ -194,7 +194,7 @@ To retrieve a specific directory:
 service.directories.get "blue"
 ```
 
-This returns a `Fog::Storage::OpenStack::Directory` instance:
+This returns a `Fog::OpenStack::Storage::Directory` instance:
 
 ## Create Directory
 

data/docs/workflow.md

@@ -9,7 +9,7 @@ Fog uses the [OpenStack Mistral API](http://docs.openstack.org/developer/mistral
 Get a handle for the Workflow service:
 
 ```ruby
-service = Fog::Workflow::OpenStack.new({
+service = Fog::OpenStack::Workflow.new({
   :openstack_auth_url  => 'http://KEYSTONE_HOST:KEYSTONE_PORT/v2.0/tokens', # OpenStack Keystone endpoint
   :openstack_username  => OPEN_STACK_USER,                                  # Your OpenStack Username
   :openstack_tenant    => OPEN_STACK_TENANT,                                # Your tenant id

data/examples/compute/block_device_mapping_v2.rb

@@ -7,7 +7,7 @@ username = 'admin@example.net'
 password = 'secret'
 tenant   = 'My Compute Tenant' # String
 
-compute_client ||= ::Fog::Compute::OpenStack.new(
+compute_client ||= ::Fog::OpenStack::Compute.new(
   :openstack_api_key  => password,
   :openstack_username => username,
   :openstack_auth_url => auth_url,

data/examples/container_infra/basics.rb

@@ -12,7 +12,7 @@ params = {
 container_infra = Fog::ContainerInfra::OpenStack.new(params)
 
 # Get the Fedora Atomic image
-image = Fog::Image::OpenStack.new(params)
+image = Fog::OpenStack::Image.new(params)
 
 unless image.images.map(&:name).include?("fedora-atomic-latest")
   puts "Couldn't find Fedora Atomic. Uploading to Glance..."

data/examples/event/basics.rb

@@ -13,7 +13,7 @@ password = 'D78JVyRnzJG8j7Mb6fgpeUMp7'
 
 puts "### SERVICE CONNECTION ###"
 
-event_service = Fog::Event::OpenStack.new(@connection_params)
+event_service = Fog::OpenStack::Event.new(@connection_params)
 
 p event_service
 

data/examples/identity/basics.rb

@@ -8,7 +8,7 @@ username = 'admin@example.net'
 password = 'secret'
 tenant   = 'admin'
 
-keystone = Fog::Identity::OpenStack.new :openstack_auth_url => auth_url,
+keystone = Fog::OpenStack::Identity.new :openstack_auth_url => auth_url,
                                         :openstack_username => username,
                                         :openstack_api_key  => password,
                                         :openstack_tenant   => tenant
@@ -19,7 +19,7 @@ keystone = Fog::Identity::OpenStack.new :openstack_auth_url => auth_url,
 # Listing keystone tenants
 #
 keystone.tenants.each do |tenant|
-  # <Fog::Identity::OpenStack::Tenant
+  # <Fog::OpenStack::Identity::Tenant
   #   id="46b4ab...",
   #   description=nil,
   #   enabled=1,
@@ -32,7 +32,7 @@ end
 # List users
 #
 keystone.users.each do |user|
-  # <Fog::Identity::OpenStack::User
+  # <Fog::OpenStack::Identity::User
   #   id="c975f...",
   #   email="quantum@example.net",
   #   enabled=true,

data/examples/identity/basics_v3.rb

@@ -9,11 +9,11 @@ password = 'secret'
 project = 'admin'
 domain = 'Default'
 
-keystone = Fog::Identity::OpenStack.new :openstack_auth_url => auth_url,
-                                        :openstack_username => username,
-                                        :openstack_api_key  => password,
+keystone = Fog::OpenStack::Identity.new :openstack_auth_url     => auth_url,
+                                        :openstack_username     => username,
+                                        :openstack_api_key      => password,
                                         :openstack_project_name => project,
-                                        :openstack_domain_name => domain
+                                        :openstack_domain_name  => domain
                                         # Optional, self-signed certs
                                         #:connection_options => { :ssl_verify_peer => false }
 
@@ -21,17 +21,17 @@ keystone = Fog::Identity::OpenStack.new :openstack_auth_url => auth_url,
 # List keystone projects
 #
 keystone.projects.each do |project|
-  #<Fog::Identity::OpenStack::V3::Project
-  #  id="17775c",
-  #  domain_id="default",
-  #  description="admin tenant",
-  #  enabled=true,
-  #  name="admin",
-  #  links={"self"=>"http://example.net:35357/..."},
-  #  parent_id=nil,
-  #  subtree=nil,
-  #  parents=nil
-  #>
+  # <Fog::OpenStack::Identity::V3::Project
+  #   id="17775c",
+  #   domain_id="default",
+  #   description="admin tenant",
+  #   enabled=true,
+  #   name="admin",
+  #   links={"self"=>"http://example.net:35357/..."},
+  #   parent_id=nil,
+  #   subtree=nil,
+  #   parents=nil
+  # >
   # ...
   pp project
 end
@@ -40,17 +40,17 @@ end
 # List users
 #
 keystone.users.each do |user|
-  #<Fog::Identity::OpenStack::V3::User
-  #  id="02124b...",
-  #  default_project_id=2f534e...,
-  #  description=nil,
-  #  domain_id="default",
-  #  email="quantum@example.net",
-  #  enabled=true,
-  #  name="quantum",
-  #  links={"self"=>"http://example.net:35357/..."},
-  #  password=nil
-  #>
+  # <Fog::OpenStack::Identity::V3::User
+  #   id="02124b...",
+  #   default_project_id=2f534e...,
+  #   description=nil,
+  #   domain_id="default",
+  #   email="quantum@example.net",
+  #   enabled=true,
+  #   name="quantum",
+  #   links={"self"=>"http://example.net:35357/..."},
+  #   password=nil
+  # >
   # ...
   pp user
 end

data/examples/image/upload-test-image.rb

@@ -43,32 +43,32 @@ Gem::Package::TarReader.new(Zlib::GzipReader.open(image_out.path)).each do |entr
   end
 end
 
-image_service = Fog::Image::OpenStack.new :openstack_api_key => ENV['OS_PASSWORD'],
+image_service = Fog::OpenStack::Image.new :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"]
+                                          :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',
+aki = image_service.images.create :name             => 'cirros-0.3.0-amd64-aki',
+                                  :size             => File.size(aki),
+                                  :disk_format      => 'aki',
                                   :container_format => 'aki',
-                                  :location => 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',
+ari = image_service.images.create :name             => 'cirros-0.3.0-amd64-ari',
+                                  :size             => File.size(ari),
+                                  :disk_format      => 'ari',
                                   :container_format => 'ari',
-                                  :location => ari
+                                  :location         => ari
 
 puts "Uploading AMI..."
-image_service.images.create :name => 'cirros-0.3.0-amd64',
-                            :size => File.size(ami),
-                            :disk_format => 'ami',
+image_service.images.create :name             => 'cirros-0.3.0-amd64',
+                            :size             => File.size(ami),
+                            :disk_format      => 'ami',
                             :container_format => 'ami',
-                            :location => ami,
-                            :properties => {
+                            :location         => ami,
+                            :properties       => {
                               'kernel_id'  => aki.id,
                               'ramdisk_id' => ari.id
                             }