fog-openstack 0.3.10 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 67c19ff8dc418f0fa9e2ac9e94f9435fd80d11674bef6563c7397cd3266674ff
-  data.tar.gz: 447e6463615734341e4bed8c23e50407bbb7ab4b0a8d5cfc75b0011d3f025566
+SHA1:
+  metadata.gz: ebee07120f7105893d3a3cd38f34089f232246d0
+  data.tar.gz: 1b28489f4f085031698d7bfcdec65032fef77770
 SHA512:
-  metadata.gz: 698a2e4efe20114faecf2d6587e0cbe57d57b7bb156e0cd317b709353cc7af0c103d0ac3dfae2bf67887f5d0accd21998c1eda6226d3352c7e9fe68efc969f01
-  data.tar.gz: fe975118dc14ff875c0a3813871ebf1b01de4add08f5f83a504191a4d55c4674996be2de114951e1bd367dc0f00d91d53a5442cd3100a6d22256f23b67c2d5dd
+  metadata.gz: 6fce1d14df591c6df43997523dc89c06c821068978018888d0fd69855af0764dc37d0c63a7abf7c44dbb7cfe52ff86aed84e4f184933058072c6c8c50cf5dc6f
+  data.tar.gz: '049a741d58953d8210244d06feced8fc79382f95809d4de2a0867851c6d8c476f97fa6f806db94a8717ab1111bec5f17b65afa26847d916cb5500cecaac1c836'

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 sudo: false
 before_install:
-  - gem install bundler --version '~> 1'
+  - gem update bundler
 script:
   - bundle exec rake test TESTOPTS="--verbose"
   - bundle exec rake spec
@@ -10,13 +10,13 @@ env:
 matrix:
   fast_finish: true
   include:
-  - rvm: 2.3.8
+  - rvm: 2.2.10
     gemfile: Gemfile
-  - rvm: 2.4.5
+  - rvm: 2.3.7
     gemfile: Gemfile
-  - rvm: 2.5.3
+  - rvm: 2.4.4
     gemfile: Gemfile
-  - rvm: 2.6.0
+  - rvm: 2.5.1
     gemfile: Gemfile
   - rvm: jruby-head
     gemfile: Gemfile

data/.zuul.yaml

@@ -12,10 +12,10 @@
     run: playbooks/fog-openstack-unittest-test/run.yaml
     vars:
       rvm:
-        2.3.8
-        2.4.5
-        2.5.3
-        2.6.0
+        2.2.10
+        2.3.7
+        2.4.4
+        2.5.1
         jruby-head
     nodeset: ubuntu-xenial
 
@@ -27,9 +27,9 @@
     run: playbooks/fog-openstack-unittest-spec/run.yaml
     vars:
       rvm:
-        2.3.8
-        2.4.5
-        2.5.3
-        2.6.0
+        2.2.10
+        2.3.7
+        2.4.4
+        2.5.1
         jruby-head
     nodeset: ubuntu-xenial

data/README.md

@@ -82,18 +82,18 @@ The exception is if you're using Nova (and not Neutron) for your instance networ
 Initialise a connection to the compute service:
 
 ```ruby
-compute = Fog::Compute::OpenStack.new(@connection_params)
+compute = Fog::OpenStack::Compute.new(@connection_params)
 ```
 
 Get a list of available images for use with booting new instances:
 
 ```ruby
 p compute.images
-# =>   <Fog::Compute::OpenStack::Images
+# =>   <Fog::OpenStack::Compute::Images
 #     filters={},
 #     server=nil
 #     [
-#                   <Fog::Compute::OpenStack::Image
+#                   <Fog::OpenStack::Compute::Image
 #         id="57a67f8a-7bae-4578-b684-b9b4dcd48d7f",
 #         ...
 #       >
@@ -105,9 +105,9 @@ List available flavors so we can decide how powerful to make this instance:
 
 ```ruby
 p compute.flavors
-# =>   <Fog::Compute::OpenStack::Flavors
+# =>   <Fog::OpenStack::Compute::Flavors
 #     [
-#                   <Fog::Compute::OpenStack::Flavor
+#                   <Fog::OpenStack::Compute::Flavor
 #         id="1",
 #         name="m1.tiny",
 #         ram=512,
@@ -115,7 +115,7 @@ p compute.flavors
 #         vcpus=1,
 #         ...
 #       >,
