opennebula-cli 5.2.1 → 5.3.80.beta1

data/lib/one_helper/oneacl_helper.rb

@@ -44,7 +44,7 @@ private
     def self.resource_mask(str)
         resource_type=str.split("/")[0]
 
-        mask = "----------------"
+        mask = "-----------------"
 
         resource_type.split("+").each{|type|
             case type
@@ -80,6 +80,8 @@ private
                     mask[14] = "M"
                 when "MARKETPLACEAPP"
                     mask[15] = "A"
+                when "VMGROUP"
+                    mask[16] = "P"
             end
         }
         mask
@@ -119,8 +121,8 @@ private
                 d['STRING'].split(" ")[0]
             end
 
-            column :RES_VHNIUTGDCOZSvRMA, "Resource to which the rule applies",
-                            :size => 20 do |d|
+            column :RES_VHNIUTGDCOZSvRMAP, "Resource to which the rule applies",
+                            :size => 21 do |d|
                OneAclHelper::resource_mask d['STRING'].split(" ")[1]
             end
 
@@ -137,7 +139,7 @@ private
                 OneAclHelper::right_mask d['STRING'].split(" ")[2]
             end
 
-            default :ID, :USER, :RES_VHNIUTGDCOZSvRMA, :RID, :OPE_UMAC, :ZONE
+            default :ID, :USER, :RES_VHNIUTGDCOZSvRMAP, :RID, :OPE_UMAC, :ZONE
         end
 
         table

data/lib/one_helper/onehost_helper.rb

@@ -382,14 +382,19 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
         puts
 
         CLIHelper.print_header(str_h1 % "HOST SHARES", false)
-
-        puts str % ["TOTAL MEM", OpenNebulaHelper.unit_to_str(host['HOST_SHARE/MAX_MEM'].to_i, {})]
-        puts str % ["USED MEM (REAL)", OpenNebulaHelper.unit_to_str(host['HOST_SHARE/USED_MEM'].to_i, {})]
-        puts str % ["USED MEM (ALLOCATED)", OpenNebulaHelper.unit_to_str(host['HOST_SHARE/MEM_USAGE'].to_i, {})]
-        puts str % ["TOTAL CPU", host['HOST_SHARE/MAX_CPU']]
-        puts str % ["USED CPU (REAL)", host['HOST_SHARE/USED_CPU']]
-        puts str % ["USED CPU (ALLOCATED)", host['HOST_SHARE/CPU_USAGE']]
         puts str % ["RUNNING VMS", host['HOST_SHARE/RUNNING_VMS']]
+
+        CLIHelper.print_header(str_h1 % "MEMORY", false)
+          puts str % ["  TOTAL", OpenNebulaHelper.unit_to_str(host['HOST_SHARE/TOTAL_MEM'].to_i, {})]
+          puts str % ["  TOTAL +/- RESERVED", OpenNebulaHelper.unit_to_str(host['HOST_SHARE/MAX_MEM'].to_i, {})]
+          puts str % ["  USED (REAL)", OpenNebulaHelper.unit_to_str(host['HOST_SHARE/USED_MEM'].to_i, {})]
+          puts str % ["  USED (ALLOCATED)", OpenNebulaHelper.unit_to_str(host['HOST_SHARE/MEM_USAGE'].to_i, {})]
+
+        CLIHelper.print_header(str_h1 % "CPU", false)
+          puts str % ["  TOTAL", host['HOST_SHARE/TOTAL_CPU']]
+          puts str % ["  TOTAL +/- RESERVED", host['HOST_SHARE/MAX_CPU']]
+          puts str % ["  USED (REAL)", host['HOST_SHARE/USED_CPU']]
+          puts str % ["  USED (ALLOCATED)", host['HOST_SHARE/CPU_USAGE']]
         puts
 
         datastores = host.to_hash['HOST']['HOST_SHARE']['DATASTORES']['DS']

data/lib/one_helper/oneimage_helper.rb

@@ -103,14 +103,22 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
             :name => "disk_type",
             :large => "--disk_type disk_type",
             :description => "Type of the image \n"<<
-                            " "*31<<"for KVM: BLOCK, CDROM, RBD or FILE \n"<<
-                            " "*31<<"for vCenter: THIN, TICHK, ZEOREDTHICK " <<
+                            " " * 31 << "BLOCK, CDROM, RBD or FILE \n" <<
                                      "(for others, check the documentation) ",
             :format => String
         },
         {
-            :name => "adapter_type",
-            :large => "--adapter_type adapter_type",
+            :name => "vcenter_disk_type",
+            :large => "--vcenter_disk_type vcenter_disk_type",
+            :description => "The vCenter Disk Type of the image \n"<<
+                            " " * 31 <<
+                            "for vCenter: THIN, THICK, ZEROEDTHICK " <<
+                            "(for others, check the documentation) ",
+            :format => String
+        },
+        {
+            :name => "vcenter_adapter_type",
+            :large => "--vcenter_adapter_type vcenter_adapter_type",
             :description => "Controller that will handle this image in " <<
                             "vCenter (lsiLogic, ide, busLogic). For other "<<
                             "values check the documentation",
@@ -358,16 +366,16 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
     end
 
     def self.create_image_variables(options, name)
-        if Array===name
-            names=name
+        if Array === name
+            names = name
         else
-            names=[name]
+            names = [name]
         end
 
-        t=''
+        t = ''
         names.each do |n|
             if options[n]
-                t<<"#{n.to_s.upcase}=\"#{options[n]}\"\n"
+                t << "#{n.to_s.upcase}=\"#{options[n]}\"\n"
             end
         end
 
@@ -375,16 +383,21 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
     end
 
     def self.create_image_template(options)
-        template_options=TEMPLATE_OPTIONS.map do |o|
+        template_options = TEMPLATE_OPTIONS.map do |o|
             o[:name].to_sym
         end
 
-        template=create_image_variables(
-            options, template_options-[:persistent, :dry, :prefix])
+        template =  create_image_variables(
+                        options,
+                        template_options -  [:persistent, :dry, :prefix ]
+                    )
+
+        if options[:persistent]
+            template << "PERSISTENT=YES\n"
+        end
 
-        template<<"PERSISTENT=YES\n" if options[:persistent]
         if options[:prefix]
-            template<<"DEV_PREFIX=\"#{options[:prefix]}\"\n"
+            template << "DEV_PREFIX=\"#{options[:prefix]}\"\n"
         end
 
         [0, template]

data/lib/one_helper/onesecgroup_helper.rb

@@ -153,6 +153,10 @@ class OneSecurityGroupHelper < OpenNebulaHelper::OneHelper
                 d["ICMP_TYPE"]
             end
 
+            column :ICMVP6_TYPE, "", :left, :size=>11 do |d|
+                d["ICMPV6_TYPE"]
+            end
+
             column :NETWORK, "", :left, :donottruncate, :size=>35 do |d|
                 network = ""
                 if(!d["NETWORK_ID"].nil? && d["NETWORK_ID"] != "")

data/lib/one_helper/onevm_helper.rb

@@ -169,7 +169,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         end
 
         vm_nics.each do |nic|
-            ["IP", "IP6_GLOBAL", "IP6_ULA",
+            ["IP", "IP6_GLOBAL", "IP6_ULA", "IP6",
              "VROUTER_IP", "VROUTER_IP6_GLOBAL", "VROUTER_IP6_ULA"].each do |attr|
                 if nic.has_key?(attr)
                     ips.push(nic[attr])
@@ -752,7 +752,7 @@ in the frontend machine.
 
                 next if nic.has_key?("CLI_DONE")
 
-                ["IP6_LINK", "IP6_ULA", "IP6_GLOBAL"].each do |attr|
+                ["IP6_LINK", "IP6_ULA", "IP6_GLOBAL", "IP6"].each do |attr|
                     if nic.has_key?(attr)
                         shown_ips << nic[attr]
 
@@ -1015,16 +1015,29 @@ in the frontend machine.
                 d["SEQ"]
             end
 
-            column :HOST, "Host name of the VM container", :left, :size=>15 do |d|
-                d["HOSTNAME"]
+            column :UID, "UID of the user that performed the action",
+                :left, :size=>4 do |d|
+                if d["UID"] != "-1"
+                    d["UID"]
+                else
+                    "-"
+                end
             end
 
-            column :"ACTION", "VM state change action", :left, :size=>16 do |d|
-                VirtualMachine.get_history_action d["ACTION"]
+            column :REQ, "Request ID of the action", :left, :size=>5 do |d|
+                if d["REQUEST_ID"] != "-1"
+                    d["REQUEST_ID"]
+                else
+                    "-"
+                end
             end
 
-            column :REASON, "VM state change reason", :left, :size=>4 do |d|
-                VirtualMachine.get_reason d["REASON"]
+            column :HOST, "Host name of the VM container", :left, :size=>12 do |d|
+                d["HOSTNAME"]
+            end
+
+            column :"ACTION", "VM state change action", :left, :size=>10 do |d|
+                VirtualMachine.get_history_action d["ACTION"]
             end
 
             column :DS, "System Datastore", :size=>4 do |d|
@@ -1053,7 +1066,7 @@ in the frontend machine.
                 OpenNebulaHelper.short_period_to_str(dtime)
             end
 
-            default :SEQ, :HOST, :ACTION, :DS, :START, :TIME, :PROLOG
+            default :SEQ, :UID, :REQ, :HOST, :ACTION, :DS, :START, :TIME, :PROLOG
         end
 
         vm_hash=vm.to_hash

data/lib/one_helper/onevmgroup_helper.rb

@@ -0,0 +1,170 @@
+# -------------------------------------------------------------------------- #
+# 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 'one_helper'
+
+class OneVMGroupHelper < OpenNebulaHelper::OneHelper
+    def self.rname
+        "VM_GROUP"
+    end
+
+    def self.conf_file
+        "onevmgroup.yaml"
+    end
+
+    def format_pool(options)
+        config_file = self.class.table_conf
+
+        table = CLIHelper::ShowTable.new(config_file, self) do
+            column :ID, "ONE identifier for the VM Group", :size=>4 do |d|
+                d["ID"]
+            end
+
+            column :NAME, "Name of the VM Group", :left, :size=>15 do |d|
+                d["NAME"]
+            end
+
+            column :USER, "Username of the VM Group owner", :left,
+                    :size=>8 do |d|
+                helper.user_name(d, options)
+            end
+
+            column :GROUP, "Group of the VM Group", :left, :size=>8 do |d|
+                helper.group_name(d, options)
+            end
+
+            column :VMS, "Number of VMs in the VM Group", :left, :size=>4 do |d|
+                vms   = 0
+
+                if !d["ROLES"]["ROLE"].nil?
+	        	roles = [d["ROLES"]["ROLE"]].flatten
+                    roles.each { |r|
+                        vms += r["VMS"].split(',').size if !r["VMS"].nil?
+                    }
+                end
+
+                vms
+            end
+
+            column :ROLES, "Roles in the VM Group", :left, :size=>36 do |d|
+                roles = [d["ROLES"]["ROLE"]].flatten
+                roles_names = ""
+
+                if !roles.nil?
+                    rnames = roles.collect { |i| i["NAME"] }
+                    roles_names = rnames.join(", ") if !rnames.empty?
+                end
+
+                roles_names
+            end
+
+            default :ID, :USER, :GROUP, :NAME, :VMS, :ROLES
+        end
+
+        table
+    end
+
+    private
+
+    def factory(id=nil)
+        if id
+            OpenNebula::VMGroup.new_with_id(id, @client)
+        else
+            xml=OpenNebula::VMGroup.build_xml
+            OpenNebula::VMGroup.new(xml, @client)
+        end
+    end
+
+    def factory_pool(user_flag=-2)
+        OpenNebula::VMGroupPool.new(@client, user_flag)
+    end
+
+    def format_resource(vmgroup, options = {})
+        str="%-15s: %-20s"
+        str_h1="%-80s"
+
+        CLIHelper.print_header(
+            str_h1 % "VM GROUP #{vmgroup['ID']} INFORMATION")
+        puts str % ["ID", vmgroup.id.to_s]
+        puts str % ["NAME", vmgroup.name]
+        puts str % ["USER", vmgroup['UNAME']]
+        puts str % ["GROUP", vmgroup['GNAME']]
+
+        CLIHelper.print_header(str_h1 % "PERMISSIONS",false)
+
+        puts
+
+        ["OWNER", "GROUP", "OTHER"].each { |e|
+            mask = "---"
+            mask[0] = "u" if vmgroup["PERMISSIONS/#{e}_U"] == "1"
+            mask[1] = "m" if vmgroup["PERMISSIONS/#{e}_M"] == "1"
+            mask[2] = "a" if vmgroup["PERMISSIONS/#{e}_A"] == "1"
+
+            puts str % [e,  mask]
+        }
+
+        puts
+
+        CLIHelper.print_header(str_h1 % "ROLES", false)
+
+        if !vmgroup.to_hash['VM_GROUP']['ROLES']['ROLE'].nil?
+            roles = [vmgroup.to_hash['VM_GROUP']['ROLES']['ROLE']].flatten
+        end
+
+        CLIHelper::ShowTable.new(nil, self) do
+            column :ID, "", :left, :size=>4 do |d|
+                d["ID"]
+            end
+
+            column :NAME, "", :left, :size=>8 do |d|
+                d["NAME"]
+            end
+
+            column :POLICY, "", :left, :size=>12 do |d|
+                if d["POLICY"].nil?
+                    '-'
+                else
+                    d["POLICY"]
+                end
+            end
+
+            column :AFFINED_HOSTS, "", :left, :size=>18 do |d|
+                if d["HOST_AFFINED"].nil?
+                    '-'
+                else
+                    d["HOST_AFFINED"]
+                end
+            end
+
+            column :ANTI_AFFINED_HOST, "", :left, :size=>18 do |d|
+                if d["HOST_ANTI_AFFINED"].nil?
+                    '-'
+                else
+                    d["HOST_ANTI_AFFINED"]
+                end
+            end
+
+            column :VIRTUAL_MACHINES, "", :left, :size=>20 do |d|
+                d["VMS"]
+            end
+        end.show(roles, {})
+
+        puts
+
+        CLIHelper.print_header(str_h1 % "TEMPLATE CONTENTS",false)
+        puts vmgroup.template_str
+    end
+end

data/lib/one_helper/onevnet_helper.rb

@@ -48,6 +48,14 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
         :description => "First IP address in . notation"
     }
 
+    IP6 = {
+        :name => "ip6",
+        :short => "-6 ip6",
+        :large => "--ip6 ip6",
+        :format => String,
+        :description => "First IPv6 address, in CIDR notation e.g. 2001::1/48"
+    }
+
     SIZE = {
         :name => "size",
         :short => "-s size",
@@ -117,7 +125,8 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
     ]
 
     ADDAR_OPTIONS = [
-        SIZE, MAC, IP, IP6_GLOBAL, IP6_ULA, GATEWAY, NETMASK, VN_MAD, VLAN_ID ]
+        SIZE, MAC, IP, IP6, IP6_GLOBAL, IP6_ULA, GATEWAY, NETMASK, VN_MAD,
+        VLAN_ID ]
 
     def self.rname
         "VNET"
