opennebula-cli 5.0.0 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d9b56960590291cd32e8624224784f6d457b0dd
-  data.tar.gz: 7da70ea462ad1446c4ed9916b02f8827d0a4bb90
+  metadata.gz: 10038339d922cdf1ab6992aa381ed432f3965149
+  data.tar.gz: 11cc0ef4f6ddb062f2ed6641a0fdd7babc6d697a
 SHA512:
-  metadata.gz: 159f97db54fa505c0b8e69a14293f5746d8769425bcd8e80d706865c8b008f2c029975854b951117a04483f3e546736f48e355a162f6d86075d73a211c42265a
-  data.tar.gz: 1eb956cfd583f699cf2e5ee61c0e8ec557a9c6244758a965bbeb251548a804219d6736be73543003fb9193a098bb932f7541e07620606a30e32d653c754c27eb
+  metadata.gz: 058178f751626c5ef3d2839be154e26539cef81bb368076605eefbd0626712bbdb26fd22f3f33d52d159b5e71d632961ec5b9f9ddd28c8a5548a498a63b980fe
+  data.tar.gz: 859c40a5741d92f33108dc8b892a38761095b96c60b42f68aa380c0a56b902e99694bc3fdd4dce09cb351ee9e877b7cb3dfc305c6ddc6b2d42f7a7c51ec9260e

data/bin/oneuser

@@ -516,4 +516,18 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
         0
     end
+
+    passwdsearch_desc = <<-EOT.unindent
+        Searches for users with a specific auth driver that has the given
+        string in their password field
+    EOT
+
+    command :passwdsearch, passwdsearch_desc, :driver, :password,
+            :options=>[CLIHelper::CSV_OPT, OpenNebulaHelper::XML] do
+
+        options[:list] = ["ID", "NAME", "AUTH", "PASSWORD"]
+        options[:filter] = ["AUTH=#{args[0]}", "PASSWORD=#{args[1]}"]
+
+        helper.list_pool(options)
+    end
 end

data/bin/onevrouter

@@ -119,7 +119,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             :options=>instantiate_options+OpenNebulaHelper::TEMPLATE_OPTIONS do
         exit_code=0
 
-        if args[1] && OpenNebulaHelper.create_template_options_used?(options)
+        if args[2] && OpenNebulaHelper.create_template_options_used?(options)
             STDERR.puts "You cannot use both template file and template"<<
                 " creation options."
             next -1

data/lib/one_helper/onevm_helper.rb

@@ -45,13 +45,6 @@ private
     end
 end
 
-EXTERNAL_IP_ATTRS = [
-    'GUEST_IP',
-    'AWS_IP_ADDRESS',
-    'AZ_IPADDRESS',
-    'SL_PRIMARYIPADDRESS'
-];
-
 
 class OneVMHelper < OpenNebulaHelper::OneHelper
     MULTIPLE={
@@ -171,6 +164,10 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             vm_nics = [vm["TEMPLATE"]['NIC']].flatten
         end
 
+        if !vm["TEMPLATE"]["PCI"].nil?
+            vm_nics = [vm_nics, vm["TEMPLATE"]['PCI']].flatten
+        end
+
         vm_nics.each do |nic|
             ["IP", "IP6_GLOBAL", "IP6_ULA",
              "VROUTER_IP", "VROUTER_IP6_GLOBAL", "VROUTER_IP6_ULA"].each do |attr|
@@ -475,6 +472,8 @@ in the frontend machine.
 
         cluster = nil
 
+        vm_hash = vm.to_hash
+
         if %w{ACTIVE SUSPENDED POWEROFF}.include? vm.state_str
             cluster_id = vm['/VM/HISTORY_RECORDS/HISTORY[last()]/CID']
         else
@@ -522,12 +521,12 @@ in the frontend machine.
 
         CLIHelper.print_header(str_h1 % "VIRTUAL MACHINE MONITORING",false)
 
-        vm_monitoring = vm.to_hash['VM']['MONITORING']
+        vm_monitoring = vm_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
+            if VirtualMachine::EXTERNAL_IP_ATTRS.include? key
                 isHybrid=true
             end
         }
@@ -576,11 +575,11 @@ in the frontend machine.
         vm_disks = []
 
         if vm.has_elements?("/VM/TEMPLATE/DISK")
-            vm_disks = [vm.to_hash['VM']['TEMPLATE']['DISK']].flatten
+            vm_disks = [vm_hash['VM']['TEMPLATE']['DISK']].flatten
         end
 
         if vm.has_elements?("/VM/TEMPLATE/CONTEXT")
-            context_disk = vm.to_hash['VM']['TEMPLATE']['CONTEXT']
+            context_disk = vm_hash['VM']['TEMPLATE']['CONTEXT']
 
             context_disk["IMAGE"]     = "CONTEXT"
             context_disk["DATASTORE"] = "-"