-#                   <Fog::Compute::OpenStack::Flavor
+#                   <Fog::OpenStack::Compute::Flavor
 #         id="2",
 #         name="m1.small",
 #         ram=2048,
@@ -141,7 +141,7 @@ instance.wait_for { ready? }
 # => {:duration=>17.359134}
 
 p instance
-# =>   <Fog::Compute::OpenStack::Server
+# =>   <Fog::OpenStack::Compute::Server
 #     id="63633125-26b5-4fe1-a909-0f44d1ab3337",
 #     instance_name=nil,
 #     addresses={"public"=>[{"OS-EXT-IPS-MAC:mac_addr"=>"fa:16:3e:f4:75:ab", "version"=>4, "addr"=>"1.2.3.4", "OS-EXT-IPS:type"=>"fixed"}]},
@@ -177,11 +177,11 @@ Allow TCP traffic through port 22:
 ```ruby
 security_group = compute.security_groups.create name:  "Test SSH",
                                                 description: "Allow access to port 22"
-# =>   <Fog::Compute::OpenStack::SecurityGroup
+# =>   <Fog::OpenStack::Compute::SecurityGroup
 #     id="e5d53d00-b3f9-471a-b90f-985694b966ed",
 #     name="Test SSH",
 #     description="Allow access to port 22",
-#     security_group_rules=    <Fog::Compute::OpenStack::SecurityGroupRules
+#     security_group_rules=    <Fog::OpenStack::Compute::SecurityGroupRules
 #       [
 
 #       ]
@@ -196,7 +196,7 @@ compute.security_group_rules.create parent_group_id: security_group.id,
 
 key_pair = compute.key_pairs.create name:       "My Public Key",
                                     public_key: "/full/path/to/ssh.pub"
-# =>   <Fog::Compute::OpenStack::KeyPair
+# =>   <Fog::OpenStack::Compute::KeyPair
 #     name="My Public Key",
 #     ...
 #     user_id="20746f49211e4037a91269df6a3fbf7b",
@@ -212,7 +212,7 @@ instance = compute.servers.create name:            "Test 2",
                                   flavor_ref:      flavor.id,
                                   key_name:        key_pair.name,
                                   security_groups: security_group
-# =>   <Fog::Compute::OpenStack::Server
+# =>   <Fog::OpenStack::Compute::Server
 #     id="e18ebdfb-e5f5-4a45-929f-4cc9926dc2c7",
 #     name="Test 2",
 #     state="ACTIVE",
@@ -230,7 +230,7 @@ floating_ip_address = compute.addresses.create pool: pool_name
 instance.associate_address floating_ip_address.ip
 
 p floating_ip_address
-# =>   <Fog::Compute::OpenStack::Address
+# =>   <Fog::OpenStack::Compute::Address
 #     id="54064324-ce7d-448d-9753-94497b29dc91",
 #     ip="1.2.3.4",
 #     pool="external",
@@ -256,12 +256,12 @@ $ pwd
 Create and attach a volume to a running instance:
 
 ```ruby
-compute = Fog::Compute::OpenStack.new(@connection_params)
+compute = Fog::OpenStack::Compute.new(@connection_params)
 
 volume = compute.volumes.create name:        "Test",
                                 description: "Testing",
                                 size:        1
-# =>   <Fog::Compute::OpenStack::Volume
+# =>   <Fog::OpenStack::Compute::Volume
 #     id="4a212986-c6b6-4a93-8319-c6a98e347750",
 #     name="Test",
 #     description="Testing",
@@ -292,7 +292,7 @@ volume.reload
 compute.snapshots.create volume_id:   volume.id,
                          name:        "test",
                          description: "test"
-# =>   <Fog::Compute::OpenStack::Snapshot
+# =>   <Fog::OpenStack::Compute::Snapshot
 #     id="7a8c9192-25ee-4364-be91-070b7a6d9855",
 #     name="test",
 #     description="test",
@@ -315,7 +315,7 @@ Download Glance image:
 
 ```ruby
 
-image = Fog::Image::OpenStack.new(@connection_params)
+image = Fog::OpenStack::Image.new(@connection_params)
 
 image_out = File.open("/tmp/cirros-image-download", 'wb')
 
@@ -345,7 +345,7 @@ image_handle = image.images.create name:             "cirros",
                                    disk_format:      "qcow2",
                                    container_format: "bare"
 
-# => <Fog::Image::OpenStack::V2::Image
+# => <Fog::OpenStack::Image::V2::Image
 #      id="67c4d02c-5601-4619-bd14-d2f7f96a046c",
 #      name="cirros",
 #      visibility="private",
@@ -392,12 +392,12 @@ cirros.destroy
 List domains (Keystone V3 only):
 
 ```ruby
