opennebula 6.3.90.pre → 6.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce0ca66d3a7fc700e855f98615b22498966c4efb6321770afc9e5852d29359c2
-  data.tar.gz: 7879f4859708352f9d1a69edd76ed6131ec8c3a26470ebea6933fb02317f948f
+  metadata.gz: ae702b1caa32e4a526435ad37d29bb6cb7c4a246aa0b13d1355def1129ef6d9c
+  data.tar.gz: c162738a79f54ed6d5b19c1e286ba0bf56485205d5dc692af888b735955e585b
 SHA512:
-  metadata.gz: ff3757f8da05cd268b1fcdd153e9e1dabb502ac3269567d2d66c1161e0d5014641d0ccd2776a8cb6b924a6d076d01b28730a38d4095c3655d14728805120450a
-  data.tar.gz: ede0e55b1b5b3423e22dc73832ead4e300857c41551f79cd921d427aaba9e1a331f1f8763ef8fecbe3bdcad8cc8a122ba8ba1b4aec0f4c51bd3c0486178c06c8
+  metadata.gz: 36ee51231d555025c271c2b67c71461c0d20760fc775e9598c02ad4f28bb281fa54a99c83e3c2ecee85f393702931871768e7e908d7667faf78dd01ca9d396a9
+  data.tar.gz: c44fdbd373155a95f6b6cad8c2b34d276b8f7149e52fb177e956844a7b68144c2573e262bccba4c1de378524355c24f41628cd534f04f8a1337c947115203c03

data/lib/cloud/CloudClient.rb

@@ -51,7 +51,7 @@ end
 module CloudClient
 
     # OpenNebula version
-    VERSION = '6.3.90'
+    VERSION = '6.4.0'
 
     # #########################################################################
     # Default location for the authentication file

data/lib/opennebula/flow/service_template.rb

@@ -414,9 +414,6 @@ module OpenNebula
                 return rc
             end
 
-            # add registration time, as the template is new
-            body['registration_time'] = Integer(Time.now)
-
             # update the template with the new body
             doc.update(body.to_json)
 

data/lib/opennebula/marketplaceapp_ext.rb

@@ -460,7 +460,11 @@ module OpenNebula::MarketPlaceAppExt
                     end
 
                     if !options[:template] || options[:template] == -1
-                        vmtpl = create_vcenter_template(ds, options)
+                        vmtpl = create_vcenter_template(
+                            ds,
+                            options,
+                            self['TEMPLATE/VMTEMPLATE64']
+                        )
                     else
                         template_id = options[:template]
                         template    = Template.new_with_id(template_id, @client)
@@ -625,7 +629,7 @@ module OpenNebula::MarketPlaceAppExt
 
                     rc = obj.export(
                         :dsid       => options[:dsid],
-                        :name       => "#{options[:name]}-#{idx}",
+                        :name       => "#{options[:name]}-#{obj_name}-#{idx}",
                         :notemplate => options[:notemplate]
                     )
 
@@ -676,7 +680,8 @@ module OpenNebula::MarketPlaceAppExt
                          "Error deleting template #{id}"]
                     }
 
-                    delete_method = 'delete(true)'
+                    delete_method = 'delete'
+                    args          = true
                 else
                     obj_factory = lambda {|v|
                         id = v[:image].first
@@ -690,7 +695,13 @@ module OpenNebula::MarketPlaceAppExt
                 exported.each do |_, v|
                     obj, err_msg = obj_factory.call(v)
 
-                    next unless OpenNebula.is_error?(obj.send(delete_method))
+                    if args
+                        rc = obj.send(delete_method, args)
+                    else
+                        rc = obj.send(delete_method)
+                    end
+
+                    next unless OpenNebula.is_error?(rc)
 
                     ret << err_msg
                 end

data/lib/opennebula/wait_ext.rb

@@ -138,6 +138,28 @@ module OpenNebula::WaitExt
 
     # Wait classes and the name published in ZMQ/STATE
     WAIT = {
+        OpenNebula::VirtualNetwork  => {
+            :event => lambda {|o, s1, _s2|
+                "EVENT STATE NET/#{s1}//#{o['ID']}"
+            },
+
+            :in_state => lambda {|o, s1, _s2|
+                obj_s = Integer(o['STATE'])
+                inx_s = OpenNebula::VirtualNetwork::VN_STATES.index(s1)
+
+                obj_s == inx_s
+            },
+
+            :in_state_e => lambda {|s1, _s2, content|
+                xml   = Nokogiri::XML(Base64.decode64(content))
+
+                obj_s = Integer(xml.xpath('//VNET/STATE').text)
+                inx_s = OpenNebula::VirtualNetwork::VN_STATES.index(s1)
+
+                obj_s == inx_s
+            }
+        },
+
         OpenNebula::Host  => {
             :event => lambda {|o, s1, _s2|
                 "EVENT STATE HOST/#{s1}//#{o['ID']}"

data/lib/opennebula.rb

@@ -77,5 +77,5 @@ require 'opennebula/flow'
 module OpenNebula
 
     # OpenNebula version
-    VERSION = '6.3.90'
+    VERSION = '6.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 6.3.90.pre
+  version: 6.4.0
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-28 00:00:00.000000000 Z
+date: 2022-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -255,9 +255,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.2
 signing_key: