knife-vcloud 0.2.0 → 0.2.1

data/lib/chef/knife/vc_vapp_config_network.rb

@@ -16,80 +16,47 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require 'chef/knife/vc_common'
 
-module KnifeVCloud
-  class VcVappConfigNetwork < Chef::Knife
-    include KnifeVCloud::Common
+class Chef
+  class Knife
+    class VcVappConfigNetwork < Chef::Knife
+      include Knife::VcCommon
 
-    deps do
-      require 'vcloud-rest/connection'
-      require 'chef/api_client'
-    end
-
-    banner "knife vc vapp config network [VAPP_ID] [NETWORK_NAME] (options)"
-
-    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 }
+      banner "knife vc vapp config network [VAPP_ID] [NETWORK_NAME] (options)"
 
-    option :fence_mode,
-           :short => "-F FENCE_MODE",
-           :long => "--fence-mode FENCE_MODE",
-           :description => "Set Fence Mode (e.g., Isolated, Bridged)",
-           :proc => Proc.new { |key| Chef::Config[:knife][:fence_mode] = key }
+      option :fence_mode,
+             :short => "-F FENCE_MODE",
+             :long => "--fence-mode FENCE_MODE",
+             :description => "Set Fence Mode (e.g., Isolated, Bridged)",
+             :proc => Proc.new { |key| Chef::Config[:knife][:fence_mode] = key }
 
-    option :retain_network,
-           :short => "-R RETAIN_NETWORK",
-           :long => "--retain-network RETAIN_NETWORK",
-           :description => "Toggle Retain Network across deployments (e.g., true, false)",
-           :proc => Proc.new { |key| Chef::Config[:knife][:retain_network] = key }
+      option :retain_network,
+             :short => "-R RETAIN_NETWORK",
+             :long => "--retain-network RETAIN_NETWORK",
+             :description => "Toggle Retain Network across deployments (e.g., true, false)",
+             :proc => Proc.new { |key| Chef::Config[:knife][:retain_network] = key }
 
-    def run
-      $stdout.sync = true
+      def run
+        $stdout.sync = true
 
-      vapp_id = @name_args.shift
-      network_name = @name_args.shift
+        vapp_id = @name_args.shift
+        network_name = @name_args.shift
 
-      connection.login
+        connection.login
 
-      config = {
-        :fence_mode => locate_config_value(:fence_mode),
-        :retain_net => locate_config_value(:retain_net)
-      }
+        config = {
+          :fence_mode => locate_config_value(:fence_mode),
+          :retain_net => locate_config_value(:retain_net)
+        }
 
-      task_id, response = connection.set_vapp_network_config vapp_id, network_name, config
+        task_id, response = connection.set_vapp_network_config vapp_id, network_name, config
 
-      print "vApp network configuration..."
-      wait_task(connection, task_id)
+        print "vApp network configuration..."
+        wait_task(connection, task_id)
 
-      connection.logout
+        connection.logout
+      end
     end
   end
 end

data/lib/chef/knife/vc_vapp_create.rb

@@ -16,66 +16,33 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require 'chef/knife/vc_common'
 
-module KnifeVCloud
-  class VcVappCreate < Chef::Knife
-    include KnifeVCloud::Common
+class Chef
+  class Knife
+    class VcVappCreate < Chef::Knife
+      include Knife::VcCommon
 
-    deps do
-      require 'vcloud-rest/connection'
-      require 'chef/api_client'
-    end
-
-    banner "knife vc vapp create [VDC_ID] [NAME] [DESCRIPTION] [TEMPLATE_ID] (options)"
-
-    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 }
+      banner "knife vc vapp create [VDC_ID] [NAME] [DESCRIPTION] [TEMPLATE_ID] (options)"
 
-    def run
-      $stdout.sync = true
+      def run
+        $stdout.sync = true
 
-      vdc_id = @name_args.shift
-      name = @name_args.shift
-      description = @name_args.shift
-      templateId = @name_args.shift
+        vdc_id = @name_args.shift
+        name = @name_args.shift
+        description = @name_args.shift
+        templateId = @name_args.shift
 
-      connection.login
+        connection.login
 
-      vapp_id, task_id = connection.create_vapp_from_template vdc_id, name, description, templateId
+        vapp_id, task_id = connection.create_vapp_from_template vdc_id, name, description, templateId
 
