knife-ovmcli 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b392fc5de09cd159162052e0e70e2e2c3395757
-  data.tar.gz: 61024e6d44d3a9b5fd52c7ed9574d8ec0eae03b6
+  metadata.gz: 1ca4b8d7413b43ba034295d856dc210bc0479fa1
+  data.tar.gz: 4a68816c34d48db63d6d9d341934f018bf8198fd
 SHA512:
-  metadata.gz: a1134edb619229bf2be45be0d9ccdf5c568bb8428467694d08c629197ec81e419cb109d4d52b8c242bac4e0cc83641f44f0766248868d66d33d535acccb254cc
-  data.tar.gz: d9030d249ca3ff5694ba1b46b25154fb50c6505131b7a873026de4513e3dcbad10cc03147f59f652489f3b0ad826f7eb9adaac8c1b4f502846804bebce1e4ff3
+  metadata.gz: 7b054d4e3b86eaf731c8316c5d4db6ecef701a1529ffbd9cef013a6005f64c9ae293c5e99bc878679ce4272ad966b59d6bce6bad49cdb957ca50e00270378d2a
+  data.tar.gz: c71b2b72f7463470d8f244172dbc2fa88ea6ab7acd4d202f0857fa243cc453a3d2f2ff449e7b8894a028032c6efe96ff4e38c89e0e6edda2fc975ac7213c1036

data/lib/chef/knife/BaseOraclevmCommand.rb

@@ -2,7 +2,7 @@
 # Author:: Geoff O'Callaghan (<geoffocallaghan@gmail.com>)
 # Contributor:: Michael Huisman michhuis@gmail.com
 # License:: Apache License, Version 2.0
-#
+# Version::0.0.8
 
 require 'chef/knife'
 
@@ -270,6 +270,30 @@ class Chef
                            return current
                         end
 #
+#                       kill_vm, given a vmname issue a kill request
+#
+			def kill_vm(vmname)
+                           current = {:errormsg => "", :status => "", :time => "", :vmstatus => ""}
+
+                           conn_opts=get_cli_connection
+                           Chef::Log.debug("#{conn_opts[:host]}...show vm name=#{vmname}")
+                           Net::SSH.start( conn_opts[:host], conn_opts[:user], :password => conn_opts[:password], :port => conn_opts[:port] ) do|ssh|
+                              output = ssh.exec!("kill vm name=#{vmname}")
+                              output.each_line do |line|
+                                 if line.match(/Status:/)
+                                    current[:status]=line.split[1].strip
+                                 elsif line.match(/Time:/)
+                                    line["Time: "]=""
+                                    current[:time]=line.strip
+                                 elsif line.match(/Error Msg:/)
+                                    line["Error Msg: "]=""
+                                    current[:errormsg]=line.strip
+                                 end
+                              end
+                           end
+                           return current
+                        end						
+#
 #                       list_vm, display all vm's
 #
 			def list_vm(vmname)
@@ -459,7 +483,55 @@ class Chef
                               end
                            end
                            return current
-                        end									
+                        end
+#
+#                       remove_vdisk, delete vdisk diskmapping
+#
+			def remove_vdisk(vdiskid)
+                           current = {:errormsg => "", :status => "", :time => "", :vmstatus => ""}
+						   
+                           conn_opts=get_cli_connection
+                           Chef::Log.debug("#{conn_opts[:host]}...delete VmDiskMapping id=#{vdiskid}")
+                           Net::SSH.start( conn_opts[:host], conn_opts[:user], :password => conn_opts[:password], :port => conn_opts[:port] ) do|ssh|
+                              output = ssh.exec!("delete VmDiskMapping id=#{vdiskid}")
+                              output.each_line do |line|
+                                 if line.match(/Status:/)
+                                    current[:status]=line.split[1].strip
+                                 elsif line.match(/Time:/)
+                                    line["Time: "]=""
+                                    current[:time]=line.strip
+                                 elsif line.match(/Error Msg:/)
+                                    line["Error Msg: "]=""
+                                    current[:errormsg]=line.strip
+                                 end
+                              end
+                           end
+                           return current
+                        end
+#
+#                       delete_vdisk, delete vdisk
+#
+			def delete_vdisk(vdisk)
+                           current = {:errormsg => "", :status => "", :time => "", :vmstatus => ""}
+						   
+                           conn_opts=get_cli_connection
+                           Chef::Log.debug("#{conn_opts[:host]}...delete VirtualDisk name=#{vdisk}")
+                           Net::SSH.start( conn_opts[:host], conn_opts[:user], :password => conn_opts[:password], :port => conn_opts[:port] ) do|ssh|
+                              output = ssh.exec!("delete VirtualDisk name=#{vdisk}")
+                              output.each_line do |line|
+                                 if line.match(/Status:/)
+                                    current[:status]=line.split[1].strip
+                                 elsif line.match(/Time:/)
+                                    line["Time: "]=""
+                                    current[:time]=line.strip
+                                 elsif line.match(/Error Msg:/)
+                                    line["Error Msg: "]=""
+                                    current[:errormsg]=line.strip
+                                 end
+                              end
+                           end
+                           return current
+                        end						
 #
 #                       edit_vm, edit VM cpu and memory
 #