-identity = Fog::Identity::OpenStack.new(@connection_params)
+identity = Fog::OpenStack::Identity.new(@connection_params)
 
 identity.domains
-# =>   <Fog::Identity::OpenStack::V3::Domains
+# =>   <Fog::OpenStack::Identity::V3::Domains
 #     [
-#                   <Fog::Identity::OpenStack::V3::Domain
+#                   <Fog::OpenStack::Identity::V3::Domain
 #         id="default",
 #         description="",
 #         enabled=true,
@@ -411,9 +411,9 @@ List projects (aka tenants):
 
 ```ruby
 identity.projects
-# =>   <Fog::Identity::OpenStack::V3::Projects
+# =>   <Fog::OpenStack::Identity::V3::Projects
 #     [
-#                   <Fog::Identity::OpenStack::V3::Project
+#                   <Fog::OpenStack::Identity::V3::Project
 #         id="008e5537d3424295a03560abc923693c",
 #         domain_id="default",
 #         description="Project 1",
@@ -425,7 +425,7 @@ identity.projects
 
 # On Keystone V2
 identity.tenants
-# =>   <Fog::Identity::OpenStack::V2::Tenants
+# =>   <Fog::OpenStack::Identity::V2::Tenants
 #     [ ... ]
 ```
 
@@ -433,7 +433,7 @@ List users:
 
 ```ruby
 identity.users
-# =>   <Fog::Identity::OpenStack::V3::Users
+# =>   <Fog::OpenStack::Identity::V3::Users
 #     [ ... ]
 ```
 
@@ -446,7 +446,7 @@ user = identity.users.create name: "test",
                              project_id: project_id,
                              email: "test@test.com",
                              password: "test"
-# =>   <Fog::Identity::OpenStack::V3::User
+# =>   <Fog::OpenStack::Identity::V3::User
 #     id="474a59153ebd4e709938e5e9b614dc57",
 #     default_project_id=nil,
 #     description=nil,
@@ -467,7 +467,7 @@ Create/destroy new tenant:
 
 project = identity.projects.create name: "test",
                                    description: "test"
-# =>   <Fog::Identity::OpenStack::V3::Project
+# =>   <Fog::OpenStack::Identity::V3::Project
 #     id="423559128a7249f2973cdb7d5d581c4d",
 #     domain_id="default",
 #     description="test",
@@ -486,7 +486,7 @@ Grant user role on tenant and revoke it:
 
 ```ruby
 role = identity.roles.select{|role| role.name == "_member_"}[0]
-# =>   <Fog::Identity::OpenStack::V3::Role
+# =>   <Fog::OpenStack::Identity::V3::Role
 #     id="9fe2ff9ee4384b1894a90878d3e92bab",
 #     name="_member_",
 #   >
@@ -502,7 +502,7 @@ Set up a project's public gateway (needed for external access):
 
 ```ruby
 
-identity  = Fog::Identity::OpenStack.new(@connection_params)
+identity  = Fog::OpenStack::Identity.new(@connection_params)
 
 tenants = identity.projects.select do |project|
   project.name == @connection_params[:openstack_project_name]
@@ -510,7 +510,7 @@ end
 
 tenant_id = tenants[0].id
 
-neutron = Fog::Network::OpenStack.new(@connection_params)
+neutron = Fog::OpenStack::Network.new(@connection_params)
 
 network = neutron.networks.create name:      "default",
                                   tenant_id: tenant_id

data/docs/compute.md

@@ -16,7 +16,7 @@ Once `irb` has launched you need to require the Fog library by executing:
 
 Next, create a connection to the Compute Service:
 
