opennebula 4.6.1 → 4.7.80.beta

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 94b0a4e8af842368b4a10db1eb29973da9ef60fd
+  data.tar.gz: 2a601e7dc101041b02e8cd0203acd4f9cecd42fd
+SHA512:
+  metadata.gz: 27e3c88db54a97371e89d48ccfc4f4b6c82edb48dfcc915cf75d74f0c48bd568dd36f7342588fdbe493f885480682391733c54071ecde5567d73366cfc108514
+  data.tar.gz: 84a799f0f7a394e524dfe52e2c4ab7172bdcd3570cdac35b6c23689af89c81af7d8d86eec5cba85db0b768ca85e4143909f0073db7835810c1adbde2310c51b5

data/lib/opennebula/group.rb

@@ -85,6 +85,10 @@ module OpenNebula
         #   group_hash[:resource_providers]
         #   group_hash[:resource_providers][:zone_id]
         #   group_hash[:resource_providers][:cluster_id]
+        #   group_hash[:views] Array of sunstone view names, to be stored
+        #       in SUNSTONE_VIEWS
+        #   group_hash[:default_view] Default sunstone view name, to be stored
+        #       in DEFAULT_VIEW
         #
         def create(group_hash)
             # Check arguments
@@ -123,18 +127,45 @@ module OpenNebula
                 return OpenNebula::Error.new(error_msg)
             end
 
+            # Set group ACLs to share resources
+            if group_hash[:shared_resources]
+                acls = Array.new
+                acls << "@#{self.id} #{group_hash[:shared_resources]}/@#{self.id} USE"
+
+                rc, msg = create_group_acls(acls)
+
+                if OpenNebula.is_error?(rc)
+                    self.delete
+                    error_msg =  "Error creating group ACL's: #{rc.message}"
+                    return OpenNebula::Error.new(error_msg)
+                end
+            end
+
             # Create associated group admin if needed
             rc = create_admin_user(group_hash)
 
             if OpenNebula.is_error?(rc)
                 self.delete
-                error_msg =  "Error creating admin group: #{rc.message}"
+                error_msg =  "Error creating admin user: #{rc.message}"
                 return OpenNebula::Error.new(error_msg)
             end
 
-            # Add default Sunstone views for the group
+            str = ""
+            update = false
+
+            # Add Sunstone views for the group
             if group_hash[:views]
-                str = "SUNSTONE_VIEWS=\"#{group_hash[:views].join(",")}\"\n"
+                str += "SUNSTONE_VIEWS=\"#{group_hash[:views].join(",")}\"\n"
+                update = true
+            end
+
+            # Add Sunstone views for the group
+            if group_hash[:default_view]
+                str += "DEFAULT_VIEW=\"#{group_hash[:default_view]}\"\n"
+                update = true
+            end
+
+            if update
                 self.update(str, true)
             end
 
@@ -305,6 +336,9 @@ module OpenNebula
                 return rc
             end
 
+            # Set the default admin view to vdcadmin
+            group_admin.update("DEFAULT_VIEW=#{GROUP_ADMIN_SUNSTONE_VIEWS}", true)
+
             #Create admin group acls
             acls = Array.new
 

data/lib/opennebula/image.rb

@@ -206,10 +206,10 @@ module OpenNebula
         #
         # @return [Integer, OpenNebula::Error] The new Image ID in case
         #   of success, Error otherwise
-        def clone(name)
+        def clone(name, target_ds=-1)
             return Error.new('ID not defined') if !@pe_id
 
-            rc = @client.call(IMAGE_METHODS[:clone], @pe_id, name)
+            rc = @client.call(IMAGE_METHODS[:clone], @pe_id, name, target_ds)
 
             return rc
         end

data/lib/opennebula/template.rb

@@ -101,6 +101,7 @@ module OpenNebula
             return Error.new('ID not defined') if !@pe_id
 
             name ||= ""
