opennebula-cli 4.13.80.beta1 → 4.13.85.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d11d3a159c5097cd0867e860e3830a6caf5847b9
-  data.tar.gz: 096c01365fc81804718fe90037c31d4fdbbe76cb
+  metadata.gz: 5fca91efa12f85597ee352ef8adde81871f59fe1
+  data.tar.gz: 9bbb6d98f3434e31f02d11d14f7a3daa694f34a2
 SHA512:
-  metadata.gz: 93738a9b287d2bf42334703b3de47516b2c9f2dcc77212bd98548f08e624bd125a7f399c314f9d68ed01cce0e29ccf96d47ecffc7eef0b698e0a2d2f670662d0
-  data.tar.gz: e15e685a4061d48d2e81b1baa99edd11ee22665dc49f3f0db42283d229a73d05e18595a21bc047bf153c9d6916231581cc75310aaaff76a98ce9e1b3c88daf9c
+  metadata.gz: 53809bc7e557e85afa901241fe8b548ca151c2ce155c32d221e61c0df9f0cda3b3f5878774cecf05043c7077669877ee508c626a42f5ee131404008b37277a9d
+  data.tar.gz: 9770250b6a5dbea174bd51248d3985ac6b9d12595ad82ece9af4a3fe163c90992a6bfa09d948974c027e75788aca1f52aa0c92a2d031347d1236dd0580323a9a

data/bin/onetemplate

@@ -319,7 +319,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Shows information for the given Template
     EOT
 
-    command :show, show_desc, :templateid, :options=>OpenNebulaHelper::XML do
+    command :show, show_desc, :templateid,
+        :options=>[OpenNebulaHelper::XML,OneTemplateHelper::EXTENDED] do
+
         helper.show_resource(args[0],options)
     end
 

data/bin/onevcenter

@@ -115,7 +115,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 next if STDIN.gets.strip.downcase != 'y'
 
                 if cluster.empty?
-                    STDOUT.puts "    No clusters found in #{dc}..."
+                    STDOUT.puts "    No new clusters found in #{dc}..."
                     next
                 end
 

data/bin/onevm

@@ -812,7 +812,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Takes a new snapshot of the given disk. This operation needs support
         from the Datastore drivers: QCOW2 or Ceph.
 
-        States: POWEROFF
+        States: RUNNING, POWEROFF, SUSPENDED
     EOT
 
     command :"disk-snapshot-create", disk_snapshot_create_desc,
@@ -825,7 +825,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     disk_snapshot_revert_desc = <<-EOT.unindent
         Reverts disk state to a previously taken snapshot.
 
-        States: POWEROFF
+        States: RUNNING, POWEROFF, SUSPENDED
     EOT
 
     command :"disk-snapshot-revert", disk_snapshot_revert_desc,
@@ -838,7 +838,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     disk_snapshot_delete_desc = <<-EOT.unindent
         Deletes a disk snapshot.
 
-        States: POWEROFF
+        States: RUNNING, POWEROFF, SUSPENDED
     EOT
     command :"disk-snapshot-delete", disk_snapshot_delete_desc,
       :vmid, :diskid, :snapshot_id do

data/lib/one_helper/onegroup_helper.rb

@@ -117,8 +117,8 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
                             "CPU_USED"    => "0",
                             "MEMORY"      => OneQuotaHelper::LIMIT_DEFAULT,
                             "MEMORY_USED" => "0",
-                            "VOLATILE_SIZE"      => OneQuotaHelper::LIMIT_DEFAULT,
-                            "VOLATILE_SIZE_USED" => "0"
+                            "SYSTEM_DISK_SIZE"      => OneQuotaHelper::LIMIT_DEFAULT,
+                            "SYSTEM_DISK_SIZE_USED" => "0"
                         }
 
                         quotas[d['ID']] = q
@@ -154,8 +154,8 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
                             "CPU_USED"    => "0",
                             "MEMORY"      => OneQuotaHelper::LIMIT_DEFAULT,
                             "MEMORY_USED" => "0",
-                            "VOLATILE_SIZE"      => OneQuotaHelper::LIMIT_DEFAULT,
-                            "VOLATILE_SIZE_USED" => "0"
+                            "SYSTEM_DISK_SIZE"      => OneQuotaHelper::LIMIT_DEFAULT,
+                            "SYSTEM_DISK_SIZE_USED" => "0"
                         }
 
                         quotas[d['ID']] = q
@@ -194,8 +194,8 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
                             "CPU_USED"    => "0",
                             "MEMORY"      => OneQuotaHelper::LIMIT_DEFAULT,
                             "MEMORY_USED" => "0",
-                            "VOLATILE_SIZE"      => OneQuotaHelper::LIMIT_DEFAULT,
-                            "VOLATILE_SIZE_USED" => "0"
+                            "SYSTEM_DISK_SIZE"      => OneQuotaHelper::LIMIT_DEFAULT,
+                            "SYSTEM_DISK_SIZE_USED" => "0"
                         }
 
                         quotas[d['ID']] = q

