opennebula-cli 5.4.15 → 5.5.80.pre

data/lib/one_helper/onevrouter_helper.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    #
@@ -109,6 +109,7 @@ class OneVirtualRouterHelper < OpenNebulaHelper::OneHelper
         puts str % ["NAME", obj.name]
         puts str % ["USER", obj['UNAME']]
         puts str % ["GROUP", obj['GNAME']]
+        puts str % ["LOCK", OpenNebulaHelper.level_lock_to_str(obj['LOCK/LOCKED'])]
         puts
 
         CLIHelper.print_header(str_h1 % "PERMISSIONS",false)

data/lib/one_helper/onezone_helper.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    #
@@ -34,6 +34,20 @@ class OneZoneHelper < OpenNebulaHelper::OneHelper
         :description => "Zone server RPC endpoint"
     }
 
+    def show_resource(id, options)
+        resource = retrieve_resource(id)
+
+        rc = resource.info_extended
+        return -1, rc.message if OpenNebula.is_error?(rc)
+
+        if options[:xml]
+            return 0, resource.to_xml(true)
+        else
+            format_resource(resource, options)
+            return 0
+        end
+    end
+
     def self.rname
         "ZONE"
     end
@@ -117,44 +131,6 @@ class OneZoneHelper < OpenNebulaHelper::OneHelper
         zone_hash=zone.to_hash
 
         if zone.has_elements?("/ZONE/SERVER_POOL/SERVER")
-            servers = zone_hash["ZONE"]["SERVER_POOL"]["SERVER"]
-
-            [servers].flatten.each { |s|
-                endpoint = s["ENDPOINT"]
-
-                next if endpoint.nil?
-
-                options[:timeout] = 5 #5 sec
-                client = OpenNebula::Client.new(nil, endpoint, options)
-
-                xml_doc = client.call("zone.raftstatus")
-
-                if OpenNebula::is_error?(xml_doc)
-                    s["STATE"]     = "error"
-                    s["TERM"]      = "-"
-                    s["VOTEDFOR"]  = "-"
-                    s["COMMIT"  ]  = "-"
-                    s["LOG_INDEX"] = "-"
-
-                    next
-                end
-
-                xml_doc = Nokogiri::XML(xml_doc)
-
-                s["STATE"] = case xml_doc.root.at_xpath("STATE").text
-                     when "0" then "solo"
-                     when "1" then "candidate"
-                     when "2" then "follower"
-                     when "3" then "leader"
-                     else "-"
-                 end
-                s["TERM"]      = xml_doc.root.at_xpath("TERM").text
-                s["VOTEDFOR"]  = xml_doc.root.at_xpath("VOTEDFOR").text
-                s["COMMIT"]    = xml_doc.root.at_xpath("COMMIT").text
-
-                s["LOG_INDEX"]    = xml_doc.root.at_xpath("LOG_INDEX").text
-                s["FEDLOG_INDEX"] = xml_doc.root.at_xpath("FEDLOG_INDEX").text
-            }
 
             puts
             CLIHelper.print_header(str_h1 % "ZONE SERVERS",false)
@@ -188,6 +164,13 @@ class OneZoneHelper < OpenNebulaHelper::OneHelper
                 end
 
                 column :"STATE", "", :left, :size=>10 do |d|
+                    d["STATE"] = case d["STATE"]
+                        when "0" then "solo"
+                        when "1" then "candidate"
+                        when "2" then "follower"
+                        when "3" then "leader"
+                        else "error"
+                    end
                     d["STATE"] if !d.nil?
                 end
 

data/lib/one_helper.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,7 @@ include OpenNebula
 module OpenNebulaHelper
     ONE_VERSION=<<-EOT
 OpenNebula #{OpenNebula::VERSION}
-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
@@ -38,9 +38,11 @@ EOT
     if ONE_LOCATION
         TABLE_CONF_PATH=ONE_LOCATION+"/etc/cli"
         VAR_LOCATION=ONE_LOCATION+"/var" if !defined?(VAR_LOCATION)
+        CLI_ADDONS_LOCATION=ONE_LOCATION+"/lib/ruby/cli/addons"
     else
         TABLE_CONF_PATH="/etc/one/cli"
         VAR_LOCATION="/var/lib/one" if !defined?(VAR_LOCATION)
+        CLI_ADDONS_LOCATION="/usr/lib/one/ruby/cli/addons"
     end
 
     EDITOR_PATH='/usr/bin/vi'
