knife-softlayer 0.1.3 → 0.2.0.pre.f0ba31b95

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGZhNGIxN2E4YjZlNDVjNDk4MzVhZjhiNjkwYWUzN2NlY2RlNzkzNw==
+    YTMxZDhhZDc1MWQ0Y2RkYWM4Y2IyYjJmY2FhNzY3MTg0ZGIxMTU2ZA==
   data.tar.gz: !binary |-
-    MWM1M2E1M2RlMWVmNThlYzFjN2MwMjJkOTFhMGE0NThjZTQwMThhNA==
+    MzY5ZTQ1YWMxYjAwNTkxYmJkMzEwNTMwZjYwMmUxOGQ5ZTZmMGJjOQ==
 SHA512:
   metadata.gz: !binary |-
-    ZTYyZDVmYTFjYmU2NmVhOTFkOGMzNTk4NGMxMzZjMWFhODIxMGZiZWY5YzEx
-    NTVhMTlhNDY0MzcxOWEzMmZiODZmNmJkYTkxZTllYmRkMzBmOTFhYThkZTM0
-    YWVlMmU2YmE0MjdjMjhlNDUxNTMxMWZkYTFmODA5MWM5YWM4MTk=
+    ZTRkYzNhNDQyNDdiMzkyMGE2YzI2MDBlYTNmZGJlOTc1NTNlY2VjNzBkMjZj
+    YmI5NWVhY2M0OWIyNjdiNTIyODFmMzU0NmJhODFlOGNhZjQ3ZjE0MGVmNjhl
+    MmFhNmZjYWEyMjRmODgxOGYwODlkYjA1ZWRmZWJmMTcwNTVkZDY=
   data.tar.gz: !binary |-
-    Y2VhNjA2YWM1MmViZTc1YWEyZWYzY2U4NzljZGQ0Y2Y2YmE1MGJlMTUzZTZi
-    MzczYzBkODQ0MjlhNTViOTg1NmI4MTE4N2EyZWU5MDhkYjA4ODc1NzRlNjA0
-    ZTJiNWU4MjIzMTMyZTcyMTllNjQ3MWM1MzQ1YTg4MjJlNTkyZWI=
+    OTk4Yzc3OTRjMGM4ZmU3YmYzMWM4NmJiZTdjYmM2MTlkYzEwNmRhMzAyMmQ5
+    MDgxYTRhODM1NGIwMjgzNTBjYjVkMWUyZDhmZjA0OTdjMjA1NGNmODJkMDdk
+    YzA4OTQwMWJhMDIyNmUzYWM4OTE1YjExYmE1NTNjNjY2NDM0NWE=