@@ -485,6 +557,30 @@ class Chef
                            return current
                         end						
 #
+#                       migrate_vm, migrate VM to another server
+#
+			def migrate_vm(vmname, server)
+                           current = {:errormsg => "", :status => "", :time => "", :vmstatus => ""}
+						   
+                           conn_opts=get_cli_connection
+                           Chef::Log.debug("#{conn_opts[:host]}...migrate vm name=#{vmname},destServer=#{server}")
+                           Net::SSH.start( conn_opts[:host], conn_opts[:user], :password => conn_opts[:password], :port => conn_opts[:port] ) do|ssh|
+                              output = ssh.exec!("migrate vm name=#{vmname} destServer=#{server}")
+                              output.each_line do |line|
+                                 if line.match(/Status:/)
+                                    current[:status]=line.split[1].strip
+                                 elsif line.match(/Time:/)
+                                    line["Time: "]=""
+                                    current[:time]=line.strip
+                                 elsif line.match(/Error Msg:/)
+                                    line["Error Msg: "]=""
+                                    current[:errormsg]=line.strip
+                                 end
+                              end
+                           end
+                           return current
+                        end	
+#
 #                       add_vnic, add vnic on vm 
 #
 			def add_vnic(vmname, network, vnicname)

data/lib/chef/knife/ovmcli_vm_deletevdisk.rb

@@ -0,0 +1,33 @@
+#
+# Code copied from Author:: Geoff O'Callaghan (<geoffocallaghan@gmail.com>)
+# Author:: Michael Huisman michhuis@gmail.com
+# License:: Apache License, Version 2.0
+#
+
+require 'chef/knife'
+require 'chef/knife/BaseOraclevmCommand'
+require 'netaddr'
+require 'net/ssh'
+
+# Delete a virtual disk
+class Chef::Knife::OvmcliVmDeletevdisk < Chef::Knife::BaseOraclevmCommand
+
+  banner "knife ovmcli vm deletevdisk VDISK"
+  
+  get_common_options
+
+  def run
+  
+    $stdout.sync = true
+
+    vdisk = @name_args[0]
+	
+    current=delete_vdisk(vdisk)
+    Chef::Log.debug("Status = #{current[:status]}.  Time = #{current[:time]}. VM Status = #{current[:vmstatus]}.")
+
+    if current[:status]!="Success"
+      puts "Call to OVM CLI Failed with #{current[:errormsg]}"
+    end
+
+  end
+end

data/lib/chef/knife/ovmcli_vm_migrate.rb

@@ -0,0 +1,50 @@
+#
+# Author:: Geoff O'Callaghan (<geoffocallaghan@gmail.com>)
+#          Michael Huisman <michhuis@gmail.com> 
+# License:: Apache License, Version 2.0
+#
+
+require 'chef/knife'
+require 'chef/knife/BaseOraclevmCommand'
+require 'netaddr'
+require 'net/ssh'
+
+# Migrate a VM
+class Chef::Knife::OvmcliVmMigrate < Chef::Knife::BaseOraclevmCommand
+
+  banner "knife ovmcli vm migrate VMNAME (options)"
+
+  get_common_options
+
+    option :server,
+    :short => "-s VALUE",
+	:long => "--server VALUE",
+	:description => "The name of the Oracle VM Server on which to migrate the virtual machine."
+
+  def run
+  
+    $stdout.sync = true
+
+    vmname = @name_args[0]
+    if vmname.nil?
+      show_usage
+      ui.fatal("You must specify a virtual machine name")
+      exit 1
+    end
+	
+    current=show_vm_status(vmname)
+    Chef::Log.debug("Status = #{current[:status]}.  Time = #{current[:time]}. VM Status = #{current[:vmstatus]}.")
+   
+    if current[:status]=="Success"
+	   server=get_config(:server)
+       mstatus=migrate_vm(vmname, server)
+       if mstatus[:status] == "Success"
+          puts "#{mstatus[:status]}"
+       else
+          puts "Failed with #{mstatus[:errormsg]}"
+       end
+    else
+      puts "Call to OVM CLI Failed with #{current[:errormsg]}"
+    end
+  end
+end

data/lib/chef/knife/ovmcli_vm_removevdisk.rb