+            hold = false if hold.nil?
             template ||= ""
 
             rc = @client.call(

data/lib/opennebula/virtual_network.rb

@@ -23,26 +23,21 @@ module OpenNebula
         # Constants and Class Methods
         #######################################################################
 
-
         VN_METHODS = {
             :info       => "vn.info",
             :allocate   => "vn.allocate",
             :delete     => "vn.delete",
-            :addleases  => "vn.addleases",
-            :rmleases   => "vn.rmleases",
+            :add_ar     => "vn.add_ar",
+            :rm_ar      => "vn.rm_ar",
+            :update_ar  => "vn.update_ar",
             :chown      => "vn.chown",
             :chmod      => "vn.chmod",
             :update     => "vn.update",
             :hold       => "vn.hold",
             :release    => "vn.release",
-            :rename     => "vn.rename"
-        }
-
-        VN_TYPES=%w{RANGED FIXED}
-
-        SHORT_VN_TYPES={
-            "RANGED" => "R",
-            "FIXED"  => "F"
+            :rename     => "vn.rename",
+            :reserve    => "vn.reserve",
+            :free_ar    => "vn.free_ar"
         }
 
         # Creates a VirtualNetwork description with just its identifier
@@ -116,38 +111,52 @@ module OpenNebula
             super(VN_METHODS[:delete])
         end
 
-        # Adds a lease to the VirtualNetwork
-        def addleases(ip, mac = nil)
+        # Adds Address Ranges to the VirtualNetwork
+        def add_ar(ar_template)
             return Error.new('ID not defined') if !@pe_id
 
-            lease_template = "LEASES = [ IP = #{ip}"
-            lease_template << ", MAC = #{mac}" if mac
-            lease_template << " ]"
-
-            rc = @client.call(VN_METHODS[:addleases], @pe_id, lease_template)
+            rc = @client.call(VN_METHODS[:add_ar], @pe_id, ar_template)
             rc = nil if !OpenNebula.is_error?(rc)
 
             return rc
         end
 
-        # Removes a lease from the VirtualNetwork
-        def rmleases(ip)
+        # Removes an Address Range from the VirtualNetwork
+        def rm_ar(ar_id)
             return Error.new('ID not defined') if !@pe_id
 
-            lease_template = "LEASES = [ IP = #{ip} ]"
+            rc = @client.call(VN_METHODS[:rm_ar], @pe_id, ar_id.to_i)
+            rc = nil if !OpenNebula.is_error?(rc)
+
+            return rc
+        end
+
+        # Updates Address Ranges from the VirtualNetwork
+        def update_ar(ar_template)
+            return Error.new('ID not defined') if !@pe_id
 
-            rc = @client.call(VN_METHODS[:rmleases], @pe_id, lease_template)
+            rc = @client.call(VN_METHODS[:update_ar], @pe_id, ar_template)
             rc = nil if !OpenNebula.is_error?(rc)
 
             return rc
         end
 
-        # Holds a virtual network Lease as used
-        # @param ip [String] IP to hold
-        def hold(ip)
+        # Holds a virtual network address
+        # @param ip [String] address to hold, if contains ":" a MAC address is assumed
+        # @param ar_id [Integer] The address range to hold the lease. If not set
+        #        the lease will be held from all possible address ranges
+        def hold(ip, ar_id=-1)
             return Error.new('ID not defined') if !@pe_id
 
-            lease_template = "LEASES = [ IP = #{ip} ]"
+            if ip.include?':'
+                addr_name = "MAC"
+            else
+                addr_name = "IP"
+            end
+
+            lease_template =  "LEASES = [ #{addr_name} = #{ip}"
+            lease_template << ", AR_ID = #{ar_id}" if ar_id != -1
+            lease_template << "]"
 
             rc = @client.call(VN_METHODS[:hold], @pe_id, lease_template)
             rc = nil if !OpenNebula.is_error?(rc)
@@ -155,12 +164,22 @@ module OpenNebula
             return rc
         end
 
-        # Releases a virtual network Lease on hold
-        # @param ip [String] IP to release
-        def release(ip)
+        # Releases an address on hold
+        # @param ip [String] IP to release, if contains ":" a MAC address is assumed
+        # @param ar_id [Integer] The address range to release the lease. If not
+        #        set the lease will be freed from all possible address ranges
+        def release(ip, ar_id=-1)
             return Error.new('ID not defined') if !@pe_id
 
-            lease_template = "LEASES = [ IP = #{ip} ]"
+            if ip.include?':'
+                addr_name = "MAC"
+            else
+                addr_name = "IP"
+            end
+
+            lease_template =  "LEASES = [ #{addr_name} = #{ip}"
+            lease_template << ", AR_ID = #{ar_id}" if ar_id != -1
+            lease_template << "]"
 
             rc = @client.call(VN_METHODS[:release], @pe_id, lease_template)
             rc = nil if !OpenNebula.is_error?(rc)
@@ -168,6 +187,49 @@ module OpenNebula
             return rc
         end
 
+        # Reserve a set of addresses from this virtual network
+        # @param name [String] of the reservation
+        # @param rsize[String] number of addresses to reserve
+        # @param ar_id[String] the ar_id to make the reservation. If set to nil
+        #        any address range will be used
+        # @param addr [String] the first address in the reservation. If set to
+        #        nil the first free address will be used
+        # @param vnet [String] ID of the VNET to add the reservation to. If not
+        #        set a new VNET will be created.
+        def reserve(rname, rsize, ar_id, addr, vnet)
+            return Error.new('ID not defined') if !@pe_id
+
+            rtmpl =  "SIZE       = #{rsize}\n"
+            rtmpl << "NAME       = #{rname}\n" if !rname.nil?
+            rtmpl << "AR_ID      = #{ar_id}\n" if !ar_id.nil?
+            rtmpl << "NETWORK_ID = #{vnet}\n"  if !vnet.nil?
+
+            if !addr.nil?
+                if addr.include?':'
+                    addr_name = "MAC"
+                else
+                    addr_name = "IP"
+                end
+
+                rtmpl << "#{addr_name} = #{addr}\n"
+            end
+
+            rc = @client.call(VN_METHODS[:reserve], @pe_id, rtmpl)
+            rc = nil if !OpenNebula.is_error?(rc)
+
+            return rc
+        end
+
+        # Removes an Address Range from the VirtualNetwork
+        def free(ar_id)
+            return Error.new('ID not defined') if !@pe_id
+
+            rc = @client.call(VN_METHODS[:free_ar], @pe_id, ar_id.to_i)
+            rc = nil if !OpenNebula.is_error?(rc)
+
+            return rc
+        end
+
         # Changes the owner/group
         #
         # @param uid [Integer] the new owner id. Set to -1 to leave the current one
@@ -198,7 +260,7 @@ module OpenNebula
             super(VN_METHODS[:chmod], owner_u, owner_m, owner_a, group_u,
                 group_m, group_a, other_u, other_m, other_a)
         end
-        
+
         # Renames this virtual network
         #
         # @param name [String] New name for the virtual network.
@@ -219,21 +281,6 @@ module OpenNebula
             self['GID'].to_i
         end
 
-        # Returns the type of the Virtual Network (numeric value)
-        def type
-            self['TYPE'].to_i
-        end
-
-        # Returns the type of the Virtual Network (string value)
-        def type_str
-            VN_TYPES[type]
-        end
-
-        # Returns the state of the Virtual Network (string value)
-        def short_type_str
-            SHORT_VN_TYPES[type_str]
-        end
-
         def public?
             if self['PERMISSIONS/GROUP_U'] == "1" || self['PERMISSIONS/OTHER_U'] == "1"
                 true

data/lib/opennebula.rb

@@ -56,5 +56,5 @@ require 'opennebula/system'
 module OpenNebula
 
     # OpenNebula version
-    VERSION = '4.6.1'
+    VERSION = '4.7.80'
 end

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 4.6.1
-  prerelease: 
+  version: 4.7.80.beta
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-16 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Libraries needed to talk to OpenNebula
@@ -49,73 +44,72 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- NOTICE
 - lib/opennebula.rb
-- lib/opennebula/document_json.rb
-- lib/opennebula/host.rb
-- lib/opennebula/group_pool.rb
-- lib/opennebula/user_pool.rb
-- lib/opennebula/pool.rb
+- lib/opennebula/acl.rb
+- lib/opennebula/acl_pool.rb
+- lib/opennebula/client.rb
+- lib/opennebula/cluster.rb
 - lib/opennebula/cluster_pool.rb
-- lib/opennebula/template_pool.rb
-- lib/opennebula/document_pool.rb
 - lib/opennebula/datastore.rb
 - lib/opennebula/datastore_pool.rb
-- lib/opennebula/xml_pool.rb
-- lib/opennebula/xml_utils.rb
+- lib/opennebula/document.rb
+- lib/opennebula/document_json.rb
+- lib/opennebula/document_pool.rb
 - lib/opennebula/document_pool_json.rb
-- lib/opennebula/acl_pool.rb
-- lib/opennebula/template.rb
-- lib/opennebula/zone.rb
-- lib/opennebula/client.rb
-- lib/opennebula/cluster.rb
-- lib/opennebula/pool_element.rb
-- lib/opennebula/virtual_machine.rb
-- lib/opennebula/user.rb
 - lib/opennebula/error.rb
-- lib/opennebula/image.rb
+- lib/opennebula/group.rb
+- lib/opennebula/group_pool.rb
+- lib/opennebula/host.rb
 - lib/opennebula/host_pool.rb
-- lib/opennebula/document.rb
-- lib/opennebula/xml_element.rb
-- lib/opennebula/oneflow_client.rb
-- lib/opennebula/virtual_network.rb
+- lib/opennebula/image.rb
 - lib/opennebula/image_pool.rb
-- lib/opennebula/virtual_network_pool.rb
-- lib/opennebula/zone_pool.rb
-- lib/opennebula/group.rb
-- lib/opennebula/system.rb
-- lib/opennebula/virtual_machine_pool.rb
-- lib/opennebula/acl.rb
 - lib/opennebula/ldap_auth.rb
 - lib/opennebula/ldap_auth_spec.rb
-- lib/opennebula/x509_auth.rb
-- lib/opennebula/ssh_auth.rb
-- lib/opennebula/server_x509_auth.rb
+- lib/opennebula/oneflow_client.rb
+- lib/opennebula/pool.rb
+- lib/opennebula/pool_element.rb
 - lib/opennebula/server_cipher_auth.rb
-- NOTICE
-- LICENSE
+- lib/opennebula/server_x509_auth.rb
+- lib/opennebula/ssh_auth.rb
+- lib/opennebula/system.rb
+- lib/opennebula/template.rb
+- lib/opennebula/template_pool.rb
+- lib/opennebula/user.rb
+- lib/opennebula/user_pool.rb
+- lib/opennebula/virtual_machine.rb
+- lib/opennebula/virtual_machine_pool.rb
+- lib/opennebula/virtual_network.rb
+- lib/opennebula/virtual_network_pool.rb
+- lib/opennebula/x509_auth.rb
+- lib/opennebula/xml_element.rb
+- lib/opennebula/xml_pool.rb
+- lib/opennebula/xml_utils.rb
+- lib/opennebula/zone.rb
+- lib/opennebula/zone_pool.rb
 homepage: http://opennebula.org
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: OpenNebula Client API
 test_files: []
 has_rdoc: