knife-vcloud 0.2.3 → 1.0.0

data/lib/chef/knife/{vc_vm_show.rb → vm/vc_vm_show.rb}

@@ -1,6 +1,6 @@
 #
 # Author:: Stefano Tortarolo (<stefano.tortarolo@gmail.com>)
-# Copyright:: Copyright (c) 2012
+# Copyright:: Copyright (c) 2012-2013
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,35 +16,52 @@
 # limitations under the License.
 #
 
-require 'chef/knife/vc_common'
-
 class Chef
   class Knife
     class VcVmShow < Chef::Knife
       include Knife::VcCommon
+      include Knife::VcVmCommon
 
-      banner "knife vc vm show [VM_ID] (options)"
-
-      def pretty_symbol(key)
-        key.to_s.gsub('_', ' ').capitalize
-      end
+      banner "knife vc vm show VM (options)"
 
       def run
         $stdout.sync = true
 
-        vm_id = @name_args.first
-
-        list = []
+        vm_arg = @name_args.first
 
         connection.login
-        os_desc, networks, guest_customizations = connection.show_vm vm_id
+
+        vm = get_vm(vm_arg)
+
+        vm_info = connection.get_vm_info vm[:id]
+        vm_disks = connection.get_vm_disk_info vm[:id]
         connection.logout
 
-        out_msg("OS Name", os_desc)
+        out_msg("VM Name", vm[:vm_name])
+        out_msg("OS Name", vm[:os_desc])
+        out_msg("Status", vm[:status])
+
+        list = []
+        list << ['', '']
+        vm_info.each do |section, values|
+          list << ui.color(section.capitalize, :bold)
+          list << ''
+
+          list << (values[:description] || '')
+          list << (values[:name] || '')
+
+          list << ['', '']
+        end
+
+        list << [ui.color('Disks', :bold), '']
+        vm_disks.each do |values|
+          list << (values[:name] || '')
+          list << (values[:capacity] || '')
+        end
 
-        networks.each do |network, values|
-          list << ui.color('Network', :bold)
-          list << (network || '')
+        list << ['', '', ui.color('Networks', :bold), '']
+        vm[:networks].each do |network, values|
+          list << [(network || ''), '']
           values.each do |k, v|
             list << (pretty_symbol(k) || '')
             list << (v || '')
@@ -53,11 +70,11 @@ class Chef
 
         list << ['', '', ui.color('Guest Customizations', :bold), '']
         list.flatten!
-        guest_customizations.each do |k, v|
+        vm[:guest_customizations].each do |k, v|
           list << (pretty_symbol(k) || '')
           list << (v || '')
         end
-        puts ui.list(list, :columns_across, 2)
+        ui.msg ui.list(list, :columns_across, 2)
       end
     end
   end

data/lib/chef/knife/vm/vc_vm_start.rb

@@ -0,0 +1,44 @@
+#
+# Author:: Stefano Tortarolo (<stefano.tortarolo@gmail.com>)
+# Copyright:: Copyright (c) 2013
+# License:: Apache License, Version 2.0
+#
+# 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.
+#
+
+class Chef
+  class Knife
+    class VcVmStart < Chef::Knife
+      include Knife::VcCommon
+      include Knife::VcVmCommon
+
+      banner "knife vc vm start [VM] (options)"
+
+      def run
+        $stdout.sync = true
+
+        vm_arg = @name_args.shift
+
+        connection.login
+        vm = get_vm(vm_arg)
+
+        task_id = connection.poweron_vm vm[:id]
+
+        ui.msg "VM start..."
+        wait_task(connection, task_id)
+
+        connection.logout
+      end
+    end
+  end
+end

data/lib/chef/knife/vm/vc_vm_stop.rb

@@ -0,0 +1,44 @@
+#
+# Author:: Stefano Tortarolo (<stefano.tortarolo@gmail.com>)
+# Copyright:: Copyright (c) 2013
+# License:: Apache License, Version 2.0
+#
+# 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.
+#
+
+class Chef
+  class Knife
+    class VcVmStop < Chef::Knife
+      include Knife::VcCommon
+      include Knife::VcVmCommon
+
+      banner "knife vc vm stop [VM] (options)"
+
+      def run
+        $stdout.sync = true
+
+        vm_arg = @name_args.shift
+
+        connection.login
+        vm = get_vm(vm_arg)
+
+        task_id = connection.poweroff_vm vm[:id]
+
+        ui.msg "VM stop..."
+        wait_task(connection, task_id)
+
+        connection.logout
+      end
+    end
+  end
+end

