knife-cloudstack 0.0.15 → 0.0.16

data/CHANGES.rdoc

@@ -1,5 +1,20 @@
 = Changes
 
+== 2014-02-12 (0.0.16)
+* Added support for --no-public-ip for <tt>cs server list</tt> (Sander Botman, 12 Feb 2014)
+* Added support for secret and secret_file in <tt>cs server create</tt> (Jeremy Baumont, 10 Feb 2014)
+* Bugfix: correction in isextractable on <tt>cs template register</tt> (Etharin, 30 Jan 2014
+* Added support for private-ip in <tt>cs server create</tt> (Joaquim Dos Santos, 26 Jan 2014)
+* Bugfix: Keypair support on stack create (Ben Langfeld, 29 Nov 2013)
+* Bugfix: Bootstrap even without port_rules options (Ben Langfeld, 29 Nov 2013)
+* Bugfix: Option to specify iso as template when deploying instance <tt>cs server create</tt> (Sander Botman, 28 Nov 2013)
+* Restructure all list commands (Sander Botman, 28 Nov 2013)
+* Added subcommand: <tt>cs aag list</tt> (John E. Vincent, 23 Nov 2013)
+* Added support for anti-affinity groups in <tt>cs server create</tt> (John E. Vincent, 23 Nov 2013)
+* Added subcommand: <tt>cs server add nic</tt> (John E. Vincent, 13 Nov 2014)
+* Added Trademark (David Nalley, 08 Nov 2013)
+* Bugfix: fixing server creation inside basic networks (Sander Botman, 07 Nov 2013)
+
 == 2013-11-04 (0.0.15)
 * Bugfix: fixed the proxy with the option: --cloudstack-proxy http://username:password@yourproxy:8080 or use config file. (Sander Botman, 04 Nov 2013)
 * Added subcommand: <tt>cs publicip list</tt> (Sander Botman, 03 Nov 2013)

data/README.rdoc

@@ -1,5 +1,8 @@
 = knife-cloudstack
 
+{<img src="https://codeclimate.com/github/CloudStack-extras/knife-cloudstack.png" />}[https://codeclimate.com/github/CloudStack-extras/knife-cloudstack]
+{<img src="https://gemnasium.com/CloudStack-extras/knife-cloudstack.png" alt="Dependency Status" />}[https://gemnasium.com/CloudStack-extras/knife-cloudstack]
+
 == DESCRIPTION:
 
 This is the Edmunds Knife plugin for CloudStack. This plugin gives Knife the ability to create, bootstrap and manage
@@ -72,6 +75,12 @@ VM provided with <tt>--no-bootstrap</tt> option have no forwarded ports or forwa
 
 By default, new servers are allocated a public IP address mapping to the CloudStack private IP address. If you do not want this behavior, pass the <tt>--no-public-ip</tt> option.
 
+Forcing cloustack to reserve and use a certain private ipv4 address when deploying an instance inside an advanced zone is possible by passing <option>--private-ip</option> followed by the intended ipv4 address. Ip Address must be contained within the network mask of the isolated network, of course.
+
+ Example: knife cs server create testvm --private-ip 192.168.1.1 --networks mynetwork
+
+Here mynetwork must have a network mask for example like 192.168.1.0/24.
+
 ==== Port forwarding rules for virtual networks
 The <tt>--port-rules</tt> option takes a comma separated list of port forwarding rules. These rules are created on the
 virtual public ip address of the server. Note that this option only applies to servers using a virtual network; it is
@@ -405,3 +414,12 @@ 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.
 
+== Trademark Attribution
+
+knife is a trademark of Opscode
+
+CloudStack is a trademark or registered trademark of The Apache Software Foundation
+
+The use of these marks is nominative in describing the function and integration of
+this software and does not imply endorsement by Opscode, the Apache Software Foundation, 
+or Apache CloudStack.

data/lib/chef/knife/cs_aag_list.rb

@@ -0,0 +1,58 @@
+#
+# Author:: John E. Vincent (<lusis.org+github.com@gmail.com>)
+# Copyright:: Copyright (c) 2013 John E. Vincent.
+# 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'
+require 'chef/knife/cs_baselist'
+
+module KnifeCloudstack
+  class CsAagList < Chef::Knife
+
+    include Chef::Knife::KnifeCloudstackBaseList
+
+    banner "knife cs aag list (options)"
+
+    option :name,
+           :long => "--name NAME",
+           :description => "Specify aag name to list"
+
+    option :keyword,
+           :long => "--service NAME",
+           :description => "Specify part of aag name to list"
+
+    def run
+      validate_base_options
+
+      columns = [
+        'Name        :name',
+        'Domain      :domain',
+        'Type        :type',
+        'Description :description',
+        'Id          :id'
+      ]
+
+      params = { 'command' => "listAffinityGroups" }
+      params['filter']  = locate_config_value(:filter)  if locate_config_value(:filter)
+      params['keyword'] = locate_config_value(:keyword) if locate_config_value(:keyword)
+      params['name']    = locate_config_value(:name)    if locate_config_value(:name)
+
+      result = connection.list_object(params, "affinitygroup")
+      list_object(columns, result)
+    end
+
+  end
+end

data/lib/chef/knife/cs_account_list.rb

@@ -16,20 +16,14 @@
 # limitations under the License.
 #
 
-require 'chef/knife/cs_base'
+require 'chef/knife'
 require 'chef/knife/cs_baselist'
 
 module KnifeCloudstack
   class CsAccountList < Chef::Knife
 
-    include Chef::Knife::KnifeCloudstackBase
     include Chef::Knife::KnifeCloudstackBaseList
 
-    deps do
-      require 'knife-cloudstack/connection'
-      Chef::Knife::Bootstrap.load_deps
-    end
-
     banner "knife cs account list (options)"
 
     option :listall,
@@ -48,82 +42,45 @@ module KnifeCloudstack
     def run
       validate_base_options
 
-      if locate_config_value(:fields)
-        object_list = []
-        locate_config_value(:fields).split(',').each { |n| object_list << ui.color(("#{n}").strip, :bold) }
+      if locate_config_value(:cloudstack_project)
+        columns = [
+          'Account :account',
+          'Domain  :domain',
+          'Type    :accounttype',
+          'Role    :role',
+          'Users   :user'
+        ]
+        params = { 'command' => "listProjectAccounts" }
       else
-        if locate_config_value(:cloudstack_project) 
-          object_list = [
-            ui.color('Account', :bold),
-            ui.color('Domain', :bold),
-            ui.color('Type', :bold),
-            ui.color('Role', :bold),
-            ui.color('Users', :bold)
-          ]
-        else
-          object_list = [
-            ui.color('Name', :bold),
-            ui.color('Domain', :bold),
-            ui.color('State', :bold),
-            ui.color('Type', :bold),
-            ui.color('Users', :bold)
-          ]
-        end
+        columns = [
+          'Name     :name',
+          'Domain   :domain',
+          'State    :state',
+          'Type     :accounttype',
+          'Users    :user'
+        ]
+        params = { 'command' => "listAccounts" }
       end
 
-      columns = object_list.count
-      object_list = [] if locate_config_value(:noheader)
-
+      params['filter']  = locate_config_value(:filter)  if locate_config_value(:filter)
+      params['listall'] = locate_config_value(:listall) if locate_config_value(:listall)
+      params['keyword'] = locate_config_value(:keyword) if locate_config_value(:keyword)
+      params['name']    = locate_config_value(:name)    if locate_config_value(:name)
+      
       if locate_config_value(:cloudstack_project)
-        api_command = "listProjectAccounts"
-        api_result = "projectaccount"
+        result = connection.list_object(params, "projectaccount") 
       else
-        api_command = "listAccounts"
-        api_result = "account"
+        result = connection.list_object(params, "account")
       end
 
-      connection_result = connection.list_object(
-        api_command,
-        api_result,
-        locate_config_value(:filter),
-        locate_config_value(:listall),
-        locate_config_value(:keyword),
-        locate_config_value(:name)
-      )
-
-      output_format(connection_result)
-
-      connection_result.each do |r|
-       if locate_config_value(:fields)
-          locate_config_value(:fields).downcase.split(',').each { |n| object_list << ((r[("#{n}").strip]).to_s || 'N/A') }
-        else
-          if locate_config_value(:cloudstack_project)
-            object_list << r['account'].to_s
-            object_list << r['domain'].to_s
-            case r['accounttype']
-              when 0 then object_list << "User"
-              when 1 then object_list << "Admin"
-              when 2 then object_list << "Domain Admin"
-              else object_list << "unknown"
-            end
-            object_list << r['role'].to_s
-            object_list << r['user'].count.to_s
-          else
-            object_list << r['name'].to_s
-            object_list << r['domain'].to_s
-            object_list << r['state'].to_s
-            case r['accounttype']
-              when 0 then object_list << "User"
-              when 1 then object_list << "Admin"
-              when 2 then object_list << "Domain Admin"
-              else object_list << "unknown"
-            end
-            object_list << r['user'].count.to_s
-          end
-        end
+      result.each do |r|
+        r['accounttype'] = 'User' if r['accounttype'] == 0
+        r['accounttype'] = 'Admin' if r['accounttype'] == 1
+        r['accounttype'] = 'Domain Admin' if r['accounttype'] == 2
+        r['user'] = r['user'].count if r['user']
       end
-      puts ui.list(object_list, :uneven_columns_across, columns)
-      list_object_fields(connection_result) if locate_config_value(:fieldlist)
+
+      list_object(columns, result)
     end
 
   end

data/lib/chef/knife/cs_base.rb

@@ -16,8 +16,6 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
-
 class Chef
   class Knife
     module KnifeCloudstackBase
@@ -26,8 +24,7 @@ class Chef
         includer.class_eval do
 
           deps do
-            require 'readline'
-            require 'chef/json_compat'
+            require 'knife-cloudstack/connection'
           end
 
           option :cloudstack_url,
@@ -92,7 +89,7 @@ class Chef
 
           def locate_config_value(key)
             key = key.to_sym
-            config[key] || Chef::Config[:knife][key]
+            config[key] || Chef::Config[:knife][key] || nil
           end 
 
         end

data/lib/chef/knife/cs_baselist.rb

@@ -17,7 +17,7 @@
 #
 
 require 'json'
-require 'chef/knife'
+require 'chef/knife/cs_base'
 
 class Chef
   class Knife
@@ -25,6 +25,7 @@ class Chef
 
       def self.included(includer)
         includer.class_eval do
+          include Chef::Knife::KnifeCloudstackBase
 
           option :filter,
                  :long => "--filter 'FIELD:NAME'",
@@ -47,10 +48,10 @@ class Chef
       end
 
       def output_format(json)
-        if locate_config_value(:format) =~ /json/i
-            json_hash = {}; 
-	    json.each { |k| json_hash.merge!( k['id'] => k) }
-            puts JSON.pretty_generate(json_hash) 
+        if locate_config_value(:format) =~ /^j/i
+          json_hash = {}; 
+          json.each { |k| json_hash.merge!( k['id'] => k) }
+          puts JSON.pretty_generate(json_hash) 
           exit 0
         end
       end
@@ -66,7 +67,9 @@ class Chef
         object.first.sort.each do |k,v|
           object_fields << ui.color(k, :yellow, :bold)
           object_fields << v.class.to_s
-          if v.kind_of?(Array)
+          if v.kind_of?(Hash)
+            object_fields << '<Hash>'
+          elsif v.kind_of?(Array)
             object_fields << '<Array>'
           else
             object_fields << ("#{v}").strip.to_s
@@ -75,7 +78,34 @@ class Chef
         puts "\n"
         puts ui.list(object_fields, :uneven_columns_across, 3)
       end
-    
+
+      def list_object(columns, object)
+
+        output_format(object)
+        object_list = []
+        if locate_config_value(:fields)
+          locate_config_value(:fields).split(',').each { |n| object_list << ui.color(("#{n}").strip, :bold) }
+        else 
+          columns.each do |column|
+            n = (column.split(':').first).strip 
+            object_list << (ui.color("#{n}", :bold) || 'N/A')
+          end
+        end
+
+        n_columns = object_list.count
+        object_list = [] if locate_config_value(:noheader)
+   
+        object.each do |r|
+          if locate_config_value(:fields)
+            locate_config_value(:fields).downcase.split(',').each { |n| object_list << ((r[("#{n}").strip]).to_s || 'N/A') }
+          else
+            columns.each { |column| object_list << (r["#{column.split(':').last.strip}"].to_s || 'N/A') }
+          end
+        end
+        puts ui.list(object_list, :uneven_columns_across, n_columns)
+        list_object_fields(object) if locate_config_value(:fieldlist)
+      end
+
     end
   end
 end

data/lib/chef/knife/cs_cluster_list.rb

@@ -16,20 +16,14 @@
 # limitations under the License.
 #
 
-require 'chef/knife/cs_base'
+require 'chef/knife'
 require 'chef/knife/cs_baselist'
 
 module KnifeCloudstack
   class CsClusterList < Chef::Knife
 
-    include Chef::Knife::KnifeCloudstackBase
     include Chef::Knife::KnifeCloudstackBaseList
 
-    deps do
-      require 'knife-cloudstack/connection'
-      Chef::Knife.load_deps
-    end
-
     banner "knife cs cluster list (options)"
 
     option :name,
@@ -43,50 +37,23 @@ module KnifeCloudstack
     def run
       validate_base_options
 
-      if locate_config_value(:fields)
-        object_list = []
-        locate_config_value(:fields).split(',').each { |n| object_list << ui.color(("#{n}").strip, :bold) }
-      else
-        object_list = [
-          ui.color('Name', :bold),
-          ui.color('Pod', :bold),
-          ui.color('Zone', :bold),
-          ui.color('HypervisorType', :bold),
-          ui.color('ClusterType', :bold),
-          ui.color('AllocationState', :bold),
-          ui.color('ManagedState', :bold)
-        ]
-      end
-
-      columns = object_list.count
-      object_list = [] if locate_config_value(:noheader)
-
-      connection_result = connection.list_object(
-        "listClusters",
-        "cluster",
-        locate_config_value(:filter),
-        false,
-        locate_config_value(:keyword),
-        locate_config_value(:name)
-      )
-
-      output_format(connection_result)
-
-      connection_result.each do |r|
-       if locate_config_value(:fields)
-          locate_config_value(:fields).downcase.split(',').each { |n| object_list << ((r[("#{n}").strip]).to_s || 'N/A') }
-        else
-          object_list << r['name'].to_s
-          object_list << r['podname'].to_s
-          object_list << r['zonename'].to_s
-          object_list << r['hypervisortype'].to_s
-          object_list << r['clustertype'].to_s
-          object_list << r['allocationstate'].to_s
-          object_list << r['managedstate'].to_s
-        end
-      end
-      puts ui.list(object_list, :uneven_columns_across, columns)
-      list_object_fields(connection_result) if locate_config_value(:fieldlist)
+      columns = [
+        'Name		 :name',
+        'Pod		 :podname',
+        'Zone		 :zonename',
+        'HypervizorType  :hypervisortype',
+        'ClusterType	 :clustertype',
+        'AllocationState :allocationstate',
+        'ManagedState 	 :managedstate'
+      ]
+
+      params = { 'command' => "listClusters" }
+      params['filter']  = locate_config_value(:filter)  if locate_config_value(:filter)
+      params['keyword'] = locate_config_value(:keyword) if locate_config_value(:keyword)
+      params['name']    = locate_config_value(:name)    if locate_config_value(:name)
+      
+      result = connection.list_object(params, "cluster")
+      list_object(columns, result)
     end
 
   end

data/lib/chef/knife/cs_config_list.rb

@@ -16,20 +16,14 @@
 # limitations under the License.
 #
 
-require 'chef/knife/cs_base'
+require 'chef/knife'
 require 'chef/knife/cs_baselist'
 
 module KnifeCloudstack
   class CsConfigList < Chef::Knife
 
-    include Chef::Knife::KnifeCloudstackBase
     include Chef::Knife::KnifeCloudstackBaseList
 
-    deps do
-      require 'knife-cloudstack/connection'
-      Chef::Knife.load_deps
-    end
-
     banner "knife cs config list (options)"
 
     option :name,
@@ -43,42 +37,19 @@ module KnifeCloudstack
     def run
       validate_base_options
 
-      if locate_config_value(:fields)
-        object_list = []
-        locate_config_value(:fields).split(',').each { |n| object_list << ui.color(("#{n}").strip, :bold) }
-      else
-        object_list = [
-          ui.color('Category', :bold),
-          ui.color('Name', :bold),
-          ui.color('Value', :bold)
-        ]
-      end
-
-      columns = object_list.count
-      object_list = [] if locate_config_value(:noheader)
-
-      connection_result = connection.list_object(
-        "listConfigurations",
-        "configuration",
-        locate_config_value(:filter),
-        false,
-        locate_config_value(:keyword),
-        locate_config_value(:name)
-      )
-
-      output_format(connection_result)
-
-      connection_result.each do |r|
-       if locate_config_value(:fields)
-          locate_config_value(:fields).downcase.split(',').each { |n| object_list << ((r[("#{n}").strip]).to_s || 'N/A') }
-        else
-          object_list << r['category'].to_s
-          object_list << r['name'].to_s
-          object_list << r['value'].to_s
-        end
-      end
-      puts ui.list(object_list, :uneven_columns_across, columns)
-      list_object_fields(connection_result) if locate_config_value(:fieldlist)
+      columns = [
+        'Category :category',
+        'Name     :name',
+        'Value    :value'
+      ]
+
+      params = { 'command' => "listConfigurations" }
+      params['filter']  = locate_config_value(:filter)  if locate_config_value(:filter)
+      params['keyword'] = locate_config_value(:keyword) if locate_config_value(:keyword)
+      params['name']    = locate_config_value(:name)    if locate_config_value(:name)
+      
+      result = connection.list_object(params, "configuration")
+      list_object(columns, result)
     end
 
   end

data/lib/chef/knife/cs_disk_list.rb

@@ -16,20 +16,14 @@
 # limitations under the License.
 #
 
-require 'chef/knife/cs_base'
+require 'chef/knife'
 require 'chef/knife/cs_baselist'
 
 module KnifeCloudstack
   class CsDiskList < Chef::Knife
 
-    include Chef::Knife::KnifeCloudstackBase
     include Chef::Knife::KnifeCloudstackBaseList
 
-    deps do
-      require 'knife-cloudstack/connection'
-      Chef::Knife.load_deps
-    end
-
     banner "knife cs disk list (options)"
 
     option :name,
@@ -43,46 +37,21 @@ module KnifeCloudstack
     def run
       validate_base_options
 
-      if locate_config_value(:fields)
-        object_list = []
-        locate_config_value(:fields).split(',').each { |n| object_list << ui.color(("#{n}").strip, :bold) }
-      else
-        object_list = [
-          ui.color('Name', :bold),
-          ui.color('Domain', :bold),
-          ui.color('Size', :bold),
-          ui.color('Comment', :bold),
-          ui.color('Created', :bold)
-        ]
-      end
-
-      columns = object_list.count
-      object_list = [] if locate_config_value(:noheader)
-
-      connection_result = connection.list_object(
-        "listDiskOfferings",
-        "diskoffering",
-        locate_config_value(:filter),
-        false,
-        locate_config_value(:keyword),
-        locate_config_value(:name)
-      )
-
-      output_format(connection_result)
-
-      connection_result.each do |r|
-        if locate_config_value(:fields)
-          locate_config_value(:fields).downcase.split(',').each { |n| object_list << ((r[("#{n}").strip]).to_s || 'N/A') }
-        else
-          object_list << r['name'].to_s
-          object_list << r['domain'].to_s
-          object_list << r['disksize'].to_s + 'GB'
-          object_list << r['displaytext'].to_s
-          object_list << r['created']
-        end
-      end
-      puts ui.list(object_list, :uneven_columns_across, columns)
-      list_object_fields(connection_result) if locate_config_value(:fieldlist)
+      columns = [
+        'Name	 :name',
+        'Domain  :domain',
+        'Size	 :disksize',
+        'Comment :displaytext',
+        'Created :created'
+      ]
+
+      params = { 'command' => "listDiskOfferings" }
+      params['filter']  = locate_config_value(:filter)  if locate_config_value(:filter)
+      params['keyword'] = locate_config_value(:keyword) if locate_config_value(:keyword)
+      params['name']    = locate_config_value(:name)    if locate_config_value(:name)
+      
+      result = connection.list_object(params, "diskoffering")
+      list_object(columns, result)
     end
 
   end