-      print "vApp creation..."
-      wait_task(connection, task_id)
-      puts "vApp created with ID: #{ui.color(vapp_id, :cyan)}"
+        print "vApp creation..."
+        wait_task(connection, task_id)
+        puts "vApp created with ID: #{ui.color(vapp_id, :cyan)}"
 
-      connection.logout
+        connection.logout
+      end
     end
   end
 end

data/lib/chef/knife/vc_vapp_delete.rb

@@ -16,62 +16,29 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require 'chef/knife/vc_common'
 
-module KnifeVCloud
-  class VcVappDelete < Chef::Knife
-    include KnifeVCloud::Common
+class Chef
+  class Knife
+    class VcVappDelete < Chef::Knife
+      include Knife::VcCommon
 
-    deps do
-      require 'vcloud-rest/connection'
-      require 'chef/api_client'
-    end
-
-    banner "knife vc vapp delete [VAPP_ID] (options)"
-
-    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 }
+      banner "knife vc vapp delete [VAPP_ID] (options)"
 
-    def run
-      $stdout.sync = true
+      def run
+        $stdout.sync = true
 
-      vapp_id = @name_args.first
+        vapp_id = @name_args.first
 
-      if ui.confirm("Do you really want to #{ui.color('DELETE', :red)} vApp #{vapp_id}?")
-        connection.login
-        task_id = connection.delete_vapp vapp_id
+        if ui.confirm("Do you really want to #{ui.color('DELETE', :red)} vApp #{vapp_id}?")
+          connection.login
+          task_id = connection.delete_vapp vapp_id
 
-        print "vApp deletion..."
-        wait_task(connection, task_id)
+          print "vApp deletion..."
+          wait_task(connection, task_id)
 
-        connection.logout
+          connection.logout
+        end
       end
     end
   end

data/lib/chef/knife/vc_vapp_show.rb

@@ -16,77 +16,44 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
-
-module KnifeVCloud
-  class VcVappShow < Chef::Knife
-    include KnifeVCloud::Common
-
-    deps do
-      require 'vcloud-rest/connection'
-      require 'chef/api_client'
-    end
-
-    banner "knife vc vapp show [VAPP_ID] (options)"
-
-    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 }
-
-    def run
-      $stdout.sync = true
-
-      vapp_id = @name_args.first
-
-      list = [
-          ui.color('Name', :bold),
-          ui.color('Status', :bold),
-          ui.color('IPs', :bold),
-          ui.color('ID', :bold)
-      ]
-
-      connection.login
-      name, description, status, ip, vms_hash = connection.show_vapp vapp_id
-      connection.logout
-
-      out_msg("Name", name)
-      out_msg("Description", description)
-      out_msg("Status", status)
-      out_msg("IP", ip)
-
-      vms_hash.each do |k, v|
-        list << (k || '')
-        list << (v[:status] || '')
-        list << (v[:addresses].join(', ') || '<no ip>')
-        list << (v[:id] || '')
+require 'chef/knife/vc_common'
+
+class Chef
+  class Knife
+    class VcVappShow < Chef::Knife
+      include Knife::VcCommon
+
+      banner "knife vc vapp show [VAPP_ID] (options)"
+
+      def run
+        $stdout.sync = true
+
+        vapp_id = @name_args.first
+
+        list = [
+            ui.color('Name', :bold),
+            ui.color('Status', :bold),
+            ui.color('IPs', :bold),
+            ui.color('ID', :bold)
+        ]
+
+        connection.login
+        name, description, status, ip, vms_hash = connection.show_vapp vapp_id
+        connection.logout
+
+        out_msg("Name", name)
+        out_msg("Description", description)
+        out_msg("Status", status)
+        out_msg("IP", ip)
+
+        vms_hash.each do |k, v|
+          list << (k || '')
+          list << (v[:status] || '')
+          list << (v[:addresses].join(', ') || '<no ip>')
+          list << (v[:id] || '')
+        end
+        puts ui.list(list, :columns_across, 4)
       end
-      puts ui.list(list, :columns_across, 4)
     end
   end
-end
+end

data/lib/chef/knife/vc_vapp_start.rb

@@ -16,62 +16,29 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require 'chef/knife/vc_common'
 
-module KnifeVCloud
-  class VcVappStart < Chef::Knife
-    include KnifeVCloud::Common
+class Chef
+  class Knife
+    class VcVappStart < Chef::Knife
+      include Knife::VcCommon
 
-    deps do
-      require 'vcloud-rest/connection'
-      require 'chef/api_client'
-    end
-
-    banner "knife vc vapp start [VAPP_ID] (options)"
-
-    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 }
+      banner "knife vc vapp start [VAPP_ID] (options)"
 
