openstack 3.3.12 → 3.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1054a64a8c43aee53a7345f20317b2c0c404730
-  data.tar.gz: a8b99e8db8cff26281cd96942236ae66aa053d3a
+  metadata.gz: 42ac11d43042dcced4aed85521c417c746d33daa
+  data.tar.gz: 8c19d56848b36ca0c2088f4950eb6fa360ded969
 SHA512:
-  metadata.gz: 2e5961bf60a7eba69688aa59c56bfb95eea199d93be3e1741c52ea32e55f8c17b0f8a0ffd870ff169cec16905173521e5d018faff2ad2d896c4680564080993b
-  data.tar.gz: 96615179d09dc038e02a0b8ef050bec65d5ac25f62453fa344eeb3f7793975b156019e0727b1f27a54171a8213510abc11d888f2288a422e6680dfaa98e724ac
+  metadata.gz: fd84bcbd0d4d87b22a97c1f517e1ad3d4a247be3fd89d0e7f4c7d8e0a45b9835b16b32a8676e0aa52778fa115e71d9f045704a9dce92e5a98c8dcde6bfb19e29
+  data.tar.gz: 2b5b88312335c28b0ff43c24da06e0e350d4ebf388529259dd0bf9435e02f37d122488659961e5eb19fdc3cb8a9674eb605f67ac56e3c65fbe08fa8e706de444

data/VERSION

@@ -1 +1 @@
-3.3.12
+3.3.13

data/lib/openstack.rb

@@ -7,6 +7,8 @@ module OpenStack
   require 'rubygems'
   require 'json'
   require 'date'
+  require 'securerandom'
+  require 'logger'
 
   unless "".respond_to? :each_char
     require "jcode"

data/lib/openstack/connection.rb

@@ -122,6 +122,7 @@ class Connection
       @user_domain = options[:user_domain] || nil
       @project_id = options[:project_id] || nil
       @project_name = options[:project_name] || nil
+      @logger = options[:logger] || nil
       @project_domain_name = options[:project_domain_name] || nil
       @project_domain_id = options[:project_domain_id] || nil
       @domain_name = options[:domain_name] || nil
@@ -200,6 +201,10 @@ class Connection
       tries = @retries
       time = 3
 
+      request_id = SecureRandom.uuid
+      started_timestamp = Time.now.to_f * 1000
+      log_request(request_id, "REQUEST: #{method.to_s} => #{scheme}://#{server}#{path}")
+
       hdrhash = headerprep(headers)
       start_http(server,path,port,scheme,hdrhash)
       request = Net::HTTP.const_get(method.to_s.capitalize).new(path,hdrhash)
@@ -213,6 +218,7 @@ class Connection
       else
         response = @http[server].request(request)
       end
+      log_request(request_id, "RESPONSE: Code => #{response.code} Time => #{(Time.now.to_f * 1000) - started_timestamp}ms")
       if @is_debug
         puts "REQUEST: #{method.to_s} => #{scheme}://#{server}#{path}"
         puts data if data
@@ -250,6 +256,12 @@ class Connection
 
     private
 
+    def log_request(request_id, message)
+      if @logger.kind_of?(Logger)
+        @logger.info("#{request_id} - #{message}")
+      end
+    end
+
     # Sets up standard HTTP headers
     def headerprep(headers = {}) # :nodoc:
       default_headers = {}

data/lib/openstack/network/port.rb

@@ -1,34 +1,37 @@
 module OpenStack
-module Network
-  class Port
+  module Network
+    class Port
 
-    attr_reader :id
-    attr_reader :network_id
-    attr_reader :name
-    attr_reader :admin_state_up
-    attr_reader :status
-    attr_reader :mac_address
-    attr_reader :fixed_ips
-    attr_reader :device_id
-    attr_reader :device_owner
-    attr_reader :tenant_id
-    attr_reader :qos_policy_id
-
-    def initialize(port_hash={})
-      @id = port_hash["id"]
-      @network_id = port_hash["network_id"]
-      @name = port_hash["name"]
-      @admin_state_up = port_hash["admin_state_up"]
-      @status = port_hash["status"]
-      @mac_address = port_hash["mac_address"]
-      @fixed_ips = port_hash["fixed_ips"]
-      @device_id = port_hash["device_id"]
-      @device_owner = port_hash["device_owner"]
-      @tenant_id = port_hash["tenant_id"]
-      @qos_policy_id = port_hash["qos_policy_id"]
-    end
+      attr_reader :id
+      attr_reader :network_id
+      attr_reader :name
+      attr_reader :admin_state_up
+      attr_reader :status
+      attr_reader :mac_address
+      attr_reader :fixed_ips
+      attr_reader :device_id
+      attr_reader :device_owner
+      attr_reader :tenant_id
+      attr_reader :qos_policy_id
+      attr_reader :allowed_address_pairs
+      attr_reader :updated_at
 
+      def initialize(port_hash={})
+        @id = port_hash["id"]
+        @network_id = port_hash["network_id"]
+        @name = port_hash["name"]
+        @admin_state_up = port_hash["admin_state_up"]
+        @status = port_hash["status"]
+        @mac_address = port_hash["mac_address"]
+        @fixed_ips = port_hash["fixed_ips"]
+        @device_id = port_hash["device_id"]
+        @device_owner = port_hash["device_owner"]
+        @tenant_id = port_hash["tenant_id"]
+        @qos_policy_id = port_hash["qos_policy_id"]
+        @allowed_address_pairs = port_hash["allowed_address_pairs"]
+        @updated_at = port_hash["updated_at"]
+      end
 
+    end
   end
 end
-end

data/lib/openstack/volume/connection.rb

@@ -52,8 +52,13 @@ module Volume
     end
     alias :volume :get_volume
 
-    def delete_volume(vol_id)
-      response = @connection.req("DELETE", "/#{@volume_path}/#{vol_id}")
+    def delete_volume(vol_id, force = false)
+      if force
+        data = JSON.generate({'os-force_delete' => {}})
+        @connection.req("POST", "/#{@volume_path}/#{vol_id}/action", {data: data})
+      else
+        @connection.req("DELETE", "/#{@volume_path}/#{vol_id}")
+      end
       true
     end
 

data/lib/openstack/volume/volume.rb

@@ -13,6 +13,7 @@ module OpenStack
     attr_reader :snapshot_id
     attr_reader :attachments
     attr_reader :created_at
+    attr_reader :updated_at
     attr_reader :status
 
     def initialize(connection, volume_info)
@@ -37,6 +38,7 @@ module OpenStack
       @snapshot_id  = volume_info["snapshot_id"] || volume_info["snapshotId"]
       @attachments  = volume_info["attachments"]
       @created_at  = volume_info["created_at"] || volume_info["createdAt"]
+      @updated_at  = volume_info["updated_at"]
       @status = volume_info["status"]
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstack
 version: !ruby/object:Gem::Version
-  version: 3.3.12
+  version: 3.3.13
 platform: ruby
 authors:
 - Dan Prince
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: OpenStack Ruby API