-	service = Fog::Compute::OpenStack.new({
+	service = Fog::OpenStack::Compute.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
@@ -71,7 +71,7 @@ This will return:
 	{"flavors"=>[{"id"=>"1", "links"=>[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/1", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/1", "rel"=>"bookmark"}], "name"=>"m1.tiny"}, {"id"=>"2", "links"=>[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/2", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/2", "rel"=>"bookmark"}], "name"=>"m1.small"}, {"id"=>"3", "links"=>[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/3", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/3", "rel"=>"bookmark"}], "name"=>"m1.medium"}, {"id"=>"4", "links"=>[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/4", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/4", "rel"=>"bookmark"}], "name"=>"m1.large"}, {"id"=>"42", "links"=>[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/42", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/42", "rel"=>"bookmark"}], "name"=>"m1.nano"}, {"id"=>"5", "links"=>[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/5", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/5", "rel"=>"bookmark"}], "name"=>"m1.xlarge"}, {"id"=>"84", "links"=>[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/84", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/84", "rel"=>"bookmark"}], "name"=>"m1.micro"}]}
 
 
-To learn more about Compute request methods refer to [rdoc](http://rubydoc.info/gems/fog/Fog/Compute/Openstack/Real). To learn more about Excon refer to [Excon GitHub repo](https://github.com/geemus/excon).
+To learn more about Compute request methods refer to [rdoc](http://rubydoc.info/gems/fog/fog/openstack/compute/Real). To learn more about Excon refer to [Excon GitHub repo](https://github.com/geemus/excon).
 
 ### Model Layer
 
@@ -137,13 +137,13 @@ To retrieve a list of available images:
 
 	service.images
 
-This returns a collection of `Fog::Compute::OpenStack::Image` models:
+This returns a collection of `Fog::OpenStack::Compute::Image` models:
 
-	<Fog::Compute::OpenStack::Images
+	<Fog::OpenStack::Compute::Images
     filters={},
     server=nil
     [
-      <Fog::Compute::OpenStack::Image
+      <Fog::OpenStack::Compute::Image
         id="821e2b73-5aed-4f9d-aaa7-2f4f297779f3",
         name="cirros-0.3.1-x86_64-uec",
         created_at="2013-07-11T19:59:19Z",
@@ -153,13 +153,13 @@ This returns a collection of `Fog::Compute::OpenStack::Image` models:
         minDisk=0,
         minRam=0,
         server=nil,
-        metadata=        <Fog::Compute::OpenStack::Metadata
+        metadata=        <Fog::OpenStack::Compute::Metadata
           [
-            <Fog::Compute::OpenStack::Metadatum
+            <Fog::OpenStack::Compute::Metadatum
               key="kernel_id",
               value="f443896b-089c-40e7-8712-bb48a676a8de"
             >,
-            <Fog::Compute::OpenStack::Metadatum
+            <Fog::OpenStack::Compute::Metadatum
               key="ramdisk_id",
               value="e21af7e2-a181-403a-84a4-fd9df36cb963"
             >
@@ -167,7 +167,7 @@ This returns a collection of `Fog::Compute::OpenStack::Image` models:
         >,
         links=[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/images/821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/images/821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "rel"=>"bookmark"}, {"href"=>"http://localhost:9292/b5bf8e689bc64844b1d08094a2f2bdd5/images/821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "type"=>"application/vnd.openstack.image", "rel"=>"alternate"}]
       >,
-      <Fog::Compute::OpenStack::Image
+      <Fog::OpenStack::Compute::Image
         id="e21af7e2-a181-403a-84a4-fd9df36cb963",
         name="cirros-0.3.1-x86_64-uec-ramdisk",
         created_at="2013-07-11T19:59:18Z",
@@ -177,7 +177,7 @@ This returns a collection of `Fog::Compute::OpenStack::Image` models:
         minDisk=0,
         minRam=0,
         server=nil,
-        metadata=        <Fog::Compute::OpenStack::Metadata
+        metadata=        <Fog::OpenStack::Compute::Metadata
           []
         >,
         links=[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/images/e21af7e2-a181-403a-84a4-fd9df36cb963", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/images/e21af7e2-a181-403a-84a4-fd9df36cb963", "rel"=>"bookmark"}, {"href"=>"http://localhost:9292/b5bf8e689bc64844b1d08094a2f2bdd5/images/e21af7e2-a181-403a-84a4-fd9df36cb963", "type"=>"application/vnd.openstack.image", "rel"=>"alternate"}]
@@ -190,9 +190,9 @@ To retrieve individual image:
 
 	service.images.get "821e2b73-5aed-4f9d-aaa7-2f4f297779f3"
 
-This returns an `Fog::Compute::OpenStack::Image` instance:
+This returns an `Fog::OpenStack::Compute::Image` instance:
 
-    <Fog::Compute::OpenStack::Image
+    <Fog::OpenStack::Compute::Image
     id="821e2b73-5aed-4f9d-aaa7-2f4f297779f3",
     name="cirros-0.3.1-x86_64-uec",
     created_at="2013-07-11T19:59:19Z",
@@ -202,13 +202,13 @@ This returns an `Fog::Compute::OpenStack::Image` instance:
     minDisk=0,
     minRam=0,
     server=nil,
-    metadata=    <Fog::Compute::OpenStack::Metadata
+    metadata=    <Fog::OpenStack::Compute::Metadata
       [
-        <Fog::Compute::OpenStack::Metadatum
+        <Fog::OpenStack::Compute::Metadatum
           key="kernel_id",
           value="f443896b-089c-40e7-8712-bb48a676a8de"
         >,
-        <Fog::Compute::OpenStack::Metadatum
+        <Fog::OpenStack::Compute::Metadatum
           key="ramdisk_id",
           value="e21af7e2-a181-403a-84a4-fd9df36cb963"
         >
@@ -223,11 +223,11 @@ To retrieve a list of available flavors:
 
 	service.flavors
 
-This returns a collection of `Fog::Compute::OpenStack::Flavor` models:
+This returns a collection of `Fog::OpenStack::Compute::Flavor` models:
 
-    <Fog::Compute::OpenStack::Flavors
+    <Fog::OpenStack::Compute::Flavors
     [
-      <Fog::Compute::OpenStack::Flavor
+      <Fog::OpenStack::Compute::Flavor
         id="1",
         name="m1.tiny",
         ram=512,
@@ -240,7 +240,7 @@ This returns a collection of `Fog::Compute::OpenStack::Flavor` models:
         is_public=true,
         disabled=false
       >,
-      <Fog::Compute::OpenStack::Flavor
+      <Fog::OpenStack::Compute::Flavor
         id="2",
         name="m1.small",
         ram=2048,
@@ -262,9 +262,9 @@ To retrieve individual flavor:
 
 	service.flavors.get 1
 
-This returns a `Fog::Compute::OpenStack::Flavor` instance:
+This returns a `Fog::OpenStack::Compute::Flavor` instance:
 
-    <Fog::Compute::OpenStack::Flavor
+    <Fog::OpenStack::Compute::Flavor
     id="1",
     name="m1.tiny",
     ram=512,
@@ -284,19 +284,19 @@ To retrieve a list of available  servers:
 
 	service.servers
 
-This returns a collection of `Fog::Compute::OpenStack::Servers` models:
+This returns a collection of `Fog::OpenStack::Compute::Servers` models:
 
-    <Fog::Compute::OpenStack::Servers
+    <Fog::OpenStack::Compute::Servers
         filters={}
         [
-          <Fog::Compute::OpenStack::Server
+          <Fog::OpenStack::Compute::Server
             id="4572529c-0cfc-433e-8dbf-7cc383ed5b7c",
             instance_name=nil,
             addresses={"private"=>[{"OS-EXT-IPS-MAC:mac_addr"=>"fa:16:3e:14:34:b8", "version"=>4, "addr"=>"10.0.0.5", "OS-EXT-IPS:type"=>"fixed"}]},
             flavor={"id"=>"1", "links"=>[{"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/1", "rel"=>"bookmark"}]},
             host_id="bb705edc279c520d97ad6fbd0b8e75a5c716388616f58e527d0ff633",
             image={"id"=>"821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "links"=>[{"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/images/821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "rel"=>"bookmark"}]},
-            metadata=        <Fog::Compute::OpenStack::Metadata
+            metadata=        <Fog::OpenStack::Compute::Metadata
               []
             >,
             links=[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/servers/4572529c-0cfc-433e-8dbf-7cc383ed5b7c", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/servers/4572529c-0cfc-433e-8dbf-7cc383ed5b7c", "rel"=>"bookmark"}],
@@ -331,16 +331,16 @@ To return an individual server:
 
 	service.servers.get "4572529c-0cfc-433e-8dbf-7cc383ed5b7c"
 
-This returns a `Fog::Compute::OpenStack::Server` instance:
+This returns a `Fog::OpenStack::Compute::Server` instance:
 
-	<Fog::Compute::OpenStack::Server
+	<Fog::OpenStack::Compute::Server
             id="4572529c-0cfc-433e-8dbf-7cc383ed5b7c",
             instance_name=nil,
             addresses={"private"=>[{"OS-EXT-IPS-MAC:mac_addr"=>"fa:16:3e:14:34:b8", "version"=>4, "addr"=>"10.0.0.5", "OS-EXT-IPS:type"=>"fixed"}]},
             flavor={"id"=>"1", "links"=>[{"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/1", "rel"=>"bookmark"}]},
             host_id="bb705edc279c520d97ad6fbd0b8e75a5c716388616f58e527d0ff633",
             image={"id"=>"821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "links"=>[{"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/images/821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "rel"=>"bookmark"}]},
-            metadata=        <Fog::Compute::OpenStack::Metadata
+            metadata=        <Fog::OpenStack::Compute::Metadata
               []
             >,
             links=[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/servers/4572529c-0cfc-433e-8dbf-7cc383ed5b7c", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/servers/4572529c-0cfc-433e-8dbf-7cc383ed5b7c", "rel"=>"bookmark"}],
@@ -380,16 +380,16 @@ To create a server:
 
 **Note**: The `:name`, `:flavor_ref`, and `image_ref` attributes are required for server creation.
 
-This will return a `Fog::Compute::OpenStack::Server` instance:
+This will return a `Fog::OpenStack::Compute::Server` instance:
 
-	<Fog::Compute::OpenStack::Server
+	<Fog::OpenStack::Compute::Server
     id="81746324-94ab-44fb-9aa9-ee0b4d95fa34",
     instance_name=nil,
     addresses=nil,
     flavor=nil,
     host_id=nil,
     image=nil,
-    metadata=    <Fog::Compute::OpenStack::Metadata
+    metadata=    <Fog::OpenStack::Compute::Metadata
       []
     >,
     links=[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/servers/81746324-94ab-44fb-9aa9-ee0b4d95fa34", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/servers/81746324-94ab-44fb-9aa9-ee0b4d95fa34", "rel"=>"bookmark"}],
