oca 3.0.1 → 3.2.1

data/lib/OpenNebula/VirtualMachine.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org)             #
+# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
 #                                                                            #
 # 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    #
@@ -14,6 +14,7 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
+
 require 'OpenNebula/Pool'
 
 module OpenNebula
@@ -21,6 +22,8 @@ module OpenNebula
         #######################################################################
         # Constants and Class Methods
         #######################################################################
+
+
         VM_METHODS = {
             :info     => "vm.info",
             :allocate => "vm.allocate",
@@ -28,7 +31,8 @@ module OpenNebula
             :migrate  => "vm.migrate",
             :deploy   => "vm.deploy",
             :savedisk => "vm.savedisk",
-            :chown    => "vm.chown"
+            :chown    => "vm.chown",
+            :chmod    => "vm.chmod",
         }
 
         VM_STATE=%w{INIT PENDING HOLD ACTIVE STOPPED SUSPENDED DONE FAILED}
@@ -101,14 +105,9 @@ module OpenNebula
             reason_str
         end
 
-        #######################################################################
         # Class constructor
-        #######################################################################
         def initialize(xml, client)
             super(xml,client)
-
-            @element_name = "VM"
-            @client       = client
         end
 
         #######################################################################
@@ -145,6 +144,11 @@ module OpenNebula
             action('shutdown')
         end
 
+        # Shutdowns an already deployed VM
+        def reboot
+            action('reboot')
+        end
+
         # Cancels a running VM
         def cancel
             action('cancel')
@@ -216,13 +220,19 @@ module OpenNebula
         # @param disk_id [Integer] ID of the disk to be saved
         # @param image_name [String] Name for the new image where the
         #   disk will be saved
+        # @param image_type [String] Type of the new image. Set to empty string
+        #   to use the default type
         #
         # @return [Integer, OpenNebula::Error] the new Image ID in case of
         #   success, error otherwise
-        def save_as(disk_id, image_name)
+        def save_as(disk_id, image_name, image_type="")
             return Error.new('ID not defined') if !@pe_id
 
-            rc = @client.call(VM_METHODS[:savedisk], @pe_id, disk_id, image_name)
+            rc = @client.call(VM_METHODS[:savedisk],
+                              @pe_id,
+                              disk_id,
+                              image_name,
+                              image_type)
 
             return rc
         end
@@ -235,6 +245,26 @@ module OpenNebula
             super(VM_METHODS[:chown], uid, gid)
         end
 
+        # Changes the permissions.
+        #
+        # @param octet [String] Permissions octed , e.g. 640
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def chmod_octet(octet)
+            super(VM_METHODS[:chmod], octet)
+        end
+
+        # Changes the permissions.
+        # Each [Integer] argument must be 1 to allow, 0 deny, -1 do not change
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def chmod(owner_u, owner_m, owner_a, group_u, group_m, group_a, other_u,
+                other_m, other_a)
+            super(VM_METHODS[:chmod], owner_u, owner_m, owner_a, group_u,
+                group_m, group_a, other_u, other_m, other_a)
+        end
+
         #######################################################################
         # Helpers to get VirtualMachine information
         #######################################################################

data/lib/OpenNebula/VirtualMachinePool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org)             #
+# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
 #                                                                            #
 # 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    #
@@ -14,6 +14,7 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
+
 require 'OpenNebula/Pool'
 
 module OpenNebula
@@ -22,6 +23,7 @@ module OpenNebula
         # Constants and Class attribute accessors
         #######################################################################
 
+
         VM_POOL_METHODS = {
             :info => "vmpool.info"
         }
@@ -33,7 +35,8 @@ module OpenNebula
         #######################################################################
         # Class constructor & Pool Methods
         #######################################################################
-        
+
+
         # +client+ a Client object that represents a XML-RPC connection
         # +user_id+ is to refer to a Pool with VirtualMachines from that user
         def initialize(client, user_id=0)
@@ -50,7 +53,7 @@ module OpenNebula
         #######################################################################
         # XML-RPC Methods for the Virtual Network Object
         #######################################################################
-        
+
         # Retrieves all or part of the VirtualMachines in the pool.
         # No arguments, returns the not-in-done VMs for the user 
         # [user_id, start_id, end_id]
@@ -107,9 +110,9 @@ module OpenNebula
                                -1,
                                INFO_NOT_DONE)
         end
-        
+
         private
-        
+
         def info_filter(xml_method, who, start_id, end_id, state)
             return xmlrpc_info(xml_method, who, start_id, end_id, state)
         end

data/lib/OpenNebula/VirtualNetwork.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org)             #
+# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
 #                                                                            #
 # 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    #
@@ -14,13 +14,16 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
+
 require 'OpenNebula/Pool'
 
 module OpenNebula
     class VirtualNetwork < PoolElement
-        # ---------------------------------------------------------------------
+        #######################################################################
         # Constants and Class Methods
-        # ---------------------------------------------------------------------
+        #######################################################################
+
+
         VN_METHODS = {
             :info       => "vn.info",
             :allocate   => "vn.allocate",
@@ -28,7 +31,11 @@ module OpenNebula
             :delete     => "vn.delete",
             :addleases  => "vn.addleases",
             :rmleases   => "vn.rmleases",
-            :chown      => "vn.chown"
+            :chown      => "vn.chown",
+            :chmod      => "vn.chmod",
+            :update     => "vn.update",
+            :hold       => "vn.hold",
+            :release    => "vn.release"
         }
 
         VN_TYPES=%w{RANGED FIXED}
@@ -58,8 +65,6 @@ module OpenNebula
         # Class constructor
         def initialize(xml, client)
             super(xml,client)
-
-            @client = client
         end
 
         #######################################################################
@@ -77,7 +82,14 @@ module OpenNebula
         def allocate(description)
             super(VN_METHODS[:allocate],description)
         end
-        
+
+        # Replaces the template contents
+        #
+        # +new_template+ New template contents
+        def update(new_template)
+            super(VN_METHODS[:update], new_template)
+        end
+
         # Publishes the VirtualNetwork, to be used by other users
         def publish
             set_publish(true)
@@ -119,6 +131,32 @@ module OpenNebula
             return rc
         end
 
+        # Holds a virtual network Lease as used
+        # @param ip [String] IP to hold
+        def hold(ip)
+            return Error.new('ID not defined') if !@pe_id
+
+            lease_template = "LEASES = [ IP = #{ip} ]"
+
+            rc = @client.call(VN_METHODS[:hold], @pe_id, lease_template)
+            rc = nil if !OpenNebula.is_error?(rc)
+
+            return rc
+        end
+
+        # Releases a virtual network Lease on hold
+        # @param ip [String] IP to release
+        def release(ip)
+            return Error.new('ID not defined') if !@pe_id
+
+            lease_template = "LEASES = [ IP = #{ip} ]"
+
+            rc = @client.call(VN_METHODS[:release], @pe_id, lease_template)
+            rc = nil if !OpenNebula.is_error?(rc)
+
+            return rc
+        end
+
         # Changes the owner/group
         # uid:: _Integer_ the new owner id. Set to -1 to leave the current one
         # gid:: _Integer_ the new group id. Set to -1 to leave the current one
@@ -127,9 +165,29 @@ module OpenNebula
             super(VN_METHODS[:chown], uid, gid)
         end
 
-        # ---------------------------------------------------------------------
+        # Changes the virtual network permissions.
+        #
+        # @param octet [String] Permissions octed , e.g. 640
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def chmod_octet(octet)
+            super(VN_METHODS[:chmod], octet)
+        end
+
+        # Changes the virtual network permissions.
+        # Each [Integer] argument must be 1 to allow, 0 deny, -1 do not change
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def chmod(owner_u, owner_m, owner_a, group_u, group_m, group_a, other_u,
+                other_m, other_a)
+            super(VN_METHODS[:chmod], owner_u, owner_m, owner_a, group_u,
+                group_m, group_a, other_u, other_m, other_a)
+        end
+
+        #######################################################################
         # Helpers to get VirtualNetwork information
-        # ---------------------------------------------------------------------
+        #######################################################################
 
         # Returns the group identifier
         # [return] _Integer_ the element's group ID
@@ -152,14 +210,19 @@ module OpenNebula
             SHORT_VN_TYPES[type_str]
         end
 
+        def public?
+            if self['PERMISSIONS/GROUP_U'] == "1" || self['PERMISSIONS/OTHER_U'] == "1"
+                true
+            else
+                false
+            end
+        end
+
     private
         def set_publish(published)
-            return Error.new('ID not defined') if !@pe_id
+            group_u = published ? 1 : 0
 
-            rc = @client.call(VN_METHODS[:publish], @pe_id, published)
-            rc = nil if !OpenNebula.is_error?(rc)
-
-            return rc
+            chmod(-1, -1, -1, group_u, -1, -1, -1, -1, -1)
         end
 
     end

data/lib/OpenNebula/VirtualNetworkPool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org)             #
+# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
 #                                                                            #
 # 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    #
@@ -14,6 +14,7 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
+
 require 'OpenNebula/Pool'
 
 module OpenNebula
@@ -21,7 +22,8 @@ module OpenNebula
         #######################################################################
         # Constants and Class attribute accessors
         #######################################################################
-        
+
+
         VN_POOL_METHODS = {
             :info => "vnpool.info"
         }
@@ -29,7 +31,7 @@ module OpenNebula
         #######################################################################
         # Class constructor & Pool Methods
         #######################################################################
-        
+
         # +client+ a Client object that represents a XML-RPC connection
         # +user_id+ is to refer to a Pool with VirtualNetworks from that user
         def initialize(client, user_id=0)

data/lib/OpenNebula/XMLUtils.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org)             #
+# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
 #                                                                            #
 # 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    #
@@ -14,6 +14,7 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
+
 module OpenNebula
 
     begin
@@ -30,11 +31,9 @@ module OpenNebula
         REXML_FORMATTERS=false
     end
 
-    ###########################################################################
     # The XMLElement class provides an abstraction of the underlying
     # XML parser engine. It provides XML-related methods for the Pool and
     # PoolElement classes
-    ###########################################################################
     class XMLElement
 
         # xml:: _opaque xml object_ an xml object as returned by build_xml
@@ -202,7 +201,7 @@ module OpenNebula
             template_like_str('TEMPLATE', indent)
         end
 
-        def template_like_str(root_element, indent=true)
+        def template_like_str(root_element, indent=true, xpath_exp=nil)
             if NOKOGIRI
                 xml_template=@xml.xpath(root_element).to_s
                 rexml=REXML::Document.new(xml_template).root
@@ -218,7 +217,7 @@ module OpenNebula
                 ind_tab=' '
             end
 
-            str=rexml.collect {|n|
+            str=rexml.elements.collect(xpath_exp) {|n|
                 if n.class==REXML::Element
                     str_line=""
                     if n.has_elements?
@@ -310,10 +309,8 @@ module OpenNebula
         end
     end
 
-    ###########################################################################
     # The XMLUtilsPool module provides an abstraction of the underlying
     # XML parser engine. It provides XML-related methods for the Pools
-    ###########################################################################
     class XMLPool < XMLElement
 
         def initialize(xml=nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oca
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.2.1
   prerelease: 
 platform: ruby
 authors: