knife-cloudstack-fog 0.2.3 → 0.2.6

data/lib/chef/knife/cloudstack_server_list.rb

@@ -0,0 +1,115 @@
+# Author:: Chirag Jog (<chirag@clogeny.com>)
+# Copyright:: Copyright (c) 2011 Clogeny Technologies.
+# License:: Apache License, Version 2.0
+#
+# Author:: Jeff Moody (<jmoody@datapipe.com>)
+# Copyright:: Copyright (c) 2012 Datapipe
+# 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/cloudstack_base'
+
+class Chef
+  class Knife
+    class CloudstackServerList < Knife
+
+      include Knife::CloudstackBase
+
+      banner "knife cloudstack server list (options)"
+      option :zoneid,
+             :short => "-z ZONEID",
+             :long => "--zoneid ZONEID",
+             :description => "Limit responses to servers only running in a specific zone (specified by ID #). Default provides servers from all zones.",
+             :default => "all"
+      option :state,
+             :short => "-s STATE",
+             :long => "--state STATE",
+             :description => "Limit responses to servers only of a given state. Possible values are 'running,' 'stopped,' 'starting,' 'pending,' 'shutting-down,' 'terminated,' and 'stopping.' Default provides servers in all states.",
+             :default => "all"
+             
+      def print_servers(server_list,servers,options={})
+        server = servers
+        if zoneid = options[:zoneid]
+          server.reject!{|t| t['zoneid'] != zoneid.to_i}
+        end
+        if state = options[:state]
+          state.downcase!
+          server.reject!{|t| t['state'].downcase != state}
+        end
+        
+        server.each do |instance|
+          server_list << instance['name'].to_s
+          server_list << instance['displayname'].to_s
+          ip_list = []
+          instance['nic'].each do |nic|
+            ip_list << nic['ipaddress'].to_s
+          end
+          server_list << ip_list.join(", ")
+          sg_list = []
+          instance['securitygroup'].each do |group|
+            sg_list << group['name'].to_s
+          end
+          server_list << sg_list.join(", ")
+          
+          server_list << instance['zonename'].to_s
+          server_list << instance['serviceofferingname'].to_s
+          server_list << instance['templatedisplaytext'].to_s
+          
+          server_list << begin
+            state = instance['state'].to_s.downcase
+            case state
+              when 'shutting-down','terminated','stopping','stopped'
+                ui.color(state, :red)
+              when 'pending', 'starting'
+                ui.color(state, :yellow)
+              else
+                ui.color(state, :green)
+            end
+          end
+        end
+        
+      end
+
+      def run
+        $stdout.sync = true
+
+        validate!
+
+        server_list = [
+          ui.color('Server ID', :bold),
+          ui.color('Display Name', :bold),
+          ui.color('IP Address', :bold),
+          ui.color('Security Group', :bold),
+          ui.color('Server Zone', :bold),
+          ui.color('Service Offering', :bold),
+          ui.color('Template', :bold),
+          ui.color('State', :bold)
+        ]
+        
+        zoneid = locate_config_value(:zoneid)
+        state = locate_config_value(:state)
+        
+        response = connection.list_virtual_machines['listvirtualmachinesresponse']
+        if virtual_machines = response['virtualmachine']
+          filters = {}
+          filters[:zoneid] = zoneid unless zoneid == 'all'
+          filters[:state] = state unless state == 'all'
+          print_servers(server_list, virtual_machines, filters)
+          puts ui.list(server_list, :columns_across, 8)
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/cloudstack_template_list.rb

@@ -28,31 +28,31 @@ class Chef
       include Knife::CloudstackBase
 
       banner "knife cloudstack template list (options)"