@@ -423,14 +423,14 @@ Notice that your server contains several `nil` attributes. To see the latest sta
 
 You can see that the server is currently being built:
 
-    <Fog::Compute::OpenStack::Server
+    <Fog::OpenStack::Compute::Server
     id="5f50aeff-a745-4cbc-9f8b-0356142e6f95",
     instance_name=nil,
     addresses={"private"=>[{"OS-EXT-IPS-MAC:mac_addr"=>"fa:16:3e:71:0d:c4", "version"=>4, "addr"=>"10.0.0.2", "OS-EXT-IPS:type"=>"fixed"}]},
     flavor={"id"=>"1", "links"=>[{"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/1", "rel"=>"bookmark"}]},
     host_id="bb705edc279c520d97ad6fbd0b8e75a5c716388616f58e527d0ff633",
     image={"id"=>"821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "links"=>[{"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/images/821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "rel"=>"bookmark"}]},
-    metadata=    <Fog::Compute::OpenStack::Metadata
+    metadata=    <Fog::OpenStack::Compute::Metadata
       []
     >,
     links=[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/servers/5f50aeff-a745-4cbc-9f8b-0356142e6f95", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/servers/5f50aeff-a745-4cbc-9f8b-0356142e6f95", "rel"=>"bookmark"}],
@@ -464,7 +464,7 @@ Fog can wait for the server to become ready as follows:
 
 	server.wait_for { ready? }
 
-**Note**: The `Fog::Compute::OpenStack::Server` instance returned from the create method contains a `password` attribute. The `password` attribute will NOT be present in subsequent retrievals either through `service.servers` or `service.servers.get my_server_id`.
+**Note**: The `Fog::OpenStack::Compute::Server` instance returned from the create method contains a `password` attribute. The `password` attribute will NOT be present in subsequent retrievals either through `service.servers` or `service.servers.get my_server_id`.
 
 ### Additional Parameters
 
@@ -481,7 +481,7 @@ The `create` method also supports the following key values:
 	</tr>
 	<tr>
 		<td>:personality</td>
-		<td>Array of files to be injected onto the server. Please refer to the Fog <a href="http://rubydoc.info/github/fog/fog/Fog/Compute/OpenStack/Server:personality">personality </a> API documentation for further information.</td>
+		<td>Array of files to be injected onto the server. Please refer to the Fog <a href="http://rubydoc.info/github/fog/fog/fog/openstack/compute/Server:personality">personality </a> API documentation for further information.</td>
 	</tr>
 </table>