opennebula 5.4.15 → 5.5.80.pre

data/lib/opennebula/virtual_router_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2017, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/vm_group.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2017, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -28,7 +28,9 @@ module OpenNebula
             :delete      => "vmgroup.delete",
             :chown       => "vmgroup.chown",
             :chmod       => "vmgroup.chmod",
-            :rename      => "vmgroup.rename"
+            :rename      => "vmgroup.rename",
+            :lock        => "vmgroup.lock",
+            :unlock        => "vmgroup.unlock"
         }
 
         # Creates a VMGroup description with just its identifier
@@ -129,6 +131,16 @@ module OpenNebula
             return call(VMGROUP_METHODS[:rename], @pe_id, name)
         end
 
+        # Lock a VMGroup
+        def lock(level)
+            return call(VMGROUP_METHODS[:lock], @pe_id, level)
+        end
+
+        # Unlock a VMGroup
+        def unlock()
+            return call(VMGROUP_METHODS[:unlock], @pe_id)
+        end
+
         #######################################################################
         # Helpers to get VMGroup information
         #######################################################################

data/lib/opennebula/vm_group_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2017, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/x509_auth.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2017, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/xml_element.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2017, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -145,6 +145,15 @@ module OpenNebula
             }
         end
 
+        # Update the content of the current doc
+        def set_content(content)
+            if NOKOGIRI
+                @xml.content = content
+            else
+                @xml.text = content
+            end
+        end
+
         # Gets an array of text from elements extracted
         # using  the XPATH  expression passed as filter
         def retrieve_elements(filter)

data/lib/opennebula/xml_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2017, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/xml_utils.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2017, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/opennebula/zone.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2017, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -66,7 +66,48 @@ module OpenNebula
             super(ZONE_METHODS[:info], 'ZONE')
         end
 
+        # Retrieves the information extended of the given Zone.
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def info_extended()
+            rc = info()
+
+            return rc if OpenNebula.is_error?(rc)
+
+            @xml.xpath("SERVER_POOL/SERVER").each do |server|
+                endpoint = server.xpath("ENDPOINT")
+                endpoint = endpoint.text if endpoint
+
+                next if endpoint.nil?
+
+                client = OpenNebula::Client.new(nil, endpoint, {:timeout => 5})
+
+                xml = client.call("zone.raftstatus")
+
+                if OpenNebula.is_error?(xml)
+                    add_element(server, "STATE", "-")
+                    add_element(server, "TERM", "-")
+                    add_element(server, "VOTEDFOR", "-")
+                    add_element(server, "COMMIT", "-")
+                    add_element(server, "LOG_INDEX", "-")
+                    add_element(server, "FEDLOG_INDEX", "-")
+
+                    next
+                end
+
+                xml = Nokogiri::XML(xml)
+
+                add_element_xml(server, xml, "STATE", "RAFT/STATE")
+                add_element_xml(server, xml, "TERM", "RAFT/TERM")
+                add_element_xml(server, xml, "VOTEDFOR", "RAFT/VOTEDFOR")
+                add_element_xml(server, xml, "COMMIT", "RAFT/COMMIT")
+                add_element_xml(server, xml, "LOG_INDEX", "RAFT/LOG_INDEX")
+                add_element_xml(server, xml, "FEDLOG_INDEX","RAFT/FEDLOG_INDEX")
+            end
+        end
+
         alias_method :info!, :info
+        alias_method :info_extended!, :info_extended
 
         # Allocates a new Zone in OpenNebula
         #
@@ -126,5 +167,30 @@ module OpenNebula
         def delete_servers(server_id)
             return call(ZONE_METHODS[:delserver], @pe_id, server_id)
         end
+
+        private
+
+        # These methods adds elements to the given node of the zone
+        def add_element(parent, key, value)
+            elem = Nokogiri::XML::Node.new(key, @xml.document)
+            elem.content = value
+
+            parent.add_child(elem)
+        end
+
+        def add_element_xml(parent, doc, key, xpath)
+            value = doc.at_xpath(xpath)
+
+            if value
+                value = value.text
+            else
+                value = "-"
+            end
+
+            elem = Nokogiri::XML::Node.new(key, @xml.document)
+            elem.content = value
+
+            parent.add_child(elem)
+        end
     end
 end

data/lib/opennebula/zone_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2017, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #

data/lib/vcenter_driver.rb

@@ -1,5 +1,5 @@
 # ---------------------------------------------------------------------------- #
-# Copyright 2002-2017, OpenNebula Project, OpenNebula Systems                  #
+# Copyright 2002-2018, OpenNebula Project, OpenNebula Systems                  #
 #                                                                              #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may      #
 # not use this file except in compliance with the License. You may obtain      #
@@ -48,6 +48,7 @@ require 'openssl'
 # vCenter Library                                                              #
 # ---------------------------------------------------------------------------- #
 
+require 'vcenter_importer.rb'
 require 'memoize'
 require 'vi_client'
 require 'vi_helper'
@@ -59,6 +60,7 @@ require 'network'
 require 'file_helper'
 require 'importer'
 
+CHECK_REFS = true
 # ---------------------------------------------------------------------------- #
 # Helper functions                                                             #
 # ---------------------------------------------------------------------------- #
@@ -77,3 +79,17 @@ def check_valid(parameter, label)
         exit -1
     end
 end
+
+def check_item(item, target_class)
+    begin
+        item.name if CHECK_REFS
+        if target_class
+            if !item.instance_of?(target_class)
+                raise "Expecting type 'RbVmomi::VIM::#{target_class}'. " <<
+                        "Got '#{item.class} instead."
+            end
+        end
+    rescue RbVmomi::Fault => e
+        raise "Reference \"#{item._ref}\" error. The reference does not exist"
+    end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 5.4.15
+  version: 5.5.80.pre
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-18 00:00:00.000000000 Z
+date: 2018-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -137,9 +137,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14.1