fog-profitbricks 2.0.1 → 3.0.0

data/lib/fog/profitbricks/requests/compute/create_load_balancer.rb

@@ -36,47 +36,88 @@ module Fog
         #                                 See the NIC section for attribute definitions
         #
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#create-load-balancer]
-        def create_load_balancer(datacenter_id, properties={}, entities={})
+        def create_load_balancer(datacenter_id, properties = {}, entities = {})
           load_balancer = {
-              :properties => properties,
-              :entities   => entities
+            :properties => properties,
+            :entities => entities
           }
 
           request(
-              :expects  => [202],
-              :method   => 'POST',
-              :path     => "/datacenters/#{datacenter_id}/loadbalancers",
-              :body     => Fog::JSON.encode(load_balancer)
+            :expects  => [202],
+            :method   => 'POST',
+            :path     => "/datacenters/#{datacenter_id}/loadbalancers",
+            :body     => Fog::JSON.encode(load_balancer)
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
       class Mock
-        def create_load_balancer(datacenter_id, properties={}, entities={})
+        def create_load_balancer(datacenter_id, properties = {}, _entities = {})
           response = Excon::Response.new
           response.status = 202
 
-          load_balancer_id = Fog::UUID.uuid
+          load_balancer_id  = Fog::UUID.uuid
+          nic_1_id          = Fog::UUID.uuid
+          serv_1_id         = Fog::UUID.uuid
+
           load_balancer = {
-              'id'          => load_balancer_id,
-              'type'        => 'nic',
-              'href'        => "https://api.profitbricks.com/rest/v2/datacenters/#{datacenter_id}/loadbalancers/#{load_balancer_id}",
-              'metadata'    => {
-                  'createdDate'       => '2015-03-18T19:00:51Z',
-                  'createdBy'         => 'test@stackpointcloud.com',
-                  'etag'              => 'faa67fbacb1c0e2e02cf9650657251f2',
-                  'lastModifiedDate'  => '2015-03-18T19:00:51Z',
-                  'lastModifiedBy'    => 'test@stackpointcloud.com',
-                  'state'             => 'AVAILABLE'
-              },
-              'properties'      => properties,
-              'entities'        => entities,
-              'datacenter_id'  => datacenter_id
+            'id' => load_balancer_id,
+            'type'        => 'nic',
+            'href'        => "https://api.profitbricks.com/rest/v2/datacenters/#{datacenter_id}/loadbalancers/#{load_balancer_id}",
+            'metadata'    => {
+              'createdDate' => '2015-03-18T19:00:51Z',
+              'createdBy'         => 'test@stackpointcloud.com',
+              'etag'              => 'faa67fbacb1c0e2e02cf9650657251f2',
+              'lastModifiedDate'  => '2015-03-18T19:00:51Z',
+              'lastModifiedBy'    => 'test@stackpointcloud.com',
+              'state'             => 'AVAILABLE'
+            },
+            'properties'      => properties,
+            'entities'        => {
+              'balancednics' => {
+                'id'    => "#{load_balancer_id}/balancednics",
+                'type'  => 'collection',
+                'href'  => "https=>//api.profitbricks.com/rest/v2/datacenters/#{datacenter_id}/loadbalancers/#{load_balancer_id}/balancednics",
+                'items' =>
+                [
+                  {
+                    'id'          => nic_1_id,
+                    'type'        => 'nic',
+                    'href'        => "https://api.profitbricks.com/rest/v2/datacenters/#{datacenter_id}/servers/#{serv_1_id}/nics/#{nic_1_id}",
+                    'metadata'    => {
+                      'createdDate'       => '2015-03-18T19:00:51Z',
+                      'createdBy'         => 'test@stackpointcloud.com',
+                      'etag'              => 'faa67fbacb1c0e2e02cf9650657251f1',
+                      'lastModifiedDate'  => '2015-03-18T19:00:51Z',
+                      'lastModifiedBy'    => 'test@stackpointcloud.com',
+                      'state'             => 'AVAILABLE'
+                    },
+                    'properties' => {
+                      'name'            => 'FogTestLoadBalancedNIC_1',
+                      'mac'             => '02:01:36:5f:09:da',
+                      'ips'             => ['10.9.194.12'],
+                      'dhcp'            => 'true',
+                      'lan'             => 2,
+                      'firewallActive'  => 'false'
+                    },
+                    'entities' => {
+                      'firewallrules' => {
+                        'id'    => "#{nic_1_id}/firewallrules",
+                        'type'  => 'collection',
+                        'href'  => "https://api.profitbricks.com/rest/v2/datacenters/#{datacenter_id}/servers/#{serv_1_id}/nics/#{nic_1_id}/firewallrules",
+                        'items' => []
+                      }
+                    },
+                    'datacenter_id' => datacenter_id,
+                    'load_balancer_id' => load_balancer_id
+                  }
+                ]
+              }
+            },
+            'datacenter_id' => datacenter_id
           }
 
-          self.data[:load_balancers]['items'] << load_balancer
+          data[:load_balancers]['items'] << load_balancer
           response.body = load_balancer
 
           response

data/lib/fog/profitbricks/requests/compute/create_nic.rb

@@ -72,48 +72,46 @@ module Fog
         #                                           portRangeEnd value null to allow all ports
         #
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#create-a-nic]
-        def create_nic(datacenter_id, server_id, options={}, entities={})
+        def create_nic(datacenter_id, server_id, options = {}, entities = {})
           nic = {
-              :properties => options,
-              :entities   => entities
+            :properties => options,
+            :entities => entities
           }
 
           request(
-              :expects  => [202],
-              :method   => 'POST',
-              :path     => "/datacenters/#{datacenter_id}/servers/#{server_id}/nics",
-              :body     => Fog::JSON.encode(nic)
+            :expects  => [202],
+            :method   => 'POST',
+            :path     => "/datacenters/#{datacenter_id}/servers/#{server_id}/nics",
+            :body     => Fog::JSON.encode(nic)
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
       class Mock
-        def create_nic(datacenter_id, server_id, options={}, entities={})
+        def create_nic(datacenter_id, server_id, options = {}, entities = {})
           response = Excon::Response.new
           response.status = 202
 
           nic_id = Fog::UUID.uuid
           nic = {
-              'id'          => nic_id,
-              'type'        => 'nic',
-              'href'        => "https://api.profitbricks.com/rest/v2/datacenters/#{datacenter_id}/servers/#{server_id}/nics/#{nic_id}",
-              'metadata'    => {
-                  'createdDate'       => '2015-03-18T19:00:51Z',
-                  'createdBy'         => 'test@stackpointcloud.com',
-                  'etag'              => 'faa67fbacb1c0e2e02cf9650657251f2',
-                  'lastModifiedDate'  => '2015-03-18T19:00:51Z',
-                  'lastModifiedBy'    => 'test@stackpointcloud.com',
-                  'state'             => 'AVAILABLE'
-              },
-              'properties'      => options,
-              'entities'        => entities,
-              'datacenter_id'  => datacenter_id,
-              'server_id'       => server_id
+            'id' => nic_id,
+            'type'        => 'nic',
+            'href'        => "https://api.profitbricks.com/rest/v2/datacenters/#{datacenter_id}/servers/#{server_id}/nics/#{nic_id}",
+            'metadata'    => {
+              'createdDate' => '2015-03-18T19:00:51Z',
+              'createdBy'         => 'test@stackpointcloud.com',
+              'etag'              => 'faa67fbacb1c0e2e02cf9650657251f2',
+              'lastModifiedDate'  => '2015-03-18T19:00:51Z',
+              'lastModifiedBy'    => 'test@stackpointcloud.com',
+              'state'             => 'AVAILABLE'
+            },
+            'properties'      => options,
+            'entities'        => entities,
+            'datacenter_id' => datacenter_id,
+            'server_id' => server_id
           }
 
-          self.data[:nics]['items'] << nic
+          data[:nics]['items'] << nic
           response.body = nic
 
           response

data/lib/fog/profitbricks/requests/compute/create_server.rb

@@ -116,33 +116,37 @@ module Fog
         #                 * items<~Array>             - An array of individual firewall rules associated to the NIC
         #
         # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#create-a-server]
-        def create_server(datacenter_id, properties={}, entities={})
+        def create_server(datacenter_id, properties = {}, entities = {})
           server = {
-              :properties => properties,
-              :entities   => entities
+            :properties => properties,
+            :entities => entities
           }
 
           request(
-              :expects  => [202],
-              :method   => 'POST',
-              :path     => "/datacenters/#{datacenter_id}/servers",
-              :body     => Fog::JSON.encode(server)
+            :expects  => [202],
+            :method   => 'POST',
+            :path     => "/datacenters/#{datacenter_id}/servers",
+            :body     => Fog::JSON.encode(server)
           )
-        rescue => error
-          Fog::Errors::NotFound.new(error)
         end
       end
 
       class Mock
-        def create_server(datacenter_id, properties={}, entities={})
+        def create_server(datacenter_id, properties = {}, entities = {})
           server_id = Fog::UUID.uuid
-          volume_id = entities[:volumes]['items'][0]['id']
-          
+
+          volume_id = if entities[:volumes] && entities[:volumes]['items'] && entities[:volumes]['items'][0] && entities[:volumes]['items'][0]['id']
+                        entities[:volumes]['items'][0]['id']
+                      else
+                        Fog::UUID.uuid
+                      end
+
           server = {
             'id'    => server_id,
             'type'  => 'server',
             'href'  => "https=>//api.profitbricks.com/rest/v2/datacenters/#{datacenter_id}/servers/#{server_id}",
-            'metadata'    => {
+            'datacenter_id' => datacenter_id,
+            'metadata' => {
               'createdDate'       => '2014-10-20T21:20:46Z',
               'createdBy'         => 'test@stackpointcloud.com',
               'etag'              => '0018832d7a7ba455db74ac41ae9f11fe',
@@ -150,15 +154,18 @@ module Fog
               'lastModifiedBy'    => 'test@stackpointcloud.com',
               'state'             => 'AVAILABLE'
             },
-            'properties'  => {
+            'properties' => {
               'name'              => properties[:name],
               'cores'             => properties[:cores],
               'ram'               => properties[:ram],
               'availabilityZone'  => properties[:availabilityZone],
               'vmState'           => 'RUNNING',
               'cpuFamily' => properties[:cpuFamily]
-            },
-            'entities'    => {
+            }
+          }
+
+          if entities[:volumes]
+            server['entities'] = {
               'volumes' => {
                 'id'    => "#{server_id}/volumes",
                 'type'  => 'collection',
@@ -177,7 +184,7 @@ module Fog
                       'lastModifiedBy'    => 'test@stackpointcloud.com',
                       'state'             => 'AVAILABLE'
                     },
-                    'properties'  => {
+                    'properties' => {
                       'name'                => 'FogRestTestVolume',
                       'type'                => 'HDD',
                       'size'                => 5,
@@ -198,52 +205,54 @@ module Fog
                     }
                   }
                 ]
-              },
-              'cdroms'  => {
-                'id'    => "#{server_id}/cdroms",
-                'type'  => 'collection',
-                'href'  => "https=>//api.profitbricks.com/rest/v2/datacenters/#{datacenter_id}/servers/#{server_id}/cdroms",
-                'items' =>
-                [
-                  {
-                    'id'        => 'dfcb40db-28b5-11e6-9336-52540005ab80',
-                    'type'      => 'image',
-                    'href'      => 'https=>//api.profitbricks.com/rest/v2/images/dfcb40db-28b5-11e6-9336-52540005ab80',
-                    'metadata'  => {
-                      'createdDate'       => '2016-06-02T11:33:49Z',
-                      'createdBy'         => 'System',
-                      'etag'              => '9909709d99655c6f31aca789998d7d89',
-                      'lastModifiedDate'  => '2016-06-02T11:33:49Z',
-                      'lastModifiedBy'    => 'System',
-                      'state'             => 'AVAILABLE'
-                    },
-                    'properties'  => {
-                      'name'                => 'CentOS-6.8-x86_64-netinstall.iso',
-                      'description'         => '',
-                      'location'            => 'us/las',
-                      'size'                => 0.23,
-                      'cpuHotPlug'          => 'true',
-                      'cpuHotUnplug'        => 'false',
-                      'ramHotPlug'          => 'true',
-                      'ramHotUnplug'        => 'false',
-                      'nicHotPlug'          => 'true',
-                      'nicHotUnplug'        => 'true',
-                      'discVirtioHotPlug'   => 'true',
-                      'discVirtioHotUnplug' => 'true',
-                      'discScsiHotPlug'     => 'false',
-                      'discScsiHotUnplug'   => 'false',
-                      'licenceType'         => 'LINUX',
-                      'imageType'           => 'CDROM',
-                      'public'              => 'true'
-                    }
-                  }
-                ]
               }
-            },
-            'datacenter_id' => datacenter_id
-          }
+            }
+          end
+
+          if entities[:cdroms]
+            server['entities']['cdroms'] = {
+              'id'    => "#{server_id}/cdroms",
+              'type'  => 'collection',
+              'href'  => "https=>//api.profitbricks.com/rest/v2/datacenters/#{datacenter_id}/servers/#{server_id}/cdroms",
+              'items' =>
+              [
+                {
+                  'id'        => 'dfcb40db-28b5-11e6-9336-52540005ab80',
+                  'type'      => 'image',
+                  'href'      => 'https=>//api.profitbricks.com/rest/v2/images/dfcb40db-28b5-11e6-9336-52540005ab80',
+                  'metadata'  => {
+                    'createdDate'       => '2016-06-02T11:33:49Z',
+                    'createdBy'         => 'System',
+                    'etag'              => '9909709d99655c6f31aca789998d7d89',
+                    'lastModifiedDate'  => '2016-06-02T11:33:49Z',
+                    'lastModifiedBy'    => 'System',
+                    'state'             => 'AVAILABLE'
+                  },
+                  'properties' => {
+                    'name'                => 'CentOS-6.8-x86_64-netinstall.iso',
+                    'description'         => '',
+                    'location'            => 'us/las',
+                    'size'                => 0.23,
+                    'cpuHotPlug'          => 'true',
+                    'cpuHotUnplug'        => 'false',
+                    'ramHotPlug'          => 'true',
+                    'ramHotUnplug'        => 'false',
+                    'nicHotPlug'          => 'true',
+                    'nicHotUnplug'        => 'true',
+                    'discVirtioHotPlug'   => 'true',
+                    'discVirtioHotUnplug' => 'true',
+                    'discScsiHotPlug'     => 'false',
+                    'discScsiHotUnplug'   => 'false',
+                    'licenceType'         => 'LINUX',
+                    'imageType'           => 'CDROM',
+                    'public'              => 'true'
+                  }
+                }
+              ]
+            }
+          end
 
