fog 1.9.0 → 1.10.0

data/lib/fog/hp/requests/block_storage/list_bootable_volumes.rb

@@ -0,0 +1,53 @@
+module Fog
+  module HP
+    class BlockStorage
+      class Real
+
+        # List existing block storage bootbale volumes
+        #
+        # ==== Parameters
+        # None
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Array>:
+        #     * volumes<~Hash>:
+        #       * 'id'<~Integer>: - Id for the volume
+        #       * 'displayName'<~String>: - Name of the volume
+        #       * 'displayDescription'<~String>: - Description of the volume
+        #       * 'size'<~Integer>: - Size in GB for the volume
+        #       * 'status'<~String>: - Status of the volume i.e. "available"
+        #       * 'volumeType'<~String>: - Type of the volume
+        #       * 'snapshotId'<~String>: - Id of the source snapshot used to create volume
+        #       * 'sourceImageRef'<~String>: - Id of the source image used to create volume
+        #       * 'createdAt'<~String>: - Timestamp in UTC when volume was created
+        #       * 'availabilityZone'<~String>: - Availability zone i.e. "nova"
+        #       * attachments<~Array>: Array of hashes of attachments
+        #       * metadata<~Hash>: Hash of metadata for the volume
+        def list_bootable_volumes
+          response = request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "hp-bootable-volumes"
+          )
+          response
+        end
+
+      end
+
+      class Mock # :nodoc:all
+
+        def list_bootable_volumes
+          response = Excon::Response.new
+          volumes = []
+          volumes = self.data[:volumes].values unless self.data[:volumes].nil?
+
+          response.status = 200
+          response.body = { 'volumes' => volumes }
+          response
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/hp/requests/block_storage/list_snapshots.rb

@@ -0,0 +1,48 @@
+module Fog
+  module HP
+    class BlockStorage
+      class Real
+
+        # List existing block storage snapshots
+        #
+        # ==== Parameters
+        # None
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Array>:
+        #     * snapshots<~Hash>:
+        #       * 'id'<~Integer>: - Id for the snapshot
+        #       * 'displayName'<~String>: - Name of the snapshot
+        #       * 'displayDescription'<~String>: - Description of the snapshot
+        #       * 'size'<~Integer>: - Size in GB for the snapshot
+        #       * 'status'<~String>: - Status of the snapshot i.e. "available"
+        #       * 'volumeId'<~Integer>: - Id of the volume from which the snapshot was created
+        #       * 'createdAt'<~String>: - Timestamp in UTC when volume was created
+        def list_snapshots
+          response = request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => 'os-snapshots'
+          )
+          response
+        end
+
+      end
+
+      class Mock # :nodoc:all
+
+        def list_snapshots
+          response = Excon::Response.new
+          snapshots = []
+          snapshots = self.data[:snapshots].values unless self.data[:snapshots].nil?
+
+          response.status = 200
+          response.body = { 'snapshots' => snapshots }
+          response
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/hp/requests/block_storage/list_volumes.rb

@@ -0,0 +1,52 @@
+module Fog
+  module HP
+    class BlockStorage
+      class Real
+
+        # List existing block storage volumes
+        #
+        # ==== Parameters
+        # None
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Array>:
+        #     * volumes<~Hash>:
+        #       * 'id'<~Integer>: - Id for the volume
+        #       * 'displayName'<~String>: - Name of the volume
+        #       * 'displayDescription'<~String>: - Description of the volume
+        #       * 'size'<~Integer>: - Size in GB for the volume
+        #       * 'status'<~String>: - Status of the volume i.e. "available"
+        #       * 'volumeType'<~String>: - Type of the volume
+        #       * 'snapshotId'<~String>: - Id of the volume snapshot
+        #       * 'createdAt'<~String>: - Timestamp in UTC when volume was created
+        #       * 'availabilityZone'<~String>: - Availability zone i.e. "nova"
+        #       * attachments<~Array>: Array of hashes of attachments
+        #       * metadata<~Hash>: Hash of metadata for the volume
+        def list_volumes
+          response = request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => 'os-volumes'
+          )
+          response
+        end
+
+      end
+
+      class Mock # :nodoc:all
+
+        def list_volumes
+          response = Excon::Response.new
+          volumes = []
+          volumes = self.data[:volumes].values unless self.data[:volumes].nil?
+
+          response.status = 200
+          response.body = { 'volumes' => volumes }
+          response
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/hp/requests/compute/attach_volume.rb

@@ -0,0 +1,78 @@
+module Fog
+  module Compute
+    class HP
+      class Real
+
+        # Attach a block storage volume to an existing server
+        #
+        # ==== Parameters
+        # * server_id<~Integer> - Id of server to attach the volume to
+        # * volume_id<~Integer> - Id of the volume to be attached to the server
+        # * device<~String> - Device name that is the mount point that the volume will be attached to. e.g. /dev/sdf
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #   * 'volumeAttachment'<~Hash>:
+        #     * <~Hash>
+        #       *  'volumeId':<~Integer>  - The volume id
+        #       *  'device':<~String>  - The name of the device
+        def attach_volume(server_id, volume_id, device)
+          data = { 'volumeAttachment' =>
+                   { 'volumeId' => volume_id,
+                     'device'   => device
+                   }
+                 }
+          response = request(
+            :body     => Fog::JSON.encode(data),
+            :expects  => 200,
+            :method   => 'POST',
+            :path     => "servers/#{server_id}/os-volume_attachments"
+          )
+          response
+        end
+
+      end
+
+      class Mock  # :nodoc:all
+
+        def attach_volume(server_id, volume_id, device)
+          response = Excon::Response.new
+          if server = self.data[:servers][server_id]
+            # mock the case when the volume is already attached to the server
+            if server['volumeAttachments'] && server['volumeAttachments'].select {|v| v['id'] == volume_id}
+              response.status = 400
+              response.body = '{"badRequest": {"message": "Volume status must be available", "code": 400}}'
+              raise(Excon::Errors.status_error({:expects => 200}, response))
+            else
+              resp_data = { "volumeAttachment" =>
+                            {
+                              "volumeId" => volume_id,
+                              "id"       => volume_id
+                            }
+                          }
+              response.body = resp_data
+              response.status = 200
+
+              data = {
+                        "device"   => device,
+                        "serverId" => server_id,
+                        "id"       => volume_id,
+                        "volumeId" => volume_id,
+                     }
+              if server['volumeAttachments']
+                server['volumeAttachments'] << data
+              else
+                server['volumeAttachments'] = [data]
+              end
+            end
+          else
+            raise Fog::Compute::HP::NotFound
+          end
+          response
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/hp/requests/compute/create_image.rb

@@ -18,10 +18,7 @@ module Fog
         def create_image(server_id, name, metadata = {})
           body = { 'createImage' =>
                        { 'name' => name,
-                         'metadata' =>
-                             { 'ImageType' => metadata[:image_type],
-                               'ImageVersion' => metadata[:image_version]
-                             }
+                         'metadata' => metadata
                        }
                  }
           server_action(server_id, body)
@@ -39,19 +36,19 @@ module Fog
 
           data = {
             'id'        => image_id,
-            'server'    => {"id"=>"3", "links"=>[{"href"=>"http://nova1:8774/v1.1/servers/#{server_id}", "rel"=>"bookmark"}]},
+            'server'    => {"id"=>server_id, "links"=>[{"href"=>"http://nova1:8774/v1.1/servers/#{server_id}", "rel"=>"bookmark"}]},
             'links'     => [{"href"=>"http://nova1:8774/v1.1/tenantid/images/#{image_id}", "rel"=>"self"}, {"href"=>"http://nova1:8774/tenantid/images/#{image_id}", "rel"=>"bookmark"}],
             'metadata'  => metadata || {},
             'name'      => name || "image_#{rand(999)}",
             'progress'  => 0,
             'status'    => 'SAVING',
-            'updated'   => "",
-            'created'   => ""
+            'updated'   => "2012-01-01T13:32:20Z",
+            'created'   => "2012-01-01T13:32:20Z"
           }
 
           self.data[:last_modified][:images][data['id']] = Time.now
           self.data[:images][data['id']] = data
-          response.headers = {'Content-Length' => '0', 'Content-Type' => 'text/html; charset=UTF-8', 'Date' => Time.now, 'Location' => "http://nova1:8774/v1.1/images/#{@image_id}"}
+          response.headers = {'Content-Length' => '0', 'Content-Type' => 'text/html; charset=UTF-8', 'Date' => Time.now, 'Location' => "http://nova1:8774/v1.1/images/#{image_id}"}
           response.body = "" # { 'image' => data } no data is sent
           response
         end

