knife-oraclevm 0.0.3 → 0.0.4

data/lib/chef/knife/BaseOraclevmCommand.rb

@@ -272,21 +272,113 @@ class Chef
 #
 #                       list_vm, display all vm's
 #
-			def list_vm
+			def list_vm(vmname)
                            current = {:errormsg => "", :status => "", :time => "", :vmstatus => ""}
 
                            conn_opts=get_cli_connection
-                           Chef::Log.debug("#{conn_opts[:host]}...list vm")
+                           if not vmname 
+                              Chef::Log.debug("#{conn_opts[:host]}...list vm")
+                              Net::SSH.start( conn_opts[:host], conn_opts[:user], :password => conn_opts[:password], :port => conn_opts[:port] ) do|ssh|
+                                 output = ssh.exec!("list vm")
+                                 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(/ id:/)
+                                       puts line.split(':')[2].strip
+                                    elsif line.match(/Error Msg:/)
+                                       line["Error Msg: "]=""
+                                       current[:errormsg]=line.strip
+                                    end
+                                 end
+                              end
+                              return current
+                           else
+                              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!("show 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
+                                    elsif line.match(/  /)
+                                       puts line
+                                    end
+                                 end
+                              end
+                              return current
+                           end
+                        end
+#
+#                       list_serverpool, display all server pool's
+#
+			def list_serverpool(pool)
+                           current = {:errormsg => "", :status => "", :time => "", :poolstatus => ""}
+
+                           conn_opts=get_cli_connection
+                           if not  pool
+                              Chef::Log.debug("#{conn_opts[:host]}...list serverpool")
+                              Net::SSH.start( conn_opts[:host], conn_opts[:user], :password => conn_opts[:password], :port => conn_opts[:port] ) do|ssh|
+                                 output = ssh.exec!("list serverpool")
+                                 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(/ id:/)
+                                       puts line.split(':')[2].strip
+                                    elsif line.match(/Error Msg:/)
+                                       line["Error Msg: "]=""
+                                       current[:errormsg]=line.strip
+                                    end
+                                 end
+                              end
+                              return current
+                           else
+                              Chef::Log.debug("#{conn_opts[:host]}...show serverpool name=#{pool}")
+                              Net::SSH.start( conn_opts[:host], conn_opts[:user], :password => conn_opts[:password], :port => conn_opts[:port] ) do|ssh|
+                                 output = ssh.exec!("show serverpool name=#{pool}")
+                                 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
+                                    elsif line.match(/  /)
+                                       puts line
+                                    end
+                                 end
+                              end
+                              return current
+                           end
+                        end
+#
+#                       delete_vm, delete VM
+#
+			def delete_vm(vmname)
+                           current = {:errormsg => "", :status => "", :time => "", :vmstatus => ""}
+
+                           conn_opts=get_cli_connection
+                           Chef::Log.debug("#{conn_opts[:host]}...delete 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!("list vm")
+                              output = ssh.exec!("delete 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(/ id:/)
-                                    puts line.split(':')[2].strip
                                  elsif line.match(/Error Msg:/)
                                     line["Error Msg: "]=""
                                     current[:errormsg]=line.strip

data/lib/chef/knife/oraclevm_serverpool_list.rb

@@ -0,0 +1,32 @@
+#
+# Author:: Geoff O'Callaghan (<geoffocallaghan@gmail.com>)
+# License:: Apache License, Version 2.0
+#
+
+require 'chef/knife'
+require 'chef/knife/BaseOraclevmCommand'
+require 'netaddr'
+require 'net/ssh'
+
+# list a server pool
+class Chef::Knife::OraclevmServerpoolList < Chef::Knife::BaseOraclevmCommand
+
+  banner "knife oraclevm serverpool list <name>"
+
+  get_common_options
+
+  def run
+  
+    $stdout.sync = true
+
+    pool = @name_args[0]
+
+    current=list_serverpool(pool)
+    Chef::Log.debug("Status = #{current[:status]}.  Time = #{current[:time]}. VM Status = #{current[:poolstatus]}.")
+
+    if current[:status]!="Success"
+      puts "Call to OVM CLI Failed with #{current[:errormsg]}"
+    end
+
+  end
+end

data/lib/chef/knife/oraclevm_vm_delete.rb

@@ -0,0 +1,43 @@
+#
+# Author:: Geoff O'Callaghan (<geoffocallaghan@gmail.com>)
+# License:: Apache License, Version 2.0
+#
+
+require 'chef/knife'
+require 'chef/knife/BaseOraclevmCommand'
+require 'netaddr'
+require 'net/ssh'
+
+# delete a VM
+class Chef::Knife::OraclevmVmDelete < Chef::Knife::BaseOraclevmCommand
+
+  banner "knife oraclevm vm delete VMNAME"
+
+  get_common_options
+
+
+  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"
+       dstatus=delete_vm(vmname)
+       if dstatus[:status] == "Success"
+          puts "#{dstatus[:status]}"
+       else
+          puts "Failed with #{dstatus[:errormsg]}"
+       end
+    else
+      puts "Call to OVM CLI Failed with #{current[:errormsg]}"
+    end
+  end
+end

data/lib/chef/knife/oraclevm_vm_list.rb

@@ -11,7 +11,7 @@ require 'net/ssh'
 # Manage power state of a virtual machine
 class Chef::Knife::OraclevmVmList < Chef::Knife::BaseOraclevmCommand
 
-  banner "knife oraclevm vm list (options)"
+  banner "knife oraclevm vm list <name>"
 
   get_common_options
 
@@ -21,7 +21,12 @@ class Chef::Knife::OraclevmVmList < Chef::Knife::BaseOraclevmCommand
 
     vmname = @name_args[0]
 
-    list_vm
+    current=list_vm(vmname)
+    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/knife-oraclevm/version.rb

@@ -1,4 +1,4 @@
 module KnifeOracleVM
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: knife-oraclevm
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Geoff O'Callaghan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-07 00:00:00 +10:00
+date: 2013-08-10 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,7 +62,9 @@ files:
 - lib/knife-oraclevm/version.rb
 - lib/chef/knife/BaseOraclevmCommand.rb
 - lib/chef/knife/oraclevm_vm_state.rb
+- lib/chef/knife/oraclevm_serverpool_list.rb
 - lib/chef/knife/oraclevm_vm_list.rb
+- lib/chef/knife/oraclevm_vm_delete.rb
 has_rdoc: true
 homepage: http://github.com/gocallag/knife-oraclevm
 licenses: []