@@ -0,0 +1,33 @@
+#
+# Code copied from Author:: Geoff O'Callaghan (<geoffocallaghan@gmail.com>)
+# Author:: Michael Huisman michhuis@gmail.com
+# License:: Apache License, Version 2.0
+#
+
+require 'chef/knife'
+require 'chef/knife/BaseOraclevmCommand'
+require 'netaddr'
+require 'net/ssh'
+
+# Remove a virtual disk
+class Chef::Knife::OvmcliVmRemovevdisk < Chef::Knife::BaseOraclevmCommand
+
+  banner "knife ovmcli vm removevdisk VDISKID"
+  
+  get_common_options
+
+  def run
+  
+    $stdout.sync = true
+
+    vdiskid = @name_args[0]
+	
+    current=remove_vdisk(vdiskid)
+    Chef::Log.debug("Status = #{current[:status]}.  Time = #{current[:time]}. VM Status = #{current[:vmstatus]}.")
+
+    if current[:status]!="Success"
+      puts "Call to OVM CLI Failed with #{current[:errormsg]}"
+    end
+
+  end
+end

data/lib/chef/knife/ovmcli_vm_state.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Geoff O'Callaghan (<geoffocallaghan@gmail.com>)
+#          Michael Huisman <michhuis@gmail.com> 
 # License:: Apache License, Version 2.0
 #
 
@@ -18,7 +19,7 @@ class Chef::Knife::OvmcliVmState < Chef::Knife::BaseOraclevmCommand
   option :state,
   :short => "-s STATE",
   :long => "--state STATE",
-  :description => "The power state to transition the VM into; one of on|off|suspend|resume|restart"
+  :description => "The power state to transition the VM into; one of on|off|suspend|resume|restart|kill"
 
 
   def run
@@ -56,6 +57,9 @@ class Chef::Knife::OvmcliVmState < Chef::Knife::BaseOraclevmCommand
                  puts "Restart virtual machine #{vmname} : #{result[:status]}"
            when 'resume'
                  puts "Cannot Resume virtual machine #{vmname} as it is on"
+		   when 'kill'
+                 result=kill_vm(vmname)
+                 puts "Kill virtual machine #{vmname} : #{result[:status]}"				 
            else
                  show_usage
            end
@@ -72,6 +76,8 @@ class Chef::Knife::OvmcliVmState < Chef::Knife::BaseOraclevmCommand
                  puts "Cannot Restrt virtual machine #{vmname} as it is off"
            when 'resume'
                  puts "Cannot Resume virtual machine #{vmname} as it is off"
+		   when 'kill'
+                 puts "Cannot Kill virtual machine #{vmname} as it is off"		 
            else
                  show_usage
            end
@@ -87,6 +93,8 @@ class Chef::Knife::OvmcliVmState < Chef::Knife::BaseOraclevmCommand
                  puts "Cannot Restrt virtual machine #{vmname} as it is Stopping"
            when 'resume'
                  puts "Cannot Resume virtual machine #{vmname} as it is Stopping"
+		   when 'kill'
+                 puts "Cannot Kill virtual machine #{vmname} as it is Stopping"		 
            else
                  show_usage
            end
@@ -103,6 +111,9 @@ class Chef::Knife::OvmcliVmState < Chef::Knife::BaseOraclevmCommand
            when 'resume'
                  result=resume_vm(vmname)
                  puts "Resume virtual machine #{vmname} : #{result[:status]}"
+		   when 'kill'
+                 result=kill_vm(vmname)
+                 puts "Killing virtual machine #{vmname} : #{result[:status]}"		 
            else
                  show_usage
            end

data/lib/knife-ovmcli/version.rb

@@ -1,4 +1,4 @@
 module KnifeOvmCli
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-ovmcli
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
-- Geoff O'Callaghan / Michael Huisman
+- Michael Huisman / Geoff O'Callaghan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2016-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netaddr
@@ -52,9 +52,12 @@ files:
 - lib/chef/knife/ovmcli_vm_clone.rb
 - lib/chef/knife/ovmcli_vm_createvdisk.rb
 - lib/chef/knife/ovmcli_vm_delete.rb
+- lib/chef/knife/ovmcli_vm_deletevdisk.rb
 - lib/chef/knife/ovmcli_vm_edit.rb
 - lib/chef/knife/ovmcli_vm_list.rb
 - lib/chef/knife/ovmcli_vm_message.rb
+- lib/chef/knife/ovmcli_vm_migrate.rb
+- lib/chef/knife/ovmcli_vm_removevdisk.rb
 - lib/chef/knife/ovmcli_vm_state.rb
 - lib/knife-ovmcli/version.rb
 homepage: http://github.com/michaelhuisman/knife-ovmcli