-          self.data[:servers]['items'] << server
+          data[:servers]['items'] << server
 
           response = Excon::Response.new
           response.status = 202

data/lib/fog/profitbricks/requests/compute/create_volume.rb

@@ -1,133 +1,133 @@
 module Fog
-    module Compute
-        class ProfitBricks
-            class Real
-                # Creates a volume within the data center. This will NOT attach the volume to a server.
-                #
-                # ==== Parameters
-                # * datacenter_id<~String> - Required, UUID of virtual data center
-                # * options<~Hash>:
-                #   * name<~String>           - The name of the volume
-                #   * size<~Integer>          - Required, the size of the volume in GB
-                #   * bus<~String>            - The bus type of the volume (VIRTIO or IDE). Default: VIRTIO.
-                #   * image<~String>          - Required**, the image or snapshot ID
-                #   * type<~String>           - The volume type, HDD or SSD
-                #   * licenceType<~String>    - Required**, the licence type of the volume. Options: LINUX, WINDOWS, UNKNOWN, OTHER
-                #   * imagePassword<~String>  - One-time password is set on the Image for the appropriate account.
-                #                               This field may only be set in creation requests. When reading, it always returns null.
-                #                               Password has to contain 8-50 characters.
-                #                               Only these characters are allowed: [abcdefghjkmnpqrstuvxABCDEFGHJKLMNPQRSTUVX23456789]
-                #   * sshKeys<~String>        - SSH keys to allow access to the volume via SSH
-                #
-                #   ** Either the image or the licenceType parameters need to be provided.
-                #      licenceType is required, but if image is supplied, it will already have a licenceType set.
-                #
-                # ==== Returns
-                # * response<~Excon::Response>:
-                #   * body<~Hash>:
-                #     * id<~String>                   - The resource's unique identifier
-                #     * type<~String>                 - The type of the created resource
-                #     * href<~String>                 - URL to the object's representation (absolute path)
-                #     * metadata<~Hash>               - Hash containing the volume metadata
-                #       * createdDate<~String>        - The date the resource was created
-                #       * createdBy<~String>          - The user who created the resource
-                #       * etag<~String>               - The etag for the resource
-                #       * lastModifiedDate<~String>   - The last time the resource has been modified
-                #       * lastModifiedBy<~String>     - The user who last modified the resource
-                #       * state<~String>              - Volume state
-                #     * properties<~Hash>             - Hash containing the volume properties
-                #       * name<~String>               - The name of the volume.
-                #       * type<~String>               - The volume type, HDD or SSD.
-                #       * size<~Integer>              - The size of the volume in GB.
-                #       * image<~String>              - The image or snapshot ID.
-                #       * imagePassword<~String>      - Indicates if a password is set on the image.
-                #       * sshKeys<~String>	          - SSH keys
-                #       * bus<~String>                - The bus type of the volume (VIRTIO or IDE). Default: VIRTIO.
-                #       * licenceType<~String>        - Volume licence type. ( WINDOWS, LINUX, OTHER, UNKNOWN)
-                #       * cpuHotPlug<~Boolean>        - This volume is capable of CPU hot plug (no reboot required)
-                #       * cpuHotUnplug<~Boolean>      - This volume is capable of CPU hot unplug (no reboot required)
-                #       * ramHotPlug<~Boolean>        - This volume is capable of memory hot plug (no reboot required)
-                #       * ramHotUnplug<~Boolean>      - This volume is capable of memory hot unplug (no reboot required)
-                #       * nicHotPlug<~Boolean>        - This volume is capable of nic hot plug (no reboot required)
-                #       * nicHotUnplug<~Boolean>      - This volume is capable of nic hot unplug (no reboot required)
-                #       * discVirtioHotPlug<~Boolean> - This volume is capable of Virt-IO drive hot plug (no reboot required)
-                #       * discVirtioHotPlug<~Boolean> - This volume is capable of Virt-IO drive hot unplug (no reboot required)
-                #       * discScsiHotPlug<~Boolean>   - This volume is capable of Scsi drive hot plug (no reboot required)
-                #       * discScsiHotUnplug<~Boolean> - This volume is capable of Scsi drive hot unplug (no reboot required)
-                #       * deviceNumber<~Integer>      - The LUN ID of the volume volume
-                #
-                # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#create-volume]
-                def create_volume(datacenter_id, options={})
-                    volume = {
-                        :properties => options
-                    }
+  module Compute
+    class ProfitBricks
+      class Real
+        # Creates a volume within the data center. This will NOT attach the volume to a server.
+        #
+        # ==== Parameters
+        # * datacenter_id<~String> - Required, UUID of virtual data center
+        # * options<~Hash>:
+        #   * name<~String>           - The name of the volume
+        #   * size<~Integer>          - Required, the size of the volume in GB
+        #   * bus<~String>            - The bus type of the volume (VIRTIO or IDE). Default: VIRTIO.
+        #   * image<~String>          - Required**, the image or snapshot ID
+        #   * type<~String>           - The volume type, HDD or SSD
+        #   * licenceType<~String>    - Required**, the licence type of the volume. Options: LINUX, WINDOWS, UNKNOWN, OTHER
+        #   * imagePassword<~String>  - One-time password is set on the Image for the appropriate account.
+        #                               This field may only be set in creation requests. When reading, it always returns null.
+        #                               Password has to contain 8-50 characters.
+        #                               Only these characters are allowed: [abcdefghjkmnpqrstuvxABCDEFGHJKLMNPQRSTUVX23456789]
+        #   * sshKeys<~String>        - SSH keys to allow access to the volume via SSH
+        #
+        #   ** Either the image or the licenceType parameters need to be provided.
+        #      licenceType is required, but if image is supplied, it will already have a licenceType set.
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * id<~String>                   - The resource's unique identifier
+        #     * type<~String>                 - The type of the created resource
+        #     * href<~String>                 - URL to the object's representation (absolute path)
+        #     * metadata<~Hash>               - Hash containing the volume metadata
+        #       * createdDate<~String>        - The date the resource was created
+        #       * createdBy<~String>          - The user who created the resource
+        #       * etag<~String>               - The etag for the resource
+        #       * lastModifiedDate<~String>   - The last time the resource has been modified
+        #       * lastModifiedBy<~String>     - The user who last modified the resource
+        #       * state<~String>              - Volume state
+        #     * properties<~Hash>             - Hash containing the volume properties
+        #       * name<~String>               - The name of the volume.
+        #       * type<~String>               - The volume type, HDD or SSD.
+        #       * size<~Integer>              - The size of the volume in GB.
+        #       * image<~String>              - The image or snapshot ID.
+        #       * imagePassword<~String>      - Indicates if a password is set on the image.
+        #       * sshKeys<~String>	          - SSH keys
+        #       * bus<~String>                - The bus type of the volume (VIRTIO or IDE). Default: VIRTIO.
+        #       * licenceType<~String>        - Volume licence type. ( WINDOWS, LINUX, OTHER, UNKNOWN)
+        #       * cpuHotPlug<~Boolean>        - This volume is capable of CPU hot plug (no reboot required)
+        #       * cpuHotUnplug<~Boolean>      - This volume is capable of CPU hot unplug (no reboot required)
+        #       * ramHotPlug<~Boolean>        - This volume is capable of memory hot plug (no reboot required)
+        #       * ramHotUnplug<~Boolean>      - This volume is capable of memory hot unplug (no reboot required)
+        #       * nicHotPlug<~Boolean>        - This volume is capable of nic hot plug (no reboot required)
+        #       * nicHotUnplug<~Boolean>      - This volume is capable of nic hot unplug (no reboot required)
+        #       * discVirtioHotPlug<~Boolean> - This volume is capable of Virt-IO drive hot plug (no reboot required)
+        #       * discVirtioHotPlug<~Boolean> - This volume is capable of Virt-IO drive hot unplug (no reboot required)
+        #       * discScsiHotPlug<~Boolean>   - This volume is capable of Scsi drive hot plug (no reboot required)
+        #       * discScsiHotUnplug<~Boolean> - This volume is capable of Scsi drive hot unplug (no reboot required)
+        #       * deviceNumber<~Integer>      - The LUN ID of the volume volume
+        #
+        # {ProfitBricks API Documentation}[https://devops.profitbricks.com/api/cloud/v2/#create-volume]
+        def create_volume(datacenter_id, options = {})
+          volume = {
+            :properties => options
+          }
 
-                    request(
-                        :expects  => [202],
-                        :method   => 'POST',
-                        :path     => "/datacenters/#{datacenter_id}/volumes",
-                        :body     => Fog::JSON.encode(volume)
-                    )
-                rescue => error
-                    Fog::Errors::NotFound.new(error)
-                end
-            end
+          request(
+            :expects => [202],
+            :method   => 'POST',
+            :path     => "/datacenters/#{datacenter_id}/volumes",
+            :body     => Fog::JSON.encode(volume)
+          )
+        end
+      end
+
+      class Mock
+        def create_volume(datacenter_id, options = {})
+          response = Excon::Response.new
+          response.status = 202
 
-            class Mock
-                def create_volume(datacenter_id, options={})
-                    response = Excon::Response.new
-                    response.status = 202
+          if datacenter = data[:datacenters]['items'].find do |attrib|
+            attrib['id'] == datacenter_id
+          end
 
-                    if datacenter = self.data[:datacenters]['items'].find {
-                        |attrib| attrib['id'] == datacenter_id
-                    }
-                      datacenter['properties']['version'] += 1
-                    else
-                        raise Fog::Errors::NotFound.new('Data center resource could not be found')
-                    end
+            datacenter['version'] += 1 if datacenter['version']
+          else
+            raise Fog::Errors::NotFound, 'Data center resource could not be found'
+          end
 
-                    volume_id = Fog::UUID.uuid
+          volume_id = Fog::UUID.uuid
 
-                    volume = {
-                        'id'        => volume_id,
-                        'type'      => 'volume',
-                        'href'      => "https=>//api.profitbricks.com/rest/v2/datacenters/#{datacenter['id']}/volumes/#{volume_id}",
-                        'metadata'  => {
-                            'createdDate'       => '2015-03-18T19=>00=>51Z',
-                            'createdBy'         => 'test@stackpointcloud.com',
-                            'etag'              => 'c4a2fde6ba91a038ff953b939cc21efe',
-                            'lastModifiedDate'  => '2015-03-18T19=>00=>51Z',
-                            'lastModifiedBy'    => 'test@stackpointcloud.com',
-                            'state'             => 'AVAILABLE'
-                        },
-                        'properties' => {
-                            'name'                => options[:name],
-                            'type'                => options[:type],
-                            'size'                => options[:size],
-                            'image'               => options[:image],
-                            'bus'                 => 'VIRTIO',
-                            'licenceType'         => 'OTHER',
-                            'cpuHotPlug'          => 'true',
-                            'cpuHotUnplug'        => 'false',
-                            'ramHotPlug'          => 'false',
-                            'ramHotUnplug'        => 'false',
-                            'nicHotPlug'          => 'true',
-                            'nicHotUnplug'        => 'true',
-                            'discVirtioHotPlug'   => 'true',
-                            'discVirtioHotUnplug' => 'true',
-                            'discScsiHotPlug'     => 'false',
-                            'discScsiHotUnplug'   => 'false',
-                            'deviceNumber'        => 1
-                        },
-                        'datacenter_id'  => datacenter['id']
-                    }
+          volume = {
+            'id' => volume_id,
+            'type'      => 'volume',
+            'href'      => "https=>//api.profitbricks.com/rest/v2/datacenters/#{datacenter['id']}/volumes/#{volume_id}",
+            'metadata'  => {
+              'createdDate' => '2015-03-18T19=>00=>51Z',
+              'createdBy'         => 'test@stackpointcloud.com',
+              'etag'              => 'c4a2fde6ba91a038ff953b939cc21efe',
+              'lastModifiedDate'  => '2015-03-18T19=>00=>51Z',
+              'lastModifiedBy'    => 'test@stackpointcloud.com',
+              'state'             => 'AVAILABLE'
+            },
+            'properties' => {
+              'name' => options[:name],
+              'type'                => options[:type],
+              'size'                => options[:size],
+              'image'               => options[:image],
+              'availabilityZone'    => options[:availabilityZone],
+              'bus'                 => 'VIRTIO',
+              'licenceType'         => 'OTHER',
+              'cpuHotPlug'          => 'true',
+              'cpuHotUnplug'        => 'false',
+              'ramHotPlug'          => 'false',
+              'ramHotUnplug'        => 'false',
+              'nicHotPlug'          => 'true',
+              'nicHotUnplug'        => 'true',
+              'discVirtioHotPlug'   => 'true',
+              'discVirtioHotUnplug' => 'true',
+              'discScsiHotPlug'     => 'false',
+              'discScsiHotUnplug'   => 'false',
+              'deviceNumber'        => 1
+            },
+            'datacenter_id' => datacenter['id']
+          }
 
-                    self.data[:volumes]['items'] << volume
+          data[:volumes]['items'] << volume
 
-                    response.body = volume
-                    response
-                end
-            end
+          response.body = volume
+          response
         end
+      end
     end
+  end
 end