@@ -689,16 +688,21 @@ in the frontend machine.
 
         sg_nics = []
 
-        if (vm.has_elements?("/VM/TEMPLATE/NIC/SECURITY_GROUPS"))
-            sg_nics = [vm.to_hash['VM']['TEMPLATE']['NIC']].flatten
+        if (vm.has_elements?("/VM/TEMPLATE/NIC/SECURITY_GROUPS") ||
+            vm.has_elements?("/VM/TEMPLATE/PCI[NIC_ID>-1]/SECURITY_GROUPS"))
 
-            sg_nics.each do |nic|
-                sg = nic["SECURITY_GROUPS"]
+            sg_nics = [vm_hash['VM']['TEMPLATE']['NIC']]
 
-                if sg.nil?
-                    next
+            sg_pcis = [vm_hash['VM']['TEMPLATE']['PCI']].flatten.compact
+
+            sg_pcis.each do |pci|
+                if !pci['NIC_ID'].nil?
+                    sg_nics << pci
                 end
             end
+
+            sg_nics.flatten!
+            sg_nics.compact!
         end
 
         # This variable holds the extra IP's got from monitoring. Right
@@ -717,7 +721,9 @@ in the frontend machine.
 
         extra_ips.uniq!
 
-        if vm.has_elements?("/VM/TEMPLATE/NIC") || !extra_ips.empty?
+        if vm.has_elements?("/VM/TEMPLATE/NIC") ||
+           vm.has_elements?("/VM/TEMPLATE/PCI[NIC_ID>-1]") || !extra_ips.empty?
+
             puts
             CLIHelper.print_header(str_h1 % "VM NICS",false)
 
@@ -729,7 +735,19 @@ in the frontend machine.
             shown_ips = []
 
             array_id = 0
-            vm_nics = [vm.to_hash['VM']['TEMPLATE']['NIC']].flatten.compact
+            vm_nics = [vm_hash['VM']['TEMPLATE']['NIC']]
+
+            vm_pcis = [vm_hash['VM']['TEMPLATE']['PCI']].flatten.compact
+
+            vm_pcis.each do |pci|
+                if !pci['NIC_ID'].nil?
+                    vm_nics << pci
+                end
+            end
+
+            vm_nics.flatten!
+            vm_nics.compact!
+
             vm_nics.each {|nic|
 
                 next if nic.has_key?("CLI_DONE")
@@ -816,6 +834,14 @@ in the frontend machine.
                     end
                 end
 
+                column :PCI_ID, "", :left, :size=>8 do |d|
+                    if d["DOUBLE_ENTRY"]
+                        ""
+                    else
+                        d["PCI_ID"]
+                    end
+                end
+
             end.show(vm_nics,{})
 
             while vm.has_elements?("/VM/TEMPLATE/NIC")
@@ -898,7 +924,7 @@ in the frontend machine.
                     d["RANGE"]
                 end
 
-            end.show([vm.to_hash['VM']['TEMPLATE']['SECURITY_GROUP_RULE']].flatten, {})
+            end.show([vm_hash['VM']['TEMPLATE']['SECURITY_GROUP_RULE']].flatten, {})
 
             while vm.has_elements?("/VM/TEMPLATE/SECURITY_GROUP_RULE")
                 vm.delete_element("/VM/TEMPLATE/SECURITY_GROUP_RULE")
@@ -927,7 +953,7 @@ in the frontend machine.
                     d["HYPERVISOR_ID"] if !d.nil?
                 end
 
-            end.show([vm.to_hash['VM']['TEMPLATE']['SNAPSHOT']].flatten, {})
+            end.show([vm_hash['VM']['TEMPLATE']['SNAPSHOT']].flatten, {})
 
             vm.delete_element("/VM/TEMPLATE/SNAPSHOT")
         end
@@ -964,7 +990,7 @@ in the frontend machine.
                 column :"MESSAGE", "", :left, :donottruncate, :size=>35 do |d|
                     d["MESSAGE"] if !d.nil?
                 end
-            end.show([vm.to_hash['VM']['USER_TEMPLATE']['SCHED_ACTION']].flatten, {})
+            end.show([vm_hash['VM']['USER_TEMPLATE']['SCHED_ACTION']].flatten, {})
         end
 
         if vm.has_elements?("/VM/USER_TEMPLATE")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.2
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.0.2
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.org
 executables:
@@ -40,7 +40,6 @@ executables:
 - onesecgroup
 - oneshowback
 - onetemplate
-- oneuser
 - onevdc
 - onevnet
 - onezone
@@ -48,6 +47,7 @@ executables:
 - onevm
 - oneacct
 - onevcenter
+- oneuser
 - onevrouter
 extensions: []
 extra_rdoc_files: []