data/lib/fog/hp/requests/compute/create_persistent_server.rb

@@ -0,0 +1,168 @@
+module Fog
+  module Compute
+    class HP
+      class Real
+
+        # Create a new persistent server i.e. use a bootable volume instead of an image
+        #
+        # ==== Parameters
+        # * name<~String> - Name of server
+        # * flavor_id<~Integer> - Id of flavor for server
+        # * block_device_mapping<~Array>: Use bootable volumes to create persistent instances
+        #   * <~Hash>:
+        #     * 'volume_size'<~String> - Size of the volume. Ignored, and automatically picked up from the volume
+        #     * 'volume_id'<~String> - Id of the bootable volume to use
+        #     * 'delete_on_termination'<~String> - Setting this to '1' (True) means that the volume gets deleted when the instance is killed. Set it to '0' to preserve the volume.
+        #     * 'device_name'<~String> - Block device name e.g. "vda"
+        # * options<~Hash>:
+        #   * 'metadata'<~Hash> - Up to 5 key value pairs containing 255 bytes of info
+        #   * 'min_count'<~Integer> - Number of servers to create. Defaults to 1.
+        #   * 'max_count'<~Integer> - Max. number of servers to create. Defaults to being equal to min_count.
+        #   * 'key_name'<~String> - Name of keypair to be used
+        #   * 'security_groups'<~Array> - one or more security groups to be used
+        #   * 'personality'<~Array>: Up to 5 files to customize server
+        #     * 'file'<~Hash>:
+        #       * 'contents'<~String> - Contents of file (10kb total of contents)
+        #       * 'path'<~String> - Path to file (255 bytes total of path strings)
+        #   * 'accessIPv4'<~String> - IPv4 IP address
+        #   * 'accessIPv6'<~String> - IPv6 IP address
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #   * 'server'<~Hash>:
+        #     * 'addresses'<~Hash>:
+        #       * 'private'<~Array> - private and public fixed and floating ip addresses
+        #     * 'flavor'<~Hash>
+        #       * 'id'<~String> - id of the flavor
+        #       * 'links'<~Array> - array of flavor links
+        #     * 'id'<~Integer> - id of server
+        #     * 'links'<~Array> - array of server links
+        #     * 'hostId'<~String>
+        #     * 'metadata'<~Hash> - metadata
+        #     * 'name'<~String> - name of server
+        #     * 'accessIPv4'<~String> - IPv4 ip address
+        #     * 'accessIPv6'<~String> - IPv6 ip address
+        #     * 'progress'<~Integer> - progress through current status
+        #     * 'status'<~String> - current server status
+        #     * 'created'<~String> - created date time stamp
+        #     * 'updated'<~String> - updated date time stamp
+        #     * 'user_id'<~String> - user id
+        #     * 'tenant_id'<~String> - tenant id
+        #     * 'uuid'<~String> - uuid of the server
+        #     * 'config_drive'<~String> - config drive
+        #     * 'security_groups'<~Array of Hash>
+        #       * 'id'<~Integer> - id of the security group
+        #       * 'name'<~String> - name of the security group
+        #       * 'links'<~Array> - array of security group links
+        #     * 'key_name'<~String> - name of the keypair
+        #     * 'adminPass'<~String> - admin password for server
+        def create_persistent_server(name, flavor_id, block_device_mapping = [], options = {})
+          data = {
+            'server' => {
+              'flavorRef'  => flavor_id,
+              'imageRef'   => nil,
+              'name'       => name
+            }
+          }
+          if options['metadata']
+            data['server']['metadata'] = options['metadata']
+          end
+          if options['accessIPv4']
+            data['server']['accessIPv4'] = options['accessIPv4']
+          end
+          if options['accessIPv6']
+            data['server']['accessIPv6'] = options['accessIPv6']
+          end
+          if options['personality']
+            data['server']['personality'] = []
+            for file in options['personality']
+              data['server']['personality'] << {
+                'contents'  => Base64.encode64(file['contents']),
+                'path'      => file['path']
+              }
+            end
+          end
+          min_count = options['min_count'] || 1
+          max_count = options['max_count'] || min_count
+          data['server']['min_count'] = min_count
+          data['server']['max_count'] = max_count
+
+          if options['key_name']
+            data['server']['key_name'] = options['key_name']
+          end
+          if options['security_groups']
+            data['server']['security_groups'] = []
+            for sg in options['security_groups']
+              data['server']['security_groups'] << {
+                'name' => sg
+              }
+            end
+          end
+          if options['config_drive']
+            data['server']['config_drive'] = options['config_drive']
+          end
+          if block_device_mapping
+            data['server']['block_device_mapping'] = block_device_mapping
+          end
+
+          request(
+            :body     => Fog::JSON.encode(data),
+            :expects  => 200,
+            :method   => 'POST',
+            :path     => 'os-volumes_boot'
+          )
+        end
+
+      end
+
+      class Mock
+
+        def create_persistent_server(name, flavor_id, block_device_mapping = [], options = {})
+          response = Excon::Response.new
+
+          if block_device_mapping && !block_device_mapping.empty?
+
+            if options['security_groups']
+              sec_group_name = options['security_groups'][0]
+            else
+              sec_group_name = "default"
+            end
+
+            data = {
+              'addresses' => { "private"=>[{"version"=>4, "addr"=>Fog::HP::Mock.ip_address}] },
+              'flavor'    => {"id"=>"#{flavor_id}", "links"=>[{"href"=>"http://nova1:8774/admin/flavors/#{flavor_id}", "rel"=>"bookmark"}]},
+              'id'        => Fog::Mock.random_numbers(6).to_i,
+              'links'     => [{"href"=>"http://nova1:8774/v1.1/admin/servers/5", "rel"=>"self"}, {"href"=>"http://nova1:8774/admin/servers/5", "rel"=>"bookmark"}],
+              'hostId'    => "123456789ABCDEF01234567890ABCDEF",
+              'metadata'  => options['metadata'] || {},
+              'name'      => name || "server_#{rand(999)}",
+              'accessIPv4'  => options['accessIPv4'] || "",
+              'accessIPv6'  => options['accessIPv6'] || "",
+              'progress'  => 0,
+              'status'    => 'BUILD',
+              'created'   => "2012-01-01T13:32:20Z",
+              'updated'   => "2012-01-01T13:32:20Z",
+              'user_id'   => Fog::HP::Mock.user_id.to_s,
+              'tenant_id' => Fog::HP::Mock.user_id.to_s,
+              'uuid'      => "95253a45-9ead-43c6-90b3-65da2ef048b3",
+              'config_drive' => "",
+              'security_groups' => [{"name"=>"#{sec_group_name}", "links"=>[{"href"=>"http://nova1:8774/v1.1/admin//os-security-groups/111", "rel"=>"bookmark"}], "id"=>111}],
+              'key_name'  => options['key_name'] || ""
+            }
+            self.data[:last_modified][:servers][data['id']] = Time.now
+            self.data[:servers][data['id']] = data
+            response.body = { 'server' => data.merge({'adminPass' => 'password'}) }
+            response.status = 200
+            response
+          else
+            response.status = 400
+            raise(Excon::Errors::BadRequest, "No boot volume or boot image specified")
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -8,16 +8,15 @@ module Fog
         # ==== Parameters
         # * name<~String> - Name of server
         # * flavor_id<~Integer> - Id of flavor for server