-      option :filter,
-             :short => "-L FILTER",
-             :long => "--filter FILTER",
-             :description => "The template search filter. Default is 'featured.' Other options are 'self,' 'self-executable,' 'executable,' and 'community.'",
-             :default => "featured"
-      option :zone,
-             :short => "-Z ZONE",
-             :long => "--zone ZONE",
-             :description => "Limit responses to templates only located in a specific zone. Default provides templates from all zones.",
-             :default => "all"
-      option :hypervisor,
-             :short => "-H HYPERVISOR",
-             :long => "--hypervisor HYPERVISOR",
-             :description => "Limit responses to templates only running on a specific hypervisor. Default provides templates from all hypervisors.",
-             :default => "all"
-     option :zoneid,
-            :short => "-z ZONEID",
-            :long => "--zoneid ZONEID",
-            :description => "Limit responses to templates only running in a specific zone (specified by ID #). Default provides templates from all zones.",
-            :default => "all"
-      option :templateid,
-             :short => "-T TEMPLATEID",
-             :long => "--templateid TEMPLATEID",
-             :description => "Limit responses to a single template ID. Default provides all templates.",
-             :default => "all"     
+      option  :filter,
+              :short => "-L FILTER",
+              :long => "--filter FILTER",
+              :description => "The template search filter. Default is 'featured.' Other options are 'self,' 'self-executable,' 'executable,' and 'community.'",
+              :default => "featured"
+      option  :zone,
+              :short => "-Z ZONE",
+              :long => "--zone ZONE",
+              :description => "Limit responses to templates only located in a specific zone. Default provides templates from all zones.",
+              :default => "all"
+      option  :hypervisor,
+              :short => "-H HYPERVISOR",
+              :long => "--hypervisor HYPERVISOR",
+              :description => "Limit responses to templates only running on a specific hypervisor. Default provides templates from all hypervisors.",
+              :default => "all"
+      option  :zoneid,
+              :short => "-z ZONEID",
+              :long => "--zoneid ZONEID",
+              :description => "Limit responses to templates only running in a specific zone (specified by ID #). Default provides templates from all zones.",
+              :default => "all"
+      option  :templateid,
+              :short => "-T TEMPLATEID",
+              :long => "--templateid TEMPLATEID",
+              :description => "Limit responses to a single template ID. Default provides all templates.",
+              :default => "all"     
              
       
       def print_templates(template_list,templates,options={})

data/lib/knife-cloudstack/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Cloudstack
-    VERSION = "0.2.3"
+    VERSION = "0.2.6"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-cloudstack-fog
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000 Z
+date: 2012-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70181402276840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,7 +22,12 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70181402276840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.1
 description: Support for the Chef Knife command, leveraging FOG, for the Citrix CloudStack
   API
 email:
@@ -34,27 +39,21 @@ extra_rdoc_files:
 - README.rdoc
 - LICENSE
 files:
-- .gitignore
-- CHANGES.rdoc
-- Gemfile
-- LICENSE
-- README.rdoc
-- Rakefile
-- erb/centos5-gems.erb
-- knife-cloudstack-fog.gemspec
 - lib/chef/knife/cloudstack_base.rb
 - lib/chef/knife/cloudstack_diskoffering_list.rb
-- lib/chef/knife/cloudstack_instance_create.rb
-- lib/chef/knife/cloudstack_instance_delete.rb
-- lib/chef/knife/cloudstack_instance_list.rb
 - lib/chef/knife/cloudstack_keypair_list.rb
 - lib/chef/knife/cloudstack_networks_list.rb
 - lib/chef/knife/cloudstack_securitygroup_list.rb
+- lib/chef/knife/cloudstack_server_create.rb
+- lib/chef/knife/cloudstack_server_delete.rb
+- lib/chef/knife/cloudstack_server_list.rb
 - lib/chef/knife/cloudstack_serviceoffering_list.rb
 - lib/chef/knife/cloudstack_template_list.rb
 - lib/chef/knife/cloudstack_volumes_list.rb
 - lib/chef/knife/cloudstack_zone_list.rb
 - lib/knife-cloudstack/version.rb
+- README.rdoc
+- LICENSE
 homepage: https://github.com/fifthecho/knife-cloudstack-fog
 licenses: []
 post_install_message: 
@@ -75,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Cloudstack Compute Support for Chef's Knife Command

data/.gitignore

@@ -1,19 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-coverage
-InstalledFiles
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-*.old
-
-# YARD artifacts
-.yardoc
-_yardoc
-doc/

data/CHANGES.rdoc

