opennebula 5.2.1 → 5.3.80.beta1

data/lib/opennebula/vm_group_pool.rb

@@ -0,0 +1,78 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2017, 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    #
+# a copy of the License at                                                   #
+#                                                                            #
+# http://www.apache.org/licenses/LICENSE-2.0                                 #
+#                                                                            #
+# Unless required by applicable law or agreed to in writing, software        #
+# distributed under the License is distributed on an "AS IS" BASIS,          #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+# See the License for the specific language governing permissions and        #
+# limitations under the License.                                             #
+#--------------------------------------------------------------------------- #
+
+require 'opennebula/pool'
+
+module OpenNebula
+    class VMGroupPool < Pool
+        #######################################################################
+        # Constants and Class attribute accessors
+        #######################################################################
+        VMGROUP_POOL_METHODS = {
+            :info => "vmgrouppool.info"
+        }
+
+        #######################################################################
+        # Class constructor & Pool Methods
+        #######################################################################
+
+        # +client+ a Client object that represents an XML-RPC connection
+        # +user_id+ used to refer to a Pool with Templates from that user
+        def initialize(client, user_id=-1)
+            super('VM_GROUP_POOL','VM_GROUP',client)
+
+            @user_id  = user_id
+        end
+
+        # Factory method to create Template objects
+        def factory(element_xml)
+            OpenNebula::VMGroup.new(element_xml,@client)
+        end
+
+        #######################################################################
+        # XML-RPC Methods for the Template Object
+        #######################################################################
+
+        # Retrieves all or part of the objects in the pool.
+        def info(*args)
+            case args.size
+                when 0
+                    info_filter(VMGROUP_POOL_METHODS[:info], @user_id, -1, -1)
+                when 3
+                    info_filter(VMGROUP_POOL_METHODS[:info], args[0], args[1],
+                        args[2])
+            end
+        end
+
+        def info_all()
+            return super(VMGROUP_POOL_METHODS[:info])
+        end
+
+        def info_mine()
+            return super(VMGROUP_POOL_METHODS[:info])
+        end
+
+        def info_group()
+            return super(VMGROUP_POOL_METHODS[:info])
+        end
+
+        alias_method :info!, :info
+        alias_method :info_all!, :info_all
+        alias_method :info_mine!, :info_mine
+        alias_method :info_group!, :info_group
+    end
+end
+

data/lib/opennebula/xml_element.rb

@@ -45,6 +45,7 @@ module OpenNebula
                     end
                 end
             end
+            @xml
         end
 
         # Builds a XML document
@@ -167,6 +168,23 @@ module OpenNebula
 
         end
 
+        # Iterates over every Element in the XPath and returns an array
+        # with XMLElements
+        # @return [XMLElement]
+        def retrieve_xmlelements(xpath_str)
+            collection = []
+            if NOKOGIRI
+                @xml.xpath(xpath_str).each { |pelem|
+                    collection << XMLElement.new(pelem)
+                }
+            else
+                @xml.elements.each(xpath_str) { |pelem|
+                    collection << XMLElement.new(pelem)
+                }
+            end
+            collection
+        end
+
         # Gets an attribute from an element
         # key:: _String_ xpath for the element
         # name:: _String_ name of the attribute

data/lib/opennebula/zone.rb

@@ -28,7 +28,9 @@ module OpenNebula
             :allocate       => "zone.allocate",
             :update         => "zone.update",
             :rename         => "zone.rename",
-            :delete         => "zone.delete"
+            :delete         => "zone.delete",
+            :addserver      => "zone.addserver",
+            :delserver      => "zone.delserver"
         }
 
         # Creates a Zone description with just its identifier
@@ -103,5 +105,26 @@ module OpenNebula
         def rename(name)
             return call(ZONE_METHODS[:rename], @pe_id, name)
         end
+
+        # Adds servers to this Zone
+        #
+        # @param name [String] Template with zone servers
+        #   SERVER = [ NAME = "<server_name>", ENDPOINT = "<rpc_ep>" ]
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def add_servers(servers)
+            return call(ZONE_METHODS[:addserver], @pe_id, servers)
+        end
+
+        # Delete servers from this Zone
+        #
+        # @param id [Int] Server ID
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def delete_servers(server_id)
+            return call(ZONE_METHODS[:delserver], @pe_id, server_id)
+        end
     end
 end

data/lib/opennebula.rb

@@ -62,9 +62,11 @@ require 'opennebula/marketplace'
 require 'opennebula/marketplace_pool'
 require 'opennebula/marketplaceapp'
 require 'opennebula/marketplaceapp_pool'
+require 'opennebula/vm_group'
+require 'opennebula/vm_group_pool'
 
 module OpenNebula
 
     # OpenNebula version
-    VERSION = '5.2.1'
+    VERSION = '5.3.80'
 end