opennebula 5.9.80.pre → 5.9.90.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 321f13bb3966469aa1b7b07f8b83287985be6841
-  data.tar.gz: 204f2304bdecee1142c845ee78d6c676de6c4456
+  metadata.gz: 615f2993c34d8bd03ddf2cec976b957ca5f72052
+  data.tar.gz: 2ae7a7d09b5886ca2bbbb225b96ee71a5b525760
 SHA512:
-  metadata.gz: e358e112f2e6f689f45d8aaab0608b972b15165bf1e17e66346df051027faa676d6ed69355f2305832ae024c7088d243d38206248dd709df6d6557520492dd2c
-  data.tar.gz: a299a7153acfb2a60d3dd7731d23c33bd4e2f7685e4e40459ca8f77275c9b42d42dfbef87aa53a9439f72d569f3554be45741f30ee74601ba818ad4ddb7eb607
+  metadata.gz: 02b773491867c781e38c59e2f889410dc60372b0326b4707da2740e75f253dbb9e864f49148d47adaf21a0411b6de25ce1f2f44a0f7b999ca12e3f5e8258105d
+  data.tar.gz: 77bc56c14cba0063deba21d6d15c40f1a3399747700e469ffd8159ad9a4756650545c02aaf8f6935ac7162be122cc0740a5e9e31d444ac9a7df97ecd7d956418

data/lib/cloud/CloudClient.rb

@@ -16,6 +16,7 @@
 
 require 'rubygems'
 require 'uri'
+require 'ipaddress'
 
 require 'digest/sha1'
 require 'net/https'
@@ -50,7 +51,7 @@ end
 module CloudClient
 
     # OpenNebula version
-    VERSION = '5.9.80'
+    VERSION = '5.9.90'
 
     # #########################################################################
     # Default location for the authentication file
@@ -94,8 +95,29 @@ module CloudClient
 
         if ENV['http_proxy']
             uri_proxy  = URI.parse(ENV['http_proxy'])
-            host = uri_proxy.host
-            port = uri_proxy.port
+            flag = false
+
+            # Check if we need to bypass the proxy
+            if ENV['no_proxy']
+                ENV['no_proxy'].split(',').each do |item|
+                    item = item.rstrip.lstrip
+
+                    unless (IPAddress(url.host) rescue nil).nil?
+                        unless (IPAddress(item) rescue nil).nil?
+                            flag |= IPAddress(item).include? IPAddress(url.host)
+                        end
+                    else
+                        if (IPAddress(item) rescue nil).nil?
+                            flag |= (item == url.host)
+                        end
+                    end
+                end
+            end
+
+            unless flag
+                host = uri_proxy.host
+                port = uri_proxy.port
+            end
         end
 
         http = Net::HTTP::Proxy(host, port).new(url.host, url.port)

data/lib/opennebula.rb

@@ -74,5 +74,5 @@ require 'opennebula/hook_log'
 module OpenNebula
 
     # OpenNebula version
-    VERSION = '5.9.80'
+    VERSION = '5.9.90'
 end

data/lib/opennebula/oneflow_client.rb

@@ -15,6 +15,7 @@
 #--------------------------------------------------------------------------- #
 
 require 'uri'
+require 'ipaddress'
 require 'cloud/CloudClient'
 
 include CloudCLI
@@ -328,8 +329,29 @@ module Service
 
             if ENV['http_proxy']
                 uri_proxy  = URI.parse(ENV['http_proxy'])
-                @host = uri_proxy.host
-                @port = uri_proxy.port
+                flag = false
+
+                # Check if we need to bypass the proxy
+                if ENV['no_proxy']
+                    ENV['no_proxy'].split(',').each do |item|
+                        item = item.rstrip.lstrip
+
+                        unless (IPAddress @uri.host rescue nil).nil?
+                            unless (IPAddress item rescue nil).nil?
+                                flag |= IPAddress(item).include? IPAddress(@uri.host)
+                            end
+                        else
+                            if (IPAddress(item) rescue nil).nil?
+                                flag |= (item == @uri.host)
+                            end
+                        end
+                    end
+                end
+
+                unless flag
+                    @host = uri_proxy.host
+                    @port = uri_proxy.port
+                end
             end
         end
 

data/lib/opennebula/virtual_machine.rb

@@ -816,7 +816,7 @@ module OpenNebula
                 # Replace the original template's capacity with the actual VM values
                 replace = ""
                 if !description.nil?
-                    replace << "DESCRIPTION = #{description}\n"
+                    replace << "DESCRIPTION = \"#{description}\"\n"
                 end
                 cpu = self['TEMPLATE/CPU']
                 if !cpu.nil? && !cpu.empty?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 5.9.80.pre
+  version: 5.9.90.pre
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-14 00:00:00.000000000 Z
+date: 2019-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri