knife-cloudstack 0.0.15 → 0.0.16

data/lib/chef/knife/cs_ostype_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 CsOstypeList < Chef::Knife
 
-    include Chef::Knife::KnifeCloudstackBase
     include Chef::Knife::KnifeCloudstackBaseList
-
-    deps do
-      require 'knife-cloudstack/connection'
-      Chef::Knife.load_deps
-    end
-
+    
     banner "knife cs ostype list (options)"
 
     option :keyword,
@@ -39,41 +33,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('ID', :bold),
-          ui.color('Description', :bold),
-          ui.color('OS Categorie ID', :bold)
-        ]
-      end
-
-      columns = object_list.count
-      object_list = [] if locate_config_value(:noheader)
-
-      connection_result = connection.list_object(
-        "listOsTypes",
-        "ostype",
-        locate_config_value(:filter),
-        false,
-        locate_config_value(:keyword)
-      )
-
-      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['id'].to_s
-          object_list << r['description'].to_s
-          object_list << r['oscategoryid'].to_s
-        end
-      end
-      puts ui.list(object_list, :uneven_columns_across, columns)
-      list_object_fields(connection_result) if locate_config_value(:fieldlist)
+      columns = [
+        'Description     :description',
+        'ID              :id',
+        'OS Categorie ID :oscategoryid'
+      ]
+
+      params = { 'command' => "listOsTypes" }
+      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)
+      
+      result = connection.list_object(params, "ostype")
+      list_object(columns, result)
     end
 
   end

data/lib/chef/knife/cs_pod_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 CsPodList < Chef::Knife
 
-    include Chef::Knife::KnifeCloudstackBase
     include Chef::Knife::KnifeCloudstackBaseList
 
-    deps do
-      require 'knife-cloudstack/connection'
-      Chef::Knife.load_deps
-    end
-
     banner "knife cs pod 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('Zone', :bold),
-          ui.color('Gateway', :bold),
-          ui.color('Netmask', :bold),
-          ui.color('Start IP', :bold),
-          ui.color('End IP', :bold),
-          ui.color('AllocationState', :bold)
-        ]
-      end
-
-      columns = object_list.count
-      object_list = [] if locate_config_value(:noheader)
-
-      connection_result = connection.list_object(
-        "listPods",
-        "pod",
-        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['zonename'].to_s
-          object_list << r['gateway'].to_s
-          object_list << r['netmask'].to_s
-          object_list << r['startip'].to_s
-          object_list << r['endip'].to_s
-          object_list << r['allocationstate'].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',
+        'Zone            :zonename',
+        'Gateway         :gateway',
+        'Netmask         :netmask',
+        'Start IP        :startip',
+        'End IP          :endip',
+        'AllocationState :allocationstate'
+      ]
+
+      params = { 'command' => "listPods" }
+      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, "pod")
+      list_object(columns, result)
     end
 
   end

data/lib/chef/knife/cs_project_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 CsProjectList < Chef::Knife
 
-    include Chef::Knife::KnifeCloudstackBase
     include Chef::Knife::KnifeCloudstackBaseList
 
-    deps do
-      require 'knife-cloudstack/connection'
-      Chef::Knife.load_deps
-    end
-
     banner "knife cs project list (options)"
 
     option :listall,
@@ -48,44 +42,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('Account', :bold),
-          ui.color('Domain', :bold),
-          ui.color('State', :bold),
-        ]
-      end
-
-      columns = object_list.count
-      object_list = [] if locate_config_value(:noheader)
-
-      connection_result = connection.list_object(
-        "listProjects",
-        "project",
-        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
-          object_list << r['name'].to_s
-          object_list << r['account'].to_s
-          object_list << r['domain'].to_s
-          object_list << r['state'].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',
+        'Account :account',
+        'Domain  :domain',
+        'State   :state'
+      ]
+
+      params = { 'command' => "listProjects" }
+      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)
+      
+      result = connection.list_object(params, "project")
+      list_object(columns, result)
     end
 
   end

data/lib/chef/knife/cs_publicip_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 CsPublicipList < Chef::Knife
 
-    include Chef::Knife::KnifeCloudstackBase
     include Chef::Knife::KnifeCloudstackBaseList
 
-    deps do
-      require 'knife-cloudstack/connection'
-      Chef::Knife.load_deps
-    end
-
     banner "knife cs publicip list (options)"
 
     option :listall,
@@ -40,48 +34,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('IP', :bold),
-          ui.color('Account', :bold),
-          ui.color('Domain', :bold),
-          ui.color('Zone', :bold),
-          ui.color('State', :bold),
-          ui.color('Allocated', :bold)
-        ]
-      end
-
-      columns = object_list.count
-      object_list = [] if locate_config_value(:noheader)
-
-      connection_result = connection.list_object(
-        "listPublicIpAddresses",
-        "publicipaddress",
-        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
-          object_list << r['ipaddress'].to_s
-          object_list << r['account'].to_s
-          object_list << r['domain'].to_s
-          object_list << r['zonename'].to_s
-          object_list << r['state'].to_s
-          object_list << r['allocated'].to_s
-        end
-      end
-      puts ui.list(object_list, :uneven_columns_across, columns)
-      list_object_fields(connection_result) if locate_config_value(:fieldlist)
+      columns = [
+        'IP        :ipaddress',
+        'Account   :account',
+        'Domain    :domain',
+        'Zone      :zonename',
+        'State     :state',
+        'Allocated :allocated'
+      ]
+
+      params = { 'command' => "listPublicIpAddresses" }
+      params['filter']  = locate_config_value(:filter)  if locate_config_value(:filter)
+      params['listall'] = locate_config_value(:listall) if locate_config_value(:listall)
+      
+      result = connection.list_object(params, "publicipaddress")
+      list_object(columns, result)
     end
 
   end

data/lib/chef/knife/cs_router_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 CsRouterList < Chef::Knife
 
-    include Chef::Knife::KnifeCloudstackBase
     include Chef::Knife::KnifeCloudstackBaseList
 
-    deps do
-      require 'knife-cloudstack/connection'
-      Chef::Knife.load_deps
-    end
-
     banner "knife cs router list (options)"
 
     option :listall,
@@ -48,46 +42,22 @@ 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('Account', :bold),
-          ui.color('Domain', :bold),
-          ui.color('State', :bold),
-          ui.color('Address', :bold)
-        ]
-      end
-
-      columns = object_list.count
-      object_list = [] if locate_config_value(:noheader)
-
-      connection_result = connection.list_object(
-        "listRouters",
-        "router",
-        locate_config_value(:filter),
-        locate_config_value(:listall),
-        locate_config_value(:keyword),
-        locate_config_value(:name)
-      )
-
-      output_format(connection_result)
+      columns = [
+        'Name    :name',
+        'Account :account',
+        'Domain  :domain',
+        'State   :state',
+        'Address :publicip'
+      ]
 
-      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['account'].to_s
-          object_list << r['domain'].to_s
-          object_list << r['state'].to_s
-          object_list << r['publicip'].to_s
-        end
-      end
-      puts ui.list(object_list, :uneven_columns_across, columns)
-      list_object_fields(connection_result) if locate_config_value(:fieldlist)
+      params = { 'command' => "listRouters" }
+      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)
+      
+      result = connection.list_object(params, "router")
+      list_object(columns, result)
     end
 
   end

data/lib/chef/knife/cs_securitygroup_list.rb

@@ -1,4 +1,4 @@
-#
+# 
 # Author:: Ryan Holmes (<rholmes@edmunds.com>)
 # Author:: Sander Botman (<sbotman@schubergphilis.com>)
 # Author:: Sebastien Goasguen (<runseb@gmail.com>)
@@ -19,21 +19,14 @@
 # limitations under the License.
 #
 
-require 'chef/knife/cs_base'
+require 'chef/knife'
 require 'chef/knife/cs_baselist'
 
 module KnifeCloudstack
   class CsSecuritygroupList < Chef::Knife
 
-    include Chef::Knife::KnifeCloudstackBase
     include Chef::Knife::KnifeCloudstackBaseList
-
-    deps do
-      require 'chef/knife'
-      require 'knife-cloudstack/connection'
-      Chef::Knife.load_deps
-    end
-
+    
     banner "knife cs securitygroup list (options)"
 
     option :name,
@@ -44,90 +37,22 @@ module KnifeCloudstack
            :long => "--keyword NAME",
            :description => "Specify part of servicename to list"
 
-    option :index,
-           :long => "--index",
-           :description => "Add index numbers to the output",
-           :boolean => true
-
     def run
       validate_base_options
-	
-      object_list = []
-      object_list << ui.color('Index', :bold) if locate_config_value(:index)
-
-      if locate_config_value(:fields)
-        locate_config_value(:fields).split(',').each { |n| object_list << ui.color(("#{n}").strip, :bold) }
-      elsif locate_config_value(:keyword)
-        [
-          ui.color('Name', :bold),
-          ui.color('Description', :bold),
-          ui.color('Account', :bold),
-          ui.color('IngressRules', :bold)
-        ].each { |field| object_list << field }
-      else
-        [
-          ui.color('Name', :bold),
-          ui.color('Description', :bold),
-          ui.color('Account', :bold)
-        ].each { |field| object_list << field }
-      end
 