@@ -274,6 +283,10 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
                 puts format % ["IP6_ULA", ar["IP6_ULA"], ar["IP6_ULA_END"]]
             end
 
+            if !ar["IP6"].nil?
+                puts format % ["IP6", ar["IP6"], ar["IP6_END"]]
+            end
+
             puts
         end
 
@@ -325,8 +338,8 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
                     d["IP"]||"-"
             end
 
-            column :IP6_GLOBAL, "", :donottruncate, :size=>26 do |d|
-                    d["IP6_GLOBAL"]||"-"
+            column :IP6, "", :donottruncate, :size=>26 do |d|
+                    d["IP6"]||d["IP6_GLOBAL"]||"-"
             end
         end.show(leases, {})
 

data/lib/one_helper/onezone_helper.rb

@@ -18,6 +18,22 @@ require 'one_helper'
 
 class OneZoneHelper < OpenNebulaHelper::OneHelper
 
+    SERVER_NAME={
+        :name => "server_name",
+        :short => "-n server_name",
+        :large => "--name",
+        :format => String,
+        :description => "Zone server name"
+    }
+
+    SERVER_ENDPOINT={
+        :name => "server_rpc",
+        :short => "-r rpc endpoint",
+        :large => "--rpc",
+        :format => String,
+        :description => "Zone server RPC endpoint"
+    }
+
     def self.rname
         "ZONE"
     end