data/lib/chef/knife/vm/vc_vm_suspend.rb

@@ -0,0 +1,44 @@
+#
+# Author:: Stefano Tortarolo (<stefano.tortarolo@gmail.com>)
+# Copyright:: Copyright (c) 2013
+# License:: Apache License, Version 2.0
+#
+# 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.
+#
+
+class Chef
+  class Knife
+    class VcVmSuspend < Chef::Knife
+      include Knife::VcCommon
+      include Knife::VcVmCommon
+
+      banner "knife vc vm suspend [VM] (options)"
+
+      def run
+        $stdout.sync = true
+
+        vm_arg = @name_args.shift
+
+        connection.login
+        vm = get_vm(vm_arg)
+
+        task_id = connection.suspend_vm vm[:id]
+
+        ui.msg "VM suspend..."
+        wait_task(connection, task_id)
+
+        connection.logout
+      end
+    end
+  end
+end

data/lib/knife-vcloud/version.rb

@@ -0,0 +1,3 @@
+module KnifeVCloud
+  VERSION = "1.0.0"
+end

metadata

@@ -1,64 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: knife-vcloud
 version: !ruby/object:Gem::Version
-  version: 0.2.3
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - Stefano Tortarolo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-28 00:00:00.000000000 Z
+date: 2013-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: knife-windows
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcloud-rest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: winrm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.3
 description: A Knife plugin to create, list and manage vCloud servers
 email:
 - stefano.tortarolo@gmail.com
@@ -69,45 +76,69 @@ files:
 - CHANGELOG.md
 - README.md
 - LICENSE
-- lib/chef/knife/vc_catalog_item_show.rb
-- lib/chef/knife/vc_catalog_show.rb
-- lib/chef/knife/vc_common.rb
+- lib/chef/knife/catalog/vc_catalog_item_show.rb
+- lib/chef/knife/catalog/vc_catalog_show.rb
+- lib/chef/knife/common/vc_bootstrap_common.rb
+- lib/chef/knife/common/vc_catalog_common.rb
+- lib/chef/knife/common/vc_common.rb
+- lib/chef/knife/common/vc_network_common.rb
+- lib/chef/knife/common/vc_vapp_common.rb
+- lib/chef/knife/common/vc_vdc_common.rb
+- lib/chef/knife/common/vc_vm_common.rb
+- lib/chef/knife/network/vc_network_show.rb
+- lib/chef/knife/org/vc_org_list.rb
+- lib/chef/knife/org/vc_org_show.rb
+- lib/chef/knife/ovf/vc_ovf_upload.rb
+- lib/chef/knife/vapp/vc_vapp_bootstrap.rb
+- lib/chef/knife/vapp/vc_vapp_clone.rb
+- lib/chef/knife/vapp/vc_vapp_create.rb
+- lib/chef/knife/vapp/vc_vapp_delete.rb
+- lib/chef/knife/vapp/vc_vapp_network_external.rb
+- lib/chef/knife/vapp/vc_vapp_network_internal.rb
+- lib/chef/knife/vapp/vc_vapp_reboot.rb
+- lib/chef/knife/vapp/vc_vapp_reset.rb
+- lib/chef/knife/vapp/vc_vapp_show.rb
+- lib/chef/knife/vapp/vc_vapp_snapshot.rb
+- lib/chef/knife/vapp/vc_vapp_start.rb
+- lib/chef/knife/vapp/vc_vapp_stop.rb
+- lib/chef/knife/vapp/vc_vapp_suspend.rb
+- lib/chef/knife/vc_commands.rb
 - lib/chef/knife/vc_login.rb