data/lib/one_helper/onehost_helper.rb

@@ -413,11 +413,22 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
 
         wilds = host.wilds
 
+        begin
+            pcis = [host.to_hash['HOST']['HOST_SHARE']['PCI_DEVICES']['PCI']]
+            pcis = pcis.flatten.compact
+        rescue
+            pcis = nil
+        end
+
         host.delete_element("TEMPLATE/VM")
         host.delete_element("TEMPLATE_WILDS")
 
         puts host.template_str
 
+        if pcis && !pcis.empty?
+            print_pcis(pcis)
+        end
+
         puts
         CLIHelper.print_header("WILD VIRTUAL MACHINES", false)
         puts
@@ -457,4 +468,45 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
         onevm_helper.client=@client
         onevm_helper.list_pool({:filter=>["HOST=#{host.name}"]}, false)
     end
+
+    def print_pcis(pcis)
+        puts
+        CLIHelper.print_header("PCI DEVICES", false)
+        puts
+
+        table=CLIHelper::ShowTable.new(nil, self) do
+            column :VM, "Used by VM", :size => 5, :left => false do |d|
+                if d["VMID"] == "-1"
+                    ""
+                else
+                    d["VMID"]
+                end
+            end
+
+            column :ADDR, "PCI Address", :size => 7, :left => true do |d|
+                d["SHORT_ADDRESS"]
+            end
+
+            column :TYPE, "Type", :size => 14, :left => true do |d|
+                d["TYPE"]
+            end
+
+            column :CLASS, "Class", :size => 12, :left => true do |d|
+                d["CLASS_NAME"]
+            end
+
+            column :NAME, "Name", :size => 50, :left => true do |d|
+                d["DEVICE_NAME"]
+            end
+
+            column :VENDOR, "Vendor", :size => 8, :left => true do |d|
+                d["VENDOR_NAME"]
+            end
+
+            default :VM, :ADDR, :TYPE, :NAME
+
+        end
+
+        table.show(pcis)
+    end
 end

data/lib/one_helper/oneimage_helper.rb

@@ -339,7 +339,19 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
                 d["CHILDREN"]
             end
 
-            column :NAME, "Snapshot Name", :left, :size=>45 do |d|
+            column :SIZE, "", :left, :size=>8 do |d|
+                if d["SIZE"]
+                    OpenNebulaHelper.unit_to_str(
+                                d['SIZE'].to_i,
+                                {},
+                                "M"
+                            )
+                else
+                    "-"
+                end
+            end
+
+            column :NAME, "Snapshot Name", :left, :size=>37 do |d|
                 d["NAME"]
             end
 
@@ -347,7 +359,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
                 OpenNebulaHelper.time_to_str(d["DATE"])
             end
 
-            default :AC, :ID, :PARENT, :DATE, :CHILDREN, :NAME
+            default :AC, :ID, :PARENT, :DATE, :SIZE, :NAME
         end
 
         # Convert snapshot data to an array

data/lib/one_helper/onequota_helper.rb

@@ -34,10 +34,10 @@ class OneQuotaHelper
         #  ]
         #
         #  VM = [
-        #    VMS           = <Max. number of VMs>
-        #    MEMORY        = <Max. allocated memory (MB)>
-        #    CPU           = <Max. allocated CPU>
-        #    VOLATILE_SIZE = <Max. allocated volatile disks (MB)>
+        #    VMS              = <Max. number of VMs>
+        #    MEMORY           = <Max. allocated memory (MB)>
+        #    CPU              = <Max. allocated CPU>
+        #    SYSTEM_DISK_SIZE = <Max. allocated system disk (MB)>
         #  ]
         #
         #  NETWORK = [
@@ -216,8 +216,8 @@ class OneQuotaHelper
                 "CPU_USED"    => "0",
                 "MEMORY"      => limit,
                 "MEMORY_USED" => "0",
-                "VOLATILE_SIZE"      => limit,
-                "VOLATILE_SIZE_USED" => "0"
+                "SYSTEM_DISK_SIZE"      => limit,
+                "SYSTEM_DISK_SIZE_USED" => "0"
             }]
         end
 
@@ -273,20 +273,20 @@ class OneQuotaHelper
                     end
                 end
 
-                column :"VOLATILE_SIZE", "", :right, :size=>20 do |d|
+                column :"SYSTEM_DISK_SIZE", "", :right, :size=>20 do |d|
                     if !d.nil?