data/knife-softlayer.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(spec|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "softlayer_api", "~> 1.0.8"
+  spec.add_dependency "fog-softlayer", "~> 0.3.14"
   spec.add_dependency "knife-windows", "> 0.5.12"
   spec.add_dependency "net-ssh", "> 2.8.0"
 

data/lib/chef/knife/flavor/base.rb

@@ -11,32 +11,22 @@ class Chef
   class Knife
     module SoftlayerFlavorBase
 
-      ##
-      # Return the flavors table or the options table.
-      # @param [Boolean] show_all
-      # @return [Hash]
-      def table_info(show_all=false)
-        if show_all
-          options_table
-        else
-          flavors_table
-        end
-      end
-
       ##
       # Build table of all VM configuration options.
       # @return [Hash]
       def options_table
         columns = [
-            ui.color("| CORES", :bold, :white, :green),
-            ui.color("| RAM", :bold, :white, :green),
-            ui.color("| DISK", :bold, :white, :green),
-            ui.color("| OS", :bold, :white, :green),
-            ui.color("| NETWORK [MBS]", :bold, :white, :green),
-            ui.color("| DATACENTER", :bold, :white, :green)
+            "| CORES",
+            "| RAM",
+            "| DISK",
+            "| OS",
+            "| NETWORK [MBS]",
+            "| DATACENTER",
         ]
 
-        opts = connection.getCreateObjectOptions
+        6.times { columns << '| ========== ' }
+
+        opts = connection.request(:virtual_guest, :get_create_object_options).body
         cpu = opts['processors']
         ram = opts['memory']
         disk = opts['blockDevices'].sort_by{|d| d['itemPrice']['item']['description'] unless d['itemPrice'].nil? }
@@ -57,121 +47,6 @@ class Chef
         columns
       end
 
-      ##
-      # Build the VM "flavor" table.
-      # @return [Hash]
-      def flavors_table
-        # We don't have "flavors" actually, you can just pick from the menu.
-        # Let's shim in place the standard openstack flavors so people can get started without making loads of decisions.
-
-        columns = [
-            ui.color("| FLAVOR", :bold, :green),
-            ui.color("| CORES", :bold, :green),
-            ui.color("| RAM", :bold, :green),
-            ui.color("| DISK", :bold, :green)
-        ]
-
-        # tiny
-        columns << "| tiny"
-        columns << "| 1"
-        columns << "| 1024"
-        columns << "| 25GB [LOCAL]"
-
-        # small
-        columns << "| small"
-        columns << "| 2"
-        columns << "| 2048"
-        columns << "| 100GB [LOCAL]"
-
-
-        # medium
-        columns << "| medium"
-        columns << "| 4"
-        columns << "| 4096"
-        columns << "| 150GB [LOCAL]"
-
-
-        # large
-        columns << "| large"
-        columns << "| 8"
-        columns << "| 8192"
-        columns << "| 200GB [LOCAL]"
-
-
-        # xlarge
-        columns << "| xlarge"
-        columns << "| 16"
-        columns << "| 16384"
-        columns << "| 300GB [LOCAL]"
-      end
-
-      def self.load_flavor(flavor)
-        self.send(flavor.to_s)
-      end
-
-
-      private
-
-      ##
-      # Set options for a "tiny" instance.
-      # @return [Hash]
-      def self.tiny
-        {
-            'startCpus' => 1,
-            'maxMemory' => 1024,
-            'localDiskFlag' => true,
-            'blockDevices' => [{'device' => 0, 'diskImage' => {'capacity' => 25 } }]
-        }
-      end
-
-      ##
-      # Set options for a "small" instance.
-      # @return [Hash]
-      def self.small
-        {
-            'startCpus' => 2,
-            'maxMemory' => 2048,
-            'localDiskFlag' => true,
-            'blockDevices' => [{'device' => 0, 'diskImage' => {'capacity' => 100 } }]
-        }
-      end
-
-      ##
-      # Set options for a "medium" instance.
-      # @return [Hash]
-      def self.medium
-        {
-            'startCpus' => 4,
-            'maxMemory' => 4096,
-            'localDiskFlag' => true,
-            'blockDevices' => [{'device' => 0, 'diskImage' => {'capacity' => 25 } },{'device' => 2, 'diskImage' => {'capacity' => 150 } }]
-        }
-      end
-
-      ##
-      # Set options for a "large" instance.
-      # @return [Hash]
-      def self.large
-        {
-            'startCpus' => 8,
-            'maxMemory' => 8192,
-            'localDiskFlag' => true,
-            'blockDevices' => [{'device' => 0, 'diskImage' => {'capacity' => 25 } },{'device' => 2, 'diskImage' => {'capacity' => 200 } }]
-        }
-      end
-
-      ##
-      # Set options for an "xlarge" instance.
-      # @return [Hash]
-      def self.xlarge
-        {
-            'startCpus' => 16,
-            'maxMemory' => 16384,
-            'localDiskFlag' => true,
-            'blockDevices' => [{'device' => 0, 'diskImage' => {'capacity' => 25 } },{'device' => 2, 'diskImage' => {'capacity' => 300 } }]
-        }
-      end
-
     end
   end
 end

data/lib/chef/knife/softlayer_base.rb

@@ -19,11 +19,17 @@ class Chef
         includer.class_eval do
 
           deps do
-            require 'softlayer_api'
-            require 'readline'
-            require 'chef/json_compat'
+            require 'fog/softlayer'
             require 'net/ssh'
             require 'net/ssh/multi'
+            require 'chef/monkey_patches/net-ssh-multi'
+            require 'readline'
+            require 'chef/exceptions'
+            require 'chef/search/query'
+            require 'chef/mixin/command'
+            require 'chef/mixin/shell_out'
+            require 'mixlib/shellout'
+            require 'chef/json_compat'
           end
 
           option :softlayer_credential_file,
@@ -49,102 +55,26 @@ class Chef
       # Returns a connection to a SoftLayer API Service Endpoint.
       # @param [Symbol] service
       # @return [SoftLayer::Service]
-      def connection(service=:cci)
-        SoftLayer::Service.new(
-            SoftlayerBase.send(service),
-            :username => Chef::Config[:knife][:softlayer_username],
-            :api_key => Chef::Config[:knife][:softlayer_api_key],
-            :user_agent => USER_AGENT
-        )
-      end
-
-      ##
-      # Returns identifier string for the SoftLayer Virtual Guest service.
-      # @return [String]
-      def self.cci
-        'SoftLayer_Virtual_Guest'
-        end
-
-      ##
-      # Returns identifier string for the SoftLayer Product Package service.
-      # @return [String]
-      def self.package
-        'SoftLayer_Product_Package'
-      end
-
-      ##
-      # Returns identifier string for the SoftLayer Product Order service.
-      # @return [String]
-      def self.order
-        'SoftLayer_Product_Order'
+      def connection(service=:compute)
+        self.send(service)
       end
 
-      ##
-      # Returns identifier string for the SoftLayer Subnet Ordering service.
-      # @return [String]
-      def self.subnet
-        'SoftLayer_Container_Product_Order_Network_Subnet'
-      end
-
-      ##
-      # Returns identifier string for the SoftLayer User Account service.
-      # @return [String]
-      def self.account
-        'SoftLayer_Account'
-      end
-
-      ##
-      # Returns identifier string for the SoftLayer Global IP service.
-      # @return [String]
-      def self.global_ip
-        'SoftLayer_Network_Subnet_IpAddress_Global'
-      end
-
-      ##
-      # Returns id of a particular SoftLayer ordering package.
-      # @return [String]
-      def self.non_server_package_id
-        0 # this package contains everything that isn't a server on the SoftLayer API
-      end
-
-      ##
-      # Queries the SoftLayer API and returns the "category code" required for ordering a Global IPv4 address.
-      # @return [Integer]
-      def self.global_ipv4_cat_code
-        SoftLayer::Service.new(
-            SoftlayerBase.send(:package),
-            :username => Chef::Config[:knife][:softlayer_username],
-            :api_key => Chef::Config[:knife][:softlayer_api_key],
-            :user_agent => USER_AGENT
-        ).object_with_id(non_server_package_id).object_mask('isRequired', 'itemCategory').getConfiguration.map do |item|
-          item['itemCategory']['id'] if item['itemCategory']['categoryCode'] == 'global_ipv4'
-        end.compact.first
-      end
-
-      ##
-      # Queries the SoftLayer API and returns the "price code" required for ordering a Global IPv4 address.
-      # @return [Integer]
-      def self.global_ipv4_price_code
-        SoftLayer::Service.new(
-            SoftlayerBase.send(:package),
-            :username => Chef::Config[:knife][:softlayer_username],
-            :api_key => Chef::Config[:knife][:softlayer_api_key],
-            :user_agent => USER_AGENT
-        ).object_with_id(non_server_package_id).object_mask('id', 'item.description', 'categories.id').getItemPrices.map do |item|
-          item['id'] if item['categories'][0]['id'] == SoftlayerBase.global_ipv4_cat_code
-        end.compact.first
+      def compute
+        @compute_connection ||= Fog::Compute.new(
+            :provider => :softlayer,
+            :softlayer_username => Chef::Config[:knife][:softlayer_username],
+            :softlayer_api_key => Chef::Config[:knife][:softlayer_api_key],
+            :softlayer_default_datacenter => Chef::Config[:knife][:softlayer_default_datacenter],
+            :softlayer_default_domain => Chef::Config[:knife][:softlayer_default_domain],
+        )
       end
 
-      ##
-      # Constructs an order required for purchasing a Global IPv4 address.
-      # @return [Hash]
-      def self.build_global_ipv4_order
-        {
-            "complexType" => SoftlayerBase.subnet,
-            "packageId" => non_server_package_id,
-            "prices" => [{"id"=>SoftlayerBase.global_ipv4_price_code}],
-            "quantity" => 1
-        }
+      def network
+        @network_connection ||= Fog::Network.new(
+          :provider => :softlayer,
+          :softlayer_username => Chef::Config[:knife][:softlayer_username],
+          :softlayer_api_key => Chef::Config[:knife][:softlayer_api_key],
+        )
       end
 
       ##
@@ -171,3 +101,9 @@ class Chef
     end
   end
 end
+
+module OS
+  def OS.windows?
+    (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
+  end
+end

data/lib/chef/knife/softlayer_datacenter_list.rb

@@ -0,0 +1,28 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
+#
+
+require 'chef/knife/softlayer_base'
+
+class Chef
+  class Knife
+    class SoftlayerDatacenterList < Knife
+
+      include Knife::SoftlayerBase
+
+      banner 'knife softlayer datacenter list (options)'
+
+      def run
+        $stdout.sync = true
+        table_data = connection(:network).datacenters.map do |dc|
+          {:name => dc.name, :long_name => dc.long_name }
+        end
+        puts Formatador.display_table(table_data, [:name, :long_name])
+      end
+
+    end
+  end
+end

data/lib/chef/knife/softlayer_datacenter_show.rb

@@ -0,0 +1,45 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
+#
+
+require 'chef/knife/softlayer_base'
+
+class Chef
+  class Knife
+    class SoftlayerDatacenterShow < Knife
+
+      include Knife::SoftlayerBase
+
+      banner 'knife softlayer datacenter show DATACENTER'
+
+      option :dc,
+             :short => "-a",
+             :long => "--all",
+             :description => "Display all available configuration options for launching an instance.",
+             :default => false
+
+
+      def run
+        unless name_args.size == 1
+          puts ui.color("Specify exactly one datacenter to show.", :red)
+          show_usage
+          exit 1
+        end
+
+        $stdout.sync = true
+        dc = connection(:network).datacenters.by_name(name_args[0])
+
+        puts "#{ui.color("Long Name:", :green)} #{dc.long_name}"
+        puts "#{ui.color("Name:", :green)} #{dc.name}"
+
+        puts "#{ui.color("Routers:", :green)}"
+        puts Formatador.display_table(dc.routers)
+
+      end
+
+    end
+  end
+end

data/lib/chef/knife/softlayer_flavor_list.rb

@@ -18,21 +18,29 @@ class Chef
       banner 'knife softlayer flavor list (options)'
 
       option :all,
-        :short => "-a",
-        :long => "--all",
-        :description => "Display all available configuration options for launching an instance.",
-        :default => false
+             :short => "-a",
+             :long => "--all",
+             :description => "Display all available configuration options for launching an instance.",
+             :default => false
 
       ##
       # Run the procedure to list softlayer VM flavors or display all available options.
       # @return [nil]
       def run
-        table_data = table_info(config[:all])
+        $stdout.sync = true
         if config[:all]
-          puts ui.list(table_data, :columns_across, 6)
+
+          if OS.windows?
+            puts ui.list(options_table, :uneven_columns_across, 6)
+          else
+            IO.popen('less', 'w') do |pipe|
+              pipe.puts ui.list(options_table, :uneven_columns_across, 6)
+            end
+          end
+
           msg = "These options can be used in place of 'flavors'; See `knife softlayer server create --help` for details.\n"
         else
-          puts ui.list(table_data, :columns_across, 4)
+          puts connection.flavors.table([:id, :cpu, :ram, :disk,])
           msg = "'flavors' provided here for convenience; SoftLayer allows you to choose a configuration a la carte.\nFor a full list of available instance options use --all with the `knife softlayer flavor list` subcommand."
         end
         puts ui.color("\nNOTICE: ", :yellow)
@@ -42,3 +50,4 @@ class Chef
     end
   end
 end
+