@@ -98,6 +114,86 @@ class OneZoneHelper < OpenNebulaHelper::OneHelper
         puts str % ["NAME", zone.name]
         puts
 
+        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?
+
+                client = OpenNebula::Client.new(nil, endpoint)
+
+                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
+            }
+
+            puts
+            CLIHelper.print_header(str_h1 % "SERVERS",false)
+
+            CLIHelper::ShowTable.new(nil, self) do
+
+                column :"ID", "", :size=>2 do |d|
+                    d["ID"] if !d.nil?
+                end
+
+                column :"NAME", "", :left, :size=>15 do |d|
+                    d["NAME"] if !d.nil?
+                end
+
+                column :"STATE", "", :left, :size=>10 do |d|
+                    d["STATE"] if !d.nil?
+                end
+
+                column :"TERM", "", :left, :size=>10 do |d|
+                    d["TERM"] if !d.nil?
+                end
+
+                column :"INDEX", "", :left, :size=>10 do |d|
+                    d["LOG_INDEX"] if !d.nil?
+                end
+
+                column :"COMMIT", "", :left, :size=>10 do |d|
+                    d["COMMIT"] if !d.nil?
+                end
+
+                column :"VOTE", "", :left, :size=>5 do |d|
+                    d["VOTEDFOR"] if !d.nil?
+                end
+
+                column :"ENDPOINT", "", :left, :size=>18 do |d|
+                    d["ENDPOINT"] if !d.nil?
+                end
+            end.show([zone_hash['ZONE']['SERVER_POOL']['SERVER']].flatten, {})
+        end
+
+        puts
+
         CLIHelper.print_header(str_h1 % "ZONE TEMPLATE", false)
         puts zone.template_str
     end