@@ -361,6 +363,18 @@ EOT
             :format => String,
             :description => "In a vCenter environment sets the the VMs and Template folder where the VM will be placed in." \
             " The path uses slashes to separate folders. For example: --vcenter_vm_folder \"/Management/VMs\""
+        },
+        {
+            :name   => 'as_uid',
+            :large  => '--as_uid uid',
+            :format => Integer,
+            :description => 'The User ID to instantiate the VM'
+        },
+        {
+            :name   => 'as_gid',
+            :large  => '--as_gid gid',
+            :format => Integer,
+            :description => 'The Group ID to instantiate the VM'
         }
     ]
 
@@ -745,8 +759,12 @@ EOT
 
             rc = pool.info
             if OpenNebula.is_error?(rc)
-                return -1, "OpenNebula #{self.class.rname} name not " <<
+                if rc.message.empty?
+                    return -1, "OpenNebula #{self.class.rname} name not " <<
                            "found, use the ID instead"
+                else
+                    return -1,rc.message
+                end
             end
 
             return 0, pool
@@ -782,13 +800,15 @@ EOT
     end
 
     def OpenNebulaHelper.size_in_mb(size)
-        m = size.match(/^(\d+(?:\.\d+)?)(m|mb|g|gb)?$/i)
+        m = size.match(/^(\d+(?:\.\d+)?)(t|tb|m|mb|g|gb)?$/i)
 
         if !m
             # return OpenNebula::Error.new('Size value malformed')
             return -1, 'Size value malformed'
         else
             multiplier=case m[2]
+            when /(t|tb)/i
+                1024*1024
             when /(g|gb)/i
                 1024
             else
@@ -814,15 +834,31 @@ EOT
         end
     end
 
-    def OpenNebulaHelper.time_to_str(time, print_seconds=true)
+    def OpenNebulaHelper.time_to_str(time, print_seconds=true, print_hours=true, print_years=false)
         value=time.to_i
         if value==0
             value='-'
         else
-            if print_seconds
-                value=Time.at(value).strftime("%m/%d %H:%M:%S")
+            if print_hours
+                if print_seconds
+                    if print_years
+                        value=Time.at(value).strftime("%m/%d/%y %H:%M:%S")
+                    else
+                        value=Time.at(value).strftime("%m/%d %H:%M:%S")
+                    end
+                else
+                    if print_years
+                        value=Time.at(value).strftime("%m/%d/%y %H:%M")
+                    else
+                        value=Time.at(value).strftime("%m/%d %H:%M")
+                    end
+                end
             else
-                value=Time.at(value).strftime("%m/%d %H:%M")
+                if print_years
+                    value=Time.at(value).strftime("%m/%d/%y")
+                else
+                    value=Time.at(value).strftime("%m/%d")
+                end
             end
         end
 
@@ -1098,6 +1134,9 @@ EOT
         template<<"MEMORY=#{options[:memory]}\n" if options[:memory]
         template<<"#{options[:raw]}\n" if options[:raw]
 
+        template<<"AS_UID=#{options[:as_uid]}\n" if options[:as_uid]
+        template<<"AS_GID=#{options[:as_gid]}\n" if options[:as_gid]
+
         if options[:disk]
             res=create_disk_net(options[:disk], 'DISK', 'IMAGE')
             return res if res.first!=0
@@ -1267,4 +1306,21 @@ EOT
             return OpenNebula::Error.new("Remote server error: #{error_message}")
         end
     end
+
+    def OpenNebulaHelper.level_lock_to_str(str)
+        level = str.to_i
+        if level == 0
+            "None"
+        elsif level == 1
+            "Use"
+        elsif level == 2
+            "Manage"
+        elsif level == 3
+            "Admin"
+        elsif level == 4
+            "All"
+        else
+            "-"
+        end
+    end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 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: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.4.15
+        version: 5.5.80.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.4.15
+        version: 5.5.80.pre
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.org
 executables:
@@ -90,6 +90,7 @@ files:
 - lib/one_helper/onesecgroup_helper.rb
 - lib/one_helper/onetemplate_helper.rb
 - lib/one_helper/oneuser_helper.rb
+- lib/one_helper/onevcenter_helper.rb
 - lib/one_helper/onevdc_helper.rb
 - lib/one_helper/onevm_helper.rb
 - lib/one_helper/onevmgroup_helper.rb
@@ -113,9 +114,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