-        # * image_id<~Integer> - Id of image for server
+        # * image_id<~Integer> - Id of image for server. If block_device_mapping is passed, this is ignored.
         # * options<~Hash>:
         #   * 'metadata'<~Hash> - Up to 5 key value pairs containing 255 bytes of info
         #   * 'min_count'<~Integer> - Number of servers to create. Defaults to 1.
         #   * 'max_count'<~Integer> - Max. number of servers to create. Defaults to being equal to min_count.
         #   * 'key_name'<~String> - Name of keypair to be used
         #   * 'security_groups'<~Array> - one or more security groups to be used
-        #   * 'availability_zone'<~String> - the availability zone to be used
         #   * 'personality'<~Array>: Up to 5 files to customize server
-        #     * file<~Hash>:
+        #     * 'file'<~Hash>:
         #       * 'contents'<~String> - Contents of file (10kb total of contents)
         #       * 'path'<~String> - Path to file (255 bytes total of path strings)
         #   * 'accessIPv4'<~String> - IPv4 IP address
@@ -28,17 +27,34 @@ module Fog
         #   * body<~Hash>:
         #   * 'server'<~Hash>:
         #     * 'addresses'<~Hash>:
-        #       * 'public'<~Array> - public address strings
-        #       * 'private'<~Array> - private address strings
-        #     * 'adminPass'<~String> - Admin password for server
-        #     * 'flavorId'<~Integer> - Id of servers current flavor
+        #       * 'private'<~Array> - private and public fixed and floating ip addresses
+        #     * 'flavor'<~Hash>
+        #       * 'id'<~String> - id of the flavor
+        #       * 'links'<~Array> - array of flavor links
+        #     * 'id'<~Integer> - id of server
+        #     * 'image'<~Hash> - id of image used to boot server
+        #       * 'id'<~String> - id of the image
+        #       * 'links'<~Array> - array of image links
+        #     * 'links'<~Array> - array of server links
         #     * 'hostId'<~String>
-        #     * 'id'<~Integer> - Id of server
-        #     * 'imageId'<~Integer> - Id of image used to boot server
         #     * 'metadata'<~Hash> - metadata
-        #     * 'name'<~String> - Name of server
-        #     * 'progress'<~Integer> - Progress through current status
-        #     * 'status'<~String> - Current server status
+        #     * 'name'<~String> - name of server
+        #     * 'accessIPv4'<~String> - IPv4 ip address
+        #     * 'accessIPv6'<~String> - IPv6 ip address
+        #     * 'progress'<~Integer> - progress through current status
+        #     * 'status'<~String> - current server status
+        #     * 'created'<~String> - created date time stamp
+        #     * 'updated'<~String> - updated date time stamp
+        #     * 'user_id'<~String> - user id
+        #     * 'tenant_id'<~String> - tenant id
+        #     * 'uuid'<~String> - uuid of the server
+        #     * 'config_drive'<~String> - config drive
+        #     * 'security_groups'<~Array of Hash>
+        #       * 'id'<~Integer> - id of the security group
+        #       * 'name'<~String> - name of the security group
+        #       * 'links'<~Array> - array of security group links
+        #     * 'key_name'<~String> - name of the keypair
+        #     * 'adminPass'<~String> - admin password for server
         def create_server(name, flavor_id, image_id, options = {})
           data = {
             'server' => {
@@ -81,8 +97,8 @@ module Fog
               }
             end
           end
-          if options['availability_zone']
-            data['server']['availability_zone'] = options['availability_zone']
+          if options['config_drive']
+            data['server']['config_drive'] = options['config_drive']
           end
 
           request(
@@ -101,11 +117,11 @@ module Fog
           response = Excon::Response.new
           response.status = 202
 
-          #if options['security_groups']
-          #  sec_group_name = options['security_groups'][0]
-          #else
-          #  sec_group_name = "default"
-          #end
+          if options['security_groups']
+            sec_group_name = options['security_groups'][0]
+          else
+            sec_group_name = "default"
+          end
           data = {
             'addresses' => { "private"=>[{"version"=>4, "addr"=>Fog::HP::Mock.ip_address}] },
             'flavor'    => {"id"=>"#{flavor_id}", "links"=>[{"href"=>"http://nova1:8774/admin/flavors/#{flavor_id}", "rel"=>"bookmark"}]},
@@ -125,7 +141,7 @@ module Fog
             'tenant_id' => Fog::HP::Mock.user_id.to_s,
             'uuid'      => "95253a45-9ead-43c6-90b3-65da2ef048b3",
             'config_drive' => "",
-            #'security_groups' => [{"name"=>"#{sec_group_name}", "links"=>[{"href"=>"http://nova1:8774/v1.1/admin//os-security-groups/111", "rel"=>"bookmark"}], "id"=>111}],
+            'security_groups' => [{"name"=>"#{sec_group_name}", "links"=>[{"href"=>"http://nova1:8774/v1.1/admin//os-security-groups/111", "rel"=>"bookmark"}], "id"=>111}],
             'key_name'  => options['key_name'] || ""
           }
           self.data[:last_modified][:servers][data['id']] = Time.now