@@ -1,66 +0,0 @@
-= Changes
-
-== 2012-15-03 (0.2.0)
-* Brought in sync with Chirajog's knife-cloudstack plugin. Rewritten to leverage FOG CloudStack support (available in GIT
-   gem), HTTP/HTTPS, and Security Groups.
-
-== 2011-11-03 (0.0.11)
-* Added LICENSE file and licensing headers to source. No feature changes.
-
-== 2011-10-13 (0.0.10)
-* Support for multi-homed VMs: The --networks option for the <tt>server create</tt> command takes a comma-separated list
-  of network offering names. The created VM will have one nic per network, with nics assigned to networks in the order
-  specified (e.g. the first network in the list will be assigned to eth0, the second to eth1 and so on). The --networks
-  option replaces the --network option, which supported a single network name.
-* The <tt>server list</tt> command now shows the VM 'displayname' in parentheses when the displayname is defined and is
-  different than the VM name.
-* Public IP logic has been updated to support multi-homed VMs. It now uses the first nic attached to a network with the
-  'default' value set to true as the primary interface.
-   
-== 2011-08-30 (0.0.9)
-* Added subcommands: <tt>server start</tt>, <tt>server stop</tt> and <tt>server reboot</tt>.
-* Updated the <tt>hosts</tt> command to return short hostnames and FQDNs. Also added comments where needed so the output
-  can be directly pasted into /etc/hosts.
-
-== 2011-08-06 (0.0.8)
-* Changed cloudstack async command timeout from 60 to 300 seconds.
-
-== 2011-07-21 (0.0.7)
-* Fixed http_request actions in <tt>stack create</tt>.
-
-== 2011-07-15 (0.0.6)
-* The <tt>server delete</tt> command now deletes the chef node and client if their names match the fqdn of the server.
-* Added the <tt>stack create</tt> and <tt>stack delete</tt> commands for bulk creation and deletion of servers using a
-  JSON definition file. These commands are still experimental and subject to change. See README.rdoc for details.
-* Added a <tt>hosts</tt> command, which lists the public ip address and fqdn of all servers in /etc/hosts file format.
-* Fixed nil reference bug in <tt>server list</tt> command.
-
-== 2011-06-05 (0.0.5)
-* Added <tt>--port-rules</tt> option to the <tt>cs server create</tt> command. It accepts a list of port forwarding
-  rules to be created for the server (only applies to servers on a virtual network). See 'Port forwarding rules for
-  virtual networks' in README.rdoc for details.
-
-== 2011-06-01 (0.0.4)
-* Fixed ssh detection bug.
-
-== 2011-05-30 (0.0.3)
-
-* Added support for virtual networks. A public IP address is allocated for each new server in a virtual network
-  and an ssh port forwarding rule is created. The IP is released when the server is destroyed as long as it doesn't
-  have forwarding rules for any servers other than the one being deleted.
-* Default network is now detected automatically. If there is more than one network marked as 'default' for an
-  account, the first Direct network is preferred.
-
-== 2011-05-22 (0.0.2)
-
-* Added subcommands: <tt>service list</tt>, <tt>template list</tt>, <tt>network list</tt> and <tt>zone list</tt>.
-* Removed -H (and --hostname) option from the <tt>cs server create</tt> command. The host name is now the first
-  argument to the command: <tt>knife cs server create myhostname</tt>. If a host name is not specified, CloudStack
-  will use an auto-generated name.
-* Added --no-bootstrap option to the server create command. This prevents Chef from being installed on the new server.
-* Fixed help banners (commands were shown as <tt>knife cloudstack ...</tt> instead of <tt>knife cs ...</tt>).
-* Added README.rdoc.
-
-== 2011-05-15 (0.0.1)
-
-* Initial release

data/Gemfile

@@ -1,4 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in knife-cloudstack.gemspec
-gemspec

data/Rakefile

@@ -1,2 +0,0 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks

data/erb/centos5-gems.erb