-                        elem = 'VOLATILE_SIZE'
+                        elem = 'SYSTEM_DISK_SIZE'
                         limit = d[elem]
                         limit = helper.get_default_limit(
                             limit, "VM_QUOTA/VM/#{elem}")
 
                         if limit == LIMIT_UNLIMITED
                             "%8s /        -" % [
-                                OpenNebulaHelper.unit_to_str(d["VOLATILE_SIZE_USED"].to_i,{},"M")
+                                OpenNebulaHelper.unit_to_str(d["SYSTEM_DISK_SIZE_USED"].to_i,{},"M")
                             ]
                         else
                             "%8s / %8s" % [
-                                OpenNebulaHelper.unit_to_str(d["VOLATILE_SIZE_USED"].to_i,{},"M"),
+                                OpenNebulaHelper.unit_to_str(d["SYSTEM_DISK_SIZE_USED"].to_i,{},"M"),
                                 OpenNebulaHelper.unit_to_str(limit.to_i,{},"M")
                             ]
                         end

data/lib/one_helper/onetemplate_helper.rb

@@ -43,6 +43,13 @@ EOT
         :description => "Integrate userdata into the EC2 section"
     }
 
+    EXTENDED={
+        :name => "extended",
+        :large => "--extended",
+        :description => "Process the template and included extended "+
+                        "information, such as the SIZE for each DISK"
+    }
+
     def self.rname
         "VMTEMPLATE"
     end
@@ -51,6 +58,26 @@ EOT
         "onetemplate.yaml"
     end
 
+
+    def show_resource(id, options)
+        resource = retrieve_resource(id)
+
+        if !options[:extended].nil?
+            rc = resource.info(options[:extended])
+        else
+            rc = resource.info
+        end
+
+        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 format_pool(options)
         config_file = self.class.table_conf
 

data/lib/one_helper/oneuser_helper.rb

@@ -260,8 +260,8 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
                             "CPU_USED"    => "0",
                             "MEMORY"      => OneQuotaHelper::LIMIT_DEFAULT,
                             "MEMORY_USED" => "0",
-                            "VOLATILE_SIZE"      => OneQuotaHelper::LIMIT_DEFAULT,
-                            "VOLATILE_SIZE_USED" => "0"
+                            "SYSTEM_DISK_SIZE"      => OneQuotaHelper::LIMIT_DEFAULT,
+                            "SYSTEM_DISK_SIZE_USED" => "0"
                         }
 
                         quotas[d['ID']] = q
@@ -299,8 +299,8 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
                             "CPU_USED"    => "0",
                             "MEMORY"      => OneQuotaHelper::LIMIT_DEFAULT,
                             "MEMORY_USED" => "0",
-                            "VOLATILE_SIZE"      => OneQuotaHelper::LIMIT_DEFAULT,
-                            "VOLATILE_SIZE_USED" => "0"
+                            "SYSTEM_DISK_SIZE"      => OneQuotaHelper::LIMIT_DEFAULT,
+                            "SYSTEM_DISK_SIZE_USED" => "0"
                         }
 
                         quotas[d['ID']] = q
@@ -341,8 +341,8 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
                             "CPU_USED"    => "0",
                             "MEMORY"      => OneQuotaHelper::LIMIT_DEFAULT,
                             "MEMORY_USED" => "0",
-                            "VOLATILE_SIZE"      => OneQuotaHelper::LIMIT_DEFAULT,
-                            "VOLATILE_SIZE_USED" => "0"
+                            "SYSTEM_DISK_SIZE"      => OneQuotaHelper::LIMIT_DEFAULT,
+                            "SYSTEM_DISK_SIZE_USED" => "0"
                         }
 
                         quotas[d['ID']] = q

data/lib/one_helper/onevm_helper.rb

@@ -28,7 +28,6 @@ $: << MAD_LOCATION
 
 require 'one_helper'
 require 'optparse/time'
-require 'one_tm'
 
 class String
     def red
@@ -46,6 +45,13 @@ private
     end
 end
 
+EXTERNAL_IP_ATTRS = [
+    'GUEST_IP',
+    'AWS_IP_ADDRESS',
+    'AZ_IPADDRESS',
+    'SL_PRIMARYIPADDRESS'
+];
+
 
 class OneVMHelper < OpenNebulaHelper::OneHelper
     MULTIPLE={
@@ -237,11 +243,14 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             end
 
             column :UCPU, "CPU percentage used by the VM", :size=>4 do |d|
-                d["CPU"]
+                cpu = d["MONITORING"]["CPU"]
+                cpu = "0" if cpu.nil?
+
+                cpu
             end
 
             column :UMEM, "Memory used by the VM", :size=>7 do |d|
-                OpenNebulaHelper.unit_to_str(d["MEMORY"].to_i, options)
+                OpenNebulaHelper.unit_to_str(d["MONITORING"]["MEMORY"].to_i, options)
             end
 
             column :HOST, "Host where the VM is running", :left, :size=>10 do |d|
@@ -333,6 +342,16 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
     }
 
     def recover_retry_interactive(vm)
+        begin
+            require 'one_tm'
+        rescue LoadError
+            STDERR.puts <<-EOT
+one_tm library not found. Make sure you execute recover --interactive
+in the frontend machine.
+            EOT
+            exit(-1)
+        end
+
         # Disable CTRL-C in the menu
         trap("SIGINT") { }
 
@@ -505,6 +524,14 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
 
         vm_monitoring = vm.to_hash['VM']['MONITORING']
 
+        # Find out if it is a hybrid VM to avoid showing local IPs
+        isHybrid=false
+        vm_monitoring.each{|key, value|
+            if EXTERNAL_IP_ATTRS.include? key
+                isHybrid=true
+            end
+        }
+
         order_attrs  = %w(CPU MEMORY NETTX NETRX)
 
         vm_monitoring_sort = []
@@ -674,7 +701,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             end
         end
 
-        if vm.has_elements?("/VM/TEMPLATE/NIC")
+        if vm.has_elements?("/VM/TEMPLATE/NIC") and !isHybrid
             puts
             CLIHelper.print_header(str_h1 % "VM NICS",false)
 
@@ -777,7 +804,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             vm.delete_element("/VM/TEMPLATE/NIC")
         end if !options[:all]
 
-        if vm.has_elements?("/VM/TEMPLATE/SECURITY_GROUP_RULE")
+        if vm.has_elements?("/VM/TEMPLATE/SECURITY_GROUP_RULE") and !isHybrid
             puts
             CLIHelper.print_header(str_h1 % "SECURITY",false)
             puts
@@ -1012,7 +1039,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                 d["CHILDREN"]
             end
 
-            column :SIZE, "", :left, :size=>9 do |d|
+            column :SIZE, "", :left, :size=>12 do |d|
                 if d["SIZE"]
                     size = OpenNebulaHelper.unit_to_str(
                                 d['SIZE'].to_i,
@@ -1036,15 +1063,15 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                 "#{monitor_size}/#{size}"
             end
 
-            column :NAME, "Snapshot Name", :left, :size=>26 do |d|
+            column :NAME, "Snapshot Name", :left, :size=>32 do |d|
                 d["NAME"]
             end
 
-            column :DATE, "Snapshot creation date", :size=>10 do |d|
+            column :DATE, "Snapshot creation date", :size=>15 do |d|
                 OpenNebulaHelper.time_to_str(d["DATE"])
             end
 
-            default :AC, :ID, :DISK, :PARENT, :DATE, :CHILDREN, :SIZE, :NAME
+            default :AC, :ID, :DISK, :PARENT, :DATE, :SIZE, :NAME
         end
 
         # Convert snapshot data to an array

data/lib/one_helper.rb

@@ -226,14 +226,20 @@ EOT
             :name   => 'disk',
             :large  => '--disk image0,image1',
             :description => "Disks to attach. To use an image owned by"<<
-                            " other user use user[disk]",
+                            " other user use user[disk]. Add any additional"<<
+                            " attributes separated by ':' and in the shape of"<<
+                            " KEY=VALUE. For example, if the disk must be"<<
+                            " resized, use image0:size=1000 . Or"<<
+                            " image0:size=1000:target=vda,image1:target=vdb",
             :format => Array
         },
         {
             :name   => 'nic',
             :large  => '--nic network0,network1',
             :description => "Networks to attach. To use a network owned by"<<
-                            " other user use user[network]",
+                            " other user use user[network]. Additional"<<
+                            " attributes are supported like with the --disk"<<
+                            " option.",
             :format => Array
         },
         {
@@ -879,12 +885,17 @@ EOT
         template=''
 
         objects.each do |obj|
+            obj, *extra_attributes = obj.split(":")
             res=parse_user_object(obj)
             return [-1, "#{section.capitalize} \"#{obj}\" malformed"] if !res
             user, object=*res
 
             template<<"#{section.upcase}=[\n"
             template<<"  #{name.upcase}_UNAME=\"#{user}\",\n" if user
+            extra_attributes.each do |extra_attribute|
+                key, value = extra_attribute.split("=")
+                template<<"  #{key.upcase}=\"#{value}\",\n"
+            end
             if object.match(/^\d+$/)
                 template<<"  #{name.upcase}_ID=#{object}\n"
             else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 4.13.80.beta1
+  version: 4.13.85.beta2
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2015-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.13.80.beta1
+        version: 4.13.85.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.13.80.beta1
+        version: 4.13.85.beta2
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.org
 executables:
@@ -39,12 +39,12 @@ executables:
 - onevnet
 - onezone
 - oneacl
+- oneflow
 - onehost
 - oneimage
+- onetemplate
 - onevcenter
-- oneflow
 - onevm
-- onetemplate
 extensions: []
 extra_rdoc_files: []
 files:
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: OpenNebula Command Line Interface