-      columns = object_list.count
-      object_list = [] if locate_config_value(:noheader)
+      columns = [
+        'Name        :name',
+        'Description :description',
+        'Account     :account'
+      ]
 
-      connection_result = connection.list_object(
-        "listSecurityGroups",
-        "securitygroup",
-        locate_config_value(:filter),
-        false,
-        locate_config_value(:keyword),
-        locate_config_value(:name)
-      )
-
-      output_format(connection_result)
-            
-      if locate_config_value(:keyword)
-        index_num = 0
-        connection_result['ingressrule'].each do |r|
-          if r.nil?
-          else
-            if locate_config_value(:index)
-              index_num += 1
-              object_list << index_num.to_s
-            end
-
-            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 << connection_result['name'].to_s
-              object_list << connection_result['description'].to_s
-              object_list << connection_result['account'].to_s
-              object_list << r.to_s         
-            end
-          end  
-        end
-      
-      else
-          index_num = 0
-          connection_result.each do |r|
-            if locate_config_value(:index)
-              index_num += 1
-              object_list << index_num.to_s
-            end
-
-            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['description'].to_s
-              object_list << r['account'].to_s
-            end
-          end
-      
-      end
+      params = { 'command' => "listSecurityGroups" }
+      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)
       
-      puts ui.list(object_list, :uneven_columns_across, columns)
-      list_object_fields(connection_result) if locate_config_value(:fieldlist)
+      result = connection.list_object(params, "securitygroup")
+      list_object(columns, result)
     end
 
   end

data/lib/chef/knife/cs_server_add_nic.rb

@@ -0,0 +1,109 @@
+#
+# 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/cs_base'
+require 'chef/knife/cs_baselist'
+
+module KnifeCloudstack
+  class CsServerAddNic < Chef::Knife
+
+    include Chef::Knife::KnifeCloudstackBase
+    include Chef::Knife::KnifeCloudstackBaseList
+
+    deps do
+      require 'knife-cloudstack/connection'
+      require 'chef/knife'
+      Chef::Knife.load_deps
+    end
+
+    banner "knife cs server add nic SERVERID NETWORKID (--ipaddress X.X.X.X)"
+
+    option :ipaddress,
+           :long => "--ipaddress IPADDRESS",
+           :description => "Attach with the specified IP",
+           :default => nil
+
+
+    def run
+      validate_base_options
+
+      @server_id, @network_id = name_args
+
+      if @network_id.nil? || @server_id.nil?
+        show_usage
+        ui.fatal("You must provide both a network id and a server id")
+        exit(1)
+      end
+
+      @ipaddr = locate_config_value(:ipaddress)
+
+      object_list = []
+      if locate_config_value(:fields)
+        locate_config_value(:fields).split(',').each { |n| object_list << ui.color(("#{n}").strip, :bold) }
+      else
+        object_list << ui.color('Server', :bold)
+        object_list << ui.color('Network', :bold)
+        object_list << ui.color('Type', :bold)
+        object_list << ui.color('Default', :bold)
+        object_list << ui.color('Address', :bold)
+        object_list << ui.color('Gateway', :bold)
+        object_list << ui.color('Netmask', :bold)
+        object_list << ui.color('ID', :bold)
+      end
+
+      columns = object_list.count
+
+      connection_result = connection.add_nic_to_vm(
+        @network_id,
+        @server_id,
+        @ipaddr
+      )
+
+      output_format(connection_result)
+
+      object_list << connection_result['name']
+      object_list << ''
+      object_list << ''
+      object_list << ''
+      object_list << ''
+      object_list << ''
+      object_list << ''
+      object_list << ''
+      if connection_result['nic']
+        connection_result['nic'].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 << ''
+              object_list << r['networkname'].to_s
+              object_list << r['type'].to_s
+              object_list << (r['isdefault'] ? r['isdefault'].to_s : 'false')
+              object_list << (r['ipaddress'] || '')
+              object_list << (r['gateway'] || '')
+              object_list << (r['netmask'] || '')
+              object_list << (r['networkid'] || '')
+            end
+        end
+        puts ui.list(object_list, :uneven_columns_across, columns)
+        list_object_fields(connection_result) if locate_config_value(:fieldlist)
+      else
+        ui.error("No nics returned in response")
+      end
+    end
+  end
+end