opennebula-cli 5.11.85.pre → 5.12.2

data/lib/one_helper/onevnet_helper.rb

@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and        #
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
-
 require 'one_helper'
 require 'one_helper/onevm_helper'
 
@@ -215,6 +214,71 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
         orphans
     end
 
+    # Update VNet address range
+    #
+    # @param vnet_id [Intenger] Virtual Network ID
+    # @param ar_id   [Intenger] Address Range ID
+    # @param file    [String]   Path to file to read
+    # @param options [Hash]     User CLI options
+    def update_ar(vnet_id, ar_id, file, options)
+        perform_action(vnet_id, options, 'AR updated') do |obj|
+            rc = obj.info
+
+            if OpenNebula.is_error?(rc)
+                STDERR.puts rc.message
+                exit(-1)
+            end
+
+            obj.delete_element("AR_POOL/AR[AR_ID!=#{ar_id}]")
+            obj.delete_element('AR_POOL/AR/LEASES')
+            obj.delete_element('AR_POOL/AR/USED_LEASES')
+            obj.delete_element('AR_POOL/AR/MAC_END')
+            obj.delete_element('AR_POOL/AR/IP_END')
+            obj.delete_element('AR_POOL/AR/IP6_ULA')
+            obj.delete_element('AR_POOL/AR/IP6_ULA_END')
+            obj.delete_element('AR_POOL/AR/IP6_GLOBAL')
+            obj.delete_element('AR_POOL/AR/IP6_GLOBAL_END')
+
+            if obj.template_like_str('AR_POOL').empty?
+                STDERR.puts "Address Range #{ar_id} does not exist for " \
+                            "Virtual Network #{vnet_id}"
+                exit(-1)
+            end
+
+            xpath = "AR_POOL/AR[AR_ID=#{ar_id}]"
+
+            if options[:append]
+                str = OpenNebulaHelper.append_template(vnet_id,
+                                                       obj,
+                                                       file,
+                                                       xpath)
+            else
+                str = OpenNebulaHelper.update_template(vnet_id,
+                                                       obj,
+                                                       file,
+                                                       xpath)
+            end
+
+            if options[:append]
+                # Insert element in current template
+                parts = obj.template_like_str('AR_POOL').split("\n")
+
+                # Insert it in second position, OpenNebula will sort it
+                parts.insert(1, "#{str.strip},")
+
+                parts = parts.join("\n")
+                str   = parts
+            else
+                # Use the information from user
+                unless str.gsub(' ', '').match(/AR=\[/)
+                    str = "AR=[\n#{str.split("\n").join(",\n")}]"
+                end
+            end
+
+            obj.update_ar(str)
+        end
+    end
+
     private
 
     def factory(id=nil)

data/lib/one_helper/onezone_helper.rb

@@ -36,6 +36,8 @@ class Replicator
           :service => 'opennebula' },
         { :name    => 'ec2_driver.default',
           :service => 'opennebula' },
+        { :name    => 'monitord.conf',
+          :service => 'opennebula' },
         { :name    => 'econe.conf',
           :service => 'opennebula-econe' },
         { :name    => 'oneflow-server.conf',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 5.11.85.pre
+  version: 5.12.2
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2020-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,18 +16,19 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.11.85.pre
+        version: 5.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.11.85.pre
+        version: 5.12.2
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.io
 executables:
 - oneacct
+- onevcenter
 - oneacl
 - onecluster
 - onedatastore
@@ -43,7 +44,6 @@ executables:
 - oneshowback
 - onetemplate
 - oneuser
-- onevcenter
 - onevdc
 - onevm
 - onevmgroup
@@ -55,6 +55,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/oneacct
+- bin/onevcenter
 - bin/oneacl
 - bin/onecluster
 - bin/onedatastore
@@ -70,7 +71,6 @@ files:
 - bin/oneshowback
 - bin/onetemplate
 - bin/oneuser
-- bin/onevcenter
 - bin/onevdc
 - bin/onevm
 - bin/onevmgroup
@@ -81,19 +81,15 @@ files:
 - lib/cli_helper.rb
 - lib/command_parser.rb
 - lib/one_helper.rb
-- lib/one_helper/oneacct_helper.rb
 - lib/one_helper/oneacl_helper.rb
 - lib/one_helper/onecluster_helper.rb
 - lib/one_helper/onedatastore_helper.rb
-- lib/one_helper/oneflow_helper.rb
-- lib/one_helper/oneflowtemplate_helper.rb
 - lib/one_helper/onegroup_helper.rb
 - lib/one_helper/onehook_helper.rb
 - lib/one_helper/onehost_helper.rb
 - lib/one_helper/oneimage_helper.rb
 - lib/one_helper/onemarket_helper.rb
 - lib/one_helper/onemarketapp_helper.rb
-- lib/one_helper/oneprovision_helper.rb
 - lib/one_helper/onequota_helper.rb
 - lib/one_helper/onesecgroup_helper.rb
 - lib/one_helper/onetemplate_helper.rb
@@ -106,6 +102,10 @@ files:
 - lib/one_helper/onevntemplate_helper.rb
 - lib/one_helper/onevrouter_helper.rb
 - lib/one_helper/onezone_helper.rb
+- lib/one_helper/oneacct_helper.rb
+- lib/one_helper/oneflow_helper.rb
+- lib/one_helper/oneflowtemplate_helper.rb
+- lib/one_helper/oneprovision_helper.rb
 - NOTICE
 - LICENSE
 homepage: http://opennebula.io
@@ -123,9 +123,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: []
 rubyforge_project: 
 rubygems_version: 2.0.14.1