openstack 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6e25014771eb5812859b04fb7acf896ee96d34b
-  data.tar.gz: b4a28117aa9ffc2e98a9aef0f0293450864b772a
+  metadata.gz: 17681562cf42cf5718e2a958b88b9506b122b8f1
+  data.tar.gz: 0cbe0dee7b6bc35079a2d7292a95640f8db18c77
 SHA512:
-  metadata.gz: 51069cfbbf28c5bd741f0b1ba56f0bb73cedc453f9659ddcf1c0c73e1f39ad20c3b8922e22ea8c6060e736f0dcf6bafb00aca38126ebfa796e0ff3c5003e93c3
-  data.tar.gz: d7193403695d267378a18e983dcbf1ae317e3102c6a3096df7a873a990d246ed56f34fade63c2e02af9099e76fc0c602dabd39aeb8faeb651cfaf6c11a3f28c3
+  metadata.gz: 8d6e9528a0fb31296cf2680d7d5168e0f9c271163b9d448b09ba6504cb60abe910ae007c0ed4bd7b921c72d259eec7ad406bc0eb7127d225a982d259b9973219
+  data.tar.gz: 3ba91eab865e7e3bbb8cb002b0e7bb02ef57f5170fa03c24bd37964a7598c3e5c8559cef43d627068f9d967b9ff8efd0fc53adf3ed4657d5eaa198b298c3e673

data/VERSION

@@ -1 +1 @@
-3.3.1
+3.3.2

data/lib/openstack/compute/connection.rb

@@ -221,6 +221,55 @@ module Compute
       JSON.parse(response.body)
     end
 
+    #  Lists, creates, deletes, and updates the extra-specs or keys for a flavor.
+
+    # Creates extra specs for a flavor, by ID
+    #
+    # create_flavor_extra_specs('999aca87-5c8a-4862-92fe-deb8bb024b6b', { 'quota:disk_total_iops_sec' => 1000 })
+    # => { 'quota:disk_total_iops_sec' => 1000 }
+    def create_flavor_extra_specs(flavor_id, options)
+      data = JSON.generate(extra_specs: options)
+      response = @connection.req('POST', "/flavors/#{flavor_id}/os-extra_specs", data: data)
+      JSON.parse(response.body)['extra_specs']
+    end
+
+    # Lists all extra specs for a flavor, by ID.
+    #
+    # flavor_extra_specs('999aca87-5c8a-4862-92fe-deb8bb024b6b')
+    # => { 'quota:disk_total_iops_sec' => 1000 }
+    def flavor_extra_specs(flavor_id)
+      response = @connection.req('GET', "/flavors/#{flavor_id}/os-extra_specs")
+      JSON.parse(response.body)['extra_specs']
+    end
+
+    # Shows an extra spec, by key, for a flavor, by ID.
+    #
+    # flavor_extra_spec('999aca87-5c8a-4862-92fe-deb8bb024b6b', 'quota:disk_total_iops_sec')
+    # => { 'quota:disk_total_iops_sec' => 1000 }
+    def flavor_extra_spec(flavor_id, flavor_extra_spec_key)
+      response = @connection.req('GET', "/flavors/#{flavor_id}/os-extra_specs/#{flavor_extra_spec_key}")
+      JSON.parse(response.body)
+    end
+
+    # Updates an extra spec, by key, for a flavor, by ID.
+    #
+    # update_flavor_extra_spec('999aca87-5c8a-4862-92fe-deb8bb024b6b', 'quota:disk_total_iops_sec', 2000)
+    # => { 'quota:disk_total_iops_sec' => 2000 }
+    def update_flavor_extra_spec(flavor_id, flavor_extra_spec_key, new_value)
+      data = JSON.generate(flavor_extra_spec_key => new_value)
+      response = @connection.req('PUT', "/flavors/#{flavor_id}/os-extra_specs/#{flavor_extra_spec_key}", data: data)
+      JSON.parse(response.body)
+    end
+
+    # Deletes an extra spec, by key, for a flavor, by ID.
+    #
+    # delete_flavor_extra_spec('999aca87-5c8a-4862-92fe-deb8bb024b6b', 'quota:disk_total_iops_sec')
+    # => true
+    def delete_flavor_extra_spec(flavor_id, flavor_extra_spec_key)
+      @connection.req('DELETE', "/flavors/#{flavor_id}/os-extra_specs/#{flavor_extra_spec_key}")
+      true
+    end
+
     # Returns the current state of the programatic API limits.  Each account has certain limits on the number of resources
     # allowed in the account, and a rate of API operations.
     #

data/lib/openstack/compute/server.rb

@@ -102,9 +102,7 @@ module Compute
     #   >> server.stop()
     #   => true
     def stop()
-      data = JSON.generate(:suspend => nil)
-      puts data
-      pp "About to post ACTION"
+      data = JSON.generate('os-stop' => nil)
       response = @compute.connection.csreq("POST",@svrmgmthost,"#{@svrmgmtpath}/servers/#{URI.encode(self.id.to_s)}/action",@svrmgmtport,@svrmgmtscheme,{'content-type' => 'application/json'},data)
       OpenStack::Exception.raise_exception(response) unless response.code.match(/^20.$/)
       true
@@ -116,8 +114,8 @@ module Compute
     #
     #   >> server.start()
     #   => true
-    def start()
-      data = JSON.generate(:resume => nil)
+    def start
+      data = JSON.generate('os-start' => nil)
       response = @compute.connection.csreq("POST",@svrmgmthost,"#{@svrmgmtpath}/servers/#{URI.encode(self.id.to_s)}/action",@svrmgmtport,@svrmgmtscheme,{'content-type' => 'application/json'},data)
       OpenStack::Exception.raise_exception(response) unless response.code.match(/^20.$/)
       true
@@ -390,6 +388,16 @@ module Compute
       true
     end
 
+    # List volume attachments for an instance
+    #
+    #   >> server.get_volume_attachments
+    #   => array
+    def get_volume_attachments
+      response = @compute.connection.req('GET', "/servers/#{@id}/os-volume_attachments")
+      OpenStack::Exception.raise_exception(response) unless response.code.match(/^20.$/)
+      JSON.parse(response.body)['volumeAttachments']
+    end
+
   end
 end
 end

data/lib/openstack/volume/connection.rb

@@ -5,6 +5,7 @@ module Volume
 
     attr_accessor   :connection
     attr_reader     :volumes_native
+    attr_reader     :volume_path
 
     def initialize(connection)
       @connection = connection
@@ -30,7 +31,7 @@ module Volume
       response = @connection.csreq("POST",@connection.service_host,"#{@connection.service_path}/#{@volume_path}",@connection.service_port,@connection.service_scheme,{'content-type' => 'application/json'},data)
       OpenStack::Exception.raise_exception(response) unless response.code.match(/^20.$/)
       volume_info = JSON.parse(response.body)["volume"]
-      volume = OpenStack::Volume::Volume.new(volume_info)
+      volume = OpenStack::Volume::Volume.new(self, volume_info)
     end
 
     #no options documented in API at Nov 2012
@@ -38,7 +39,7 @@ module Volume
     def list_volumes
       response = @connection.req("GET", "/#{@volume_path}")
       volumes_hash = JSON.parse(response.body)["volumes"]
-      volumes_hash.inject([]){|res, current| res << OpenStack::Volume::Volume.new(current); res}
+      volumes_hash.inject([]){|res, current| res << OpenStack::Volume::Volume.new(self, current); res}
     end
     alias :volumes :list_volumes
 
@@ -46,7 +47,7 @@ module Volume
     def get_volume(vol_id)
       response = @connection.req("GET", "/#{@volume_path}/#{vol_id}")
       volume_hash = JSON.parse(response.body)["volume"]
-      OpenStack::Volume::Volume.new(volume_hash)
+      OpenStack::Volume::Volume.new(self, volume_hash)
     end
     alias :volume :get_volume
 

data/lib/openstack/volume/volume.rb

@@ -3,6 +3,7 @@ module OpenStack
     class Volume
 
     attr_reader :id
+    attr_reader :connection
     attr_reader :display_name
     attr_reader :display_description
     attr_reader :size
@@ -14,7 +15,18 @@ module OpenStack
     attr_reader :created_at
     attr_reader :status
 
-    def initialize(volume_info)
+    def initialize(connection, volume_info)
+      @connection = connection.connection
+      @volume_path = connection.volume_path
+      self.populate(volume_info)
+    end
+
+    def populate(volume_info = nil)
+      if not volume_info and @id
+        response = @connection.req("GET", "/#{@volume_path}/#{@id}")
+        volume_info = JSON.parse(response.body)["volume"]
+      end
+
       @id  = volume_info["id"]
       @display_name  = volume_info["display_name"] || volume_info["displayName"]
       @display_description  = volume_info["display_description"] || volume_info["displayDescription"]
@@ -28,6 +40,22 @@ module OpenStack
       @status = volume_info["status"]
     end
 
+    def extend!(size)
+      data = JSON.generate({'os-extend' => {'new_size' => size}})
+      response = @connection.req('POST', "/#{@volume_path}/#{@id}/action", {:data => data})
+      OpenStack::Exception.raise_exception(response) unless response.code.match(/^20.$/)
+      self.populate
+      true
+    end
+
+    def status!(status)
+      data = JSON.generate({'os-reset_status' => {'status' => status}})
+      response = @connection.req('POST', "/#{@volume_path}/#{@id}/action", {:data => data})
+      OpenStack::Exception.raise_exception(response) unless response.code.match(/^20.$/)
+      self.populate
+      true
+    end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstack
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Dan Prince