-- lib/chef/knife/vc_org_list.rb
-- lib/chef/knife/vc_org_show.rb
-- lib/chef/knife/vc_vapp_config_network.rb
-- lib/chef/knife/vc_vapp_create.rb
-- lib/chef/knife/vc_vapp_delete.rb
-- lib/chef/knife/vc_vapp_show.rb
-- lib/chef/knife/vc_vapp_start.rb
-- lib/chef/knife/vc_vapp_stop.rb
-- lib/chef/knife/vc_vdc_show.rb
-- lib/chef/knife/vc_vm_config_guest.rb
-- lib/chef/knife/vc_vm_config_network.rb
-- lib/chef/knife/vc_vm_show.rb
+- lib/chef/knife/vdc/vc_vdc_show.rb
+- lib/chef/knife/vm/vc_vm_bootstrap.rb
+- lib/chef/knife/vm/vc_vm_config_guest.rb
+- lib/chef/knife/vm/vc_vm_config_network.rb
+- lib/chef/knife/vm/vc_vm_reboot.rb
+- lib/chef/knife/vm/vc_vm_reset.rb
+- lib/chef/knife/vm/vc_vm_set_disks.rb
+- lib/chef/knife/vm/vc_vm_set_info.rb
+- lib/chef/knife/vm/vc_vm_show.rb
+- lib/chef/knife/vm/vc_vm_start.rb
+- lib/chef/knife/vm/vc_vm_stop.rb
+- lib/chef/knife/vm/vc_vm_suspend.rb
+- lib/knife-vcloud/version.rb
 homepage: https://github.com/astratto/knife-vcloud
-licenses: []
+licenses:
+- Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A knife plugin for the VMWare vCloud API
 test_files: []
-has_rdoc: 

data/lib/chef/knife/vc_common.rb

@@ -1,103 +0,0 @@
-#
-# Author:: Stefano Tortarolo (<stefano.tortarolo@gmail.com>)
-# Copyright:: Copyright (c) 2012
-# License:: Apache License, Version 2.0
-#
-# 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 'chef/knife'
-
-class Chef
-  class Knife
-    # Module for operations common among commands
-    module VcCommon
-      # :nodoc:
-      # Would prefer to do this in a rational way, but can't be done b/c of
-      # Mixlib::CLI's design :(
-      def self.included(includer)
-        includer.class_eval do
-
-          deps do
-            require 'vcloud-rest/connection'
-            require 'chef/api_client'
-          end
-
-          option :vcloud_url,
-                 :short => "-H URL",
-                 :long => "--vcloud-url URL",
-                 :description => "The vCloud endpoint URL",
-                 :proc => Proc.new { |url| Chef::Config[:knife][:vcloud_url] = url }
-
-          option :vcloud_user,
-                 :short => "-U USER",
-                 :long => "--vcloud-user USER",
-                 :description => "Your vCloud User",
-                 :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_user] = key }
-
-          option :vcloud_password,
-                 :short => "-P SECRET",
-                 :long => "--vcloud-password SECRET",
-                 :description => "Your vCloud secret key",
-                 :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_password] = key }
-
-          option :vcloud_org,
-                 :short => "-O ORGANIZATION",
-                 :long => "--vcloud-organization ORGANIZATION",
-                 :description => "Your vCloud Organization",
-                 :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_org] = key }
-
-          option :vcloud_api_version,
-                 :short => "-A API_VERSION",
-                 :long => "--vcloud-api-version API_VERSION",
-                 :description => "vCloud API version (1.5 and 5.1 supported)",
-                 :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_api_version] = key }
-        end
-      end
-
-      def connection
-        unless @connection
-          @connection = VCloudClient::Connection.new(
-              locate_config_value(:vcloud_url),
-              locate_config_value(:vcloud_user),
-              locate_config_value(:vcloud_password),
-              locate_config_value(:vcloud_org),
-              locate_config_value(:vcloud_api_version)
-          )
-        end
-        @connection
-      end
-
-      def out_msg(label, value)
-        if value && !value.empty?
-          puts "#{ui.color(label, :cyan)}: #{value}"
-        end
-      end
-
-      def locate_config_value(key)
-        key = key.to_sym
-        Chef::Config[:knife][key] || config[key]
-      end
-
-      def wait_task(connection, task_id)
-        status, errormsg, start_time, end_time = connection.wait_task_completion task_id
-        puts "Done!"
-        out_msg("Summary", "Status: #{ui.color(status, :cyan)} - started at #{start_time} and ended at #{end_time}")
-
-        if errormsg
-          puts ui.color("ATTENTION: #{errormsg}", :red)
-        end
-      end
-    end
-  end
-end