-    def run
-      $stdout.sync = true
+      def run
+        $stdout.sync = true
 
-      vapp_id = @name_args.first
+        vapp_id = @name_args.first
 
-      connection.login
+        connection.login
 
-      task_id = connection.poweron_vapp vapp_id
+        task_id = connection.poweron_vapp vapp_id
 
-      print "vApp startup..."
-      wait_task(connection, task_id)
+        print "vApp startup..."
+        wait_task(connection, task_id)
 
-      connection.logout
+        connection.logout
+      end
     end
   end
 end

data/lib/chef/knife/vc_vapp_stop.rb

@@ -16,62 +16,29 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require 'chef/knife/vc_common'
 
-module KnifeVCloud
-  class VcVappStop < Chef::Knife
-    include KnifeVCloud::Common
+class Chef
+  class Knife
+    class VcVappStop < Chef::Knife
+      include Knife::VcCommon
 
-    deps do
-      require 'vcloud-rest/connection'
-      require 'chef/api_client'
-    end
-
-    banner "knife vc vapp stop [VAPP_ID] (options)"
-
-    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 }
+      banner "knife vc vapp stop [VAPP_ID] (options)"
 
-    def run
-      $stdout.sync = true
+      def run
+        $stdout.sync = true
 
-      vapp_id = @name_args.first
+        vapp_id = @name_args.first
 
-      connection.login
+        connection.login
 
-      task_id = connection.poweroff_vapp vapp_id
+        task_id = connection.poweroff_vapp vapp_id
 
-      print "vApp shutdown..."
-      wait_task(connection, task_id)
+        print "vApp shutdown..."
+        wait_task(connection, task_id)
 
-      connection.logout
+        connection.logout
+      end
     end
   end
-end
+end

data/lib/chef/knife/vc_vdc_show.rb

@@ -16,79 +16,46 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require 'chef/knife/vc_common'
 
-module KnifeVCloud
-  class VcVdcShow < Chef::Knife
-    include KnifeVCloud::Common
+class Chef
+  class Knife
+    class VcVdcShow < Chef::Knife
+      include Knife::VcCommon
 
-    deps do
-      require 'vcloud-rest/connection'
-      require 'chef/api_client'
-    end
-
-    banner "knife vc vdc show [VDC_ID] (options)"
-
-    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 }
+      banner "knife vc vdc show [VDC_ID] (options)"
 
-    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 }
+      def run
+        $stdout.sync = true
 
-    option :vcloud_org,
-           :short => "-O ORGANIZATION",
-           :long => "--vcloud-organization ORGANIZATION",
-           :description => "Your vCloud Organization",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_org] = key }
+        vdc_id = @name_args.first
 
-    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 }
+        connection.login
 
-    def run
-      $stdout.sync = true
+        header = [
+            ui.color('Name', :bold),
+            ui.color('ID', :bold),
+            ui.color('Status', :bold),
+            ui.color('IP', :bold),
+        ]
 
-      vdc_id = @name_args.first
+        description, vapps, networks = connection.show_vdc vdc_id
 
-      connection.login
+        puts "#{ui.color('Description:', :cyan)} #{description}"
+        list = ["#{ui.color('vAPPS', :cyan)}", '', '', '']
+        list << header
+        list.flatten!
+        vapps.each do |k, v|
+          name, description, status, ip, vms_hash = connection.show_vapp v
+          list << ("#{k} (#{vms_hash.count} VMs)" || '')
+          list << (v || '')
+          list << (status || '')
+          list << (ip || '')
+        end
 
-      header = [
-          ui.color('Name', :bold),
-          ui.color('ID', :bold),
-          ui.color('Status', :bold),
-          ui.color('IP', :bold),
-      ]
-
-      description, vapps, networks = connection.show_vdc vdc_id
-
-      puts "#{ui.color('Description:', :cyan)} #{description}"
-      list = ["#{ui.color('vAPPS', :cyan)}", '', '', '']
-      list << header
-      list.flatten!
-      vapps.each do |k, v|
-        name, description, status, ip, vms_hash = connection.show_vapp v
-        list << ("#{k} (#{vms_hash.count} VMs)" || '')
-        list << (v || '')
-        list << (status || '')
-        list << (ip || '')
+        puts ui.list(list, :columns_across, 4)
+        connection.logout
       end
-
-      puts ui.list(list, :columns_across, 4)
-      connection.logout
     end
   end
 end