@@ -1,41 +0,0 @@
-bash -c '
-<%= "export http_proxy=\"#{knife_config[:bootstrap_proxy]}\"" if knife_config[:bootstrap_proxy] -%>
-
-if [ ! -f /usr/bin/chef-client ]; then
-  wget <%= "--proxy=on " if knife_config[:bootstrap_proxy] %>http://download.fedora.redhat.com/pub/epel/5/i386/epel-release-5-4.noarch.rpm
-  rpm -Uvh epel-release-5-4.noarch.rpm
-  wget <%= "--proxy=on " if knife_config[:bootstrap_proxy] %>-O /etc/yum.repos.d/aegis.repo http://rpm.aegisco.com/aegisco/el5/aegisco.repo
-  yum install gcc gcc-c++ automake autoconf make ruby.x86_64 ruby-devel.x86_64 ruby-libs.x86_64 ruby-ri.x8_64 ruby-rdoc.x86_64 -y
-  yum remove ruby-libs.i386 -y
-  wget http://production.cf.rubygems.org/rubygems/rubygems-1.7.2.tgz
-  tar zxf rubygems-1.7.2.tgz
-  cd rubygems-1.7.2
-  ruby setup.rb --no-format-executable
-  gem install chef -V --no-rdoc --no-ri
-
-fi
-
-
-mkdir -p /etc/chef
-
-(
-cat <<'EOP'
-<%= validation_key %>
-EOP
-) > /tmp/validation.pem
-awk NF /tmp/validation.pem > /etc/chef/validation.pem
-rm /tmp/validation.pem
-
-(
-cat <<'EOP'
-<%= config_content %>
-EOP
-) > /etc/chef/client.rb
-
-(
-cat <<'EOP'
-<%= { "run_list" => @run_list }.to_json %>
-EOP
-) > /etc/chef/first-boot.json
-
-<%= start_chef %>'

data/knife-cloudstack-fog.gemspec

@@ -1,23 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "knife-cloudstack/version"
-
-Gem::Specification.new do |s|
-  s.name        = "knife-cloudstack-fog"
-  s.version     = Knife::Cloudstack::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README.rdoc", "LICENSE" ]
-  s.authors     = ["Chirag Jog", "Jeff Moody"]
-  s.email       = ["chirag@clogeny.com", "jmoody@datapipe.com"]
-  s.homepage    = "https://github.com/fifthecho/knife-cloudstack-fog"
-  s.summary     = %q{Cloudstack Compute Support for Chef's Knife Command}
-  s.description = %q{Support for the Chef Knife command, leveraging FOG, for the Citrix CloudStack API}
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-
-  s.add_dependency "fog", "~> 1.3.1"
-end

data/lib/chef/knife/cloudstack_instance_list.rb

@@ -1,91 +0,0 @@
-# Author:: Chirag Jog (<chirag@clogeny.com>)
-# Copyright:: Copyright (c) 2011 Clogeny Technologies.
-# License:: Apache License, Version 2.0
-#
-# Author:: Jeff Moody (<jmoody@datapipe.com>)
-# Copyright:: Copyright (c) 2012 Datapipe
-# License:: Apache License, Version 2.0
-#
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Copyright:: Copyright (c) 2011 Opscode, Inc.
-# 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/cloudstack_base'
-
-class Chef
-  class Knife
-    class CloudstackServerList < Knife
-
-      include Knife::CloudstackBase
-
-      banner "knife cloudstack server list (options)"
-
-      def run
-        $stdout.sync = true
-
-        validate!
-
-        instance_list = [
-          ui.color('Instance ID', :bold),
-          ui.color('Display Name', :bold),
-          ui.color('IP Address', :bold),
-          ui.color('Security Group', :bold),
-          ui.color('Instance Zone', :bold),
-          ui.color('Service Offering', :bold),
-          ui.color('Template', :bold),
-          ui.color('State', :bold)
-        ]
-        
-        response = connection.list_virtual_machines['listvirtualmachinesresponse']
-        if virtual_machines = response['virtualmachine']
-          virtual_machines.each do |instance|
-              instance_list << instance['name'].to_s
-              instance_list << instance['displayname'].to_s
-              ip_list = []
-              instance['nic'].each do |nic|
-                ip_list << nic['ipaddress'].to_s
-              end
-              instance_list << ip_list.join(", ")
-              sg_list = []
-              instance['securitygroup'].each do |group|
-                sg_list << group['name'].to_s
-              end
-              instance_list << sg_list.join(", ")
-              
-              instance_list << instance['zonename'].to_s
-              instance_list << instance['serviceofferingname'].to_s
-              instance_list << instance['templatedisplaytext'].to_s
-              
-              instance_list << begin
-                state = instance['state'].to_s.downcase
-                case state
-                  when 'shutting-down','terminated','stopping','stopped'
-                    ui.color(state, :red)
-                  when 'pending', 'starting'
-                    ui.color(state, :yellow)
-                  else
-                    ui.color(state, :green)
-                end
-              end
-              
-          end
-          
-          puts ui.list(instance_list, :columns_across, 8)
-        end
-      end
-    end
-  end
-end