bosh_cli 0.19 → 0.19.1

data/lib/cli/commands/biff.rb

@@ -37,7 +37,8 @@ module Bosh::Cli::Command
         "Would you like the new version copied to '%s'? [yn]"
 
     # Accessor for testing purposes.
-    attr_accessor :ip_helper, :template_output
+    attr_accessor :ip_helper
+    attr_accessor :template_output
 
     # Deletes the temporary files that were used.
     def delete_temp_diff_files
@@ -208,12 +209,26 @@ module Bosh::Cli::Command
     #     from.
     # @return [String] The network/mask.
     def get_network_and_mask(netw_name)
-      netw_cidr = @ip_helper[netw_name]
+      netw_cidr = get_helper(netw_name)
       "#{netw_cidr.network}#{netw_cidr.netmask}"
     end
 
+    # Helper function for getting the first and last number from a range, but
+    # also taking into account negative ranges and the network size.
+    # @param [Range] range The range.
+    # @param [String] netw_name The cidr network object.
+    # @return [Array] The first and last number.
+    def get_first_last_from_range(range, netw_cidr)
+      first = (range.first >= 0) ? range.first :
+          netw_cidr.size + range.first
+      last = (range.last >= 0) ? range.last :
+          netw_cidr.size + range.last
+      return [first, last]
+    end
+
     # Used by the template to specify IPs for jobs. It uses the CIDR tool to get
-    # them.
+    # them.  Netw_name can include .range or .static, such as default.static to
+    # choose what range the IPs are based on.
     # @param [Integer] ip_num The nth IP number to get.
     # @param [String] netw_name The name of the network to get the IP from.
     # @return [String] An IP in the network.
@@ -227,14 +242,58 @@ module Bosh::Cli::Command
     # @param [String] netw_name The name of the network to get the IPs from.
     # @return [String] An IP return in the network.
     def ip_range(range, netw_name)
-      netw_cidr = @ip_helper[netw_name]
-      first = (range.first >= 0) ? range.first :
-          netw_cidr.size + range.first
-      last = (range.last >= 0) ? range.last :
-          netw_cidr.size + range.last
+      netw_cidr = get_helper(netw_name)
+      first, last = get_first_last_from_range(range, netw_cidr)
+      unless netw_cidr[first] and netw_cidr[last]
+        raise "Ip range '#{range}' not in #{netw_name}."
+      end
+      first == last ? "#{netw_cidr[first].ip}" :
+          "#{netw_cidr[first].ip} - #{netw_cidr[last].ip}"
+    end
+
+    # Returns the array of IPs for a network name.
+    # @param [String] netw_name The name of the network, such as default.static.
+    # @return [Array|CIDR] An array or CIDR object that behaves like an array.
+    def get_helper(netw_name)
+      netw_name, type = netw_name.split(".")
+      type ||= "range"
+      @ip_helper[netw_name][type]
+    end
+
+    # Gets the range section out of the user's deployment config and creates a
+    # CIDR object.  This is used for calculating IPs in the .erb template that
+    # uses the ip and ip_range methods.
+    # @param [Array] subnets The subnets in a network configuration.
+    # @return [CIDR] A CIDR object.
+    def get_range(subnets)
+      NetAddr::CIDR.create(subnets.first["range"])
+    end
 
-      first == last ? "#{netw_cidr.nth(first)}" :
-          "#{netw_cidr.nth(first)} - #{netw_cidr.nth(last)}"
+    # Gets the static ranges out of the user's deployment config and creates an
+    # array of CIDR objects.  This is used for calculating IPs in the .erb
+    # template that uses the ip and ip_range methods.
+    # @param [Array] subnets The subnets in a network configuration.
+    # @return [Array] An array of CIDR objects.
+    def get_static_ranges(subnets)
+      static_ranges = subnets.first["static"]
+      if !static_ranges || static_ranges.empty?
+        return nil
+      end
+      static_ips = []
+      static_ranges.each do |static_range|
+        range_split = static_range.split("-")
+        if range_split.size == 1
+          static_ips.push(range_split[0])
+          next
+        end
+
+        start_range = NetAddr::CIDR.create(range_split[0].strip)
+        end_range = NetAddr::CIDR.create(range_split[1].strip)
+        (start_range..end_range).each do |ip_entry|
+          static_ips.push(ip_entry)
+        end
+      end
+      static_ips
     end
 
     # Creates the helper hash.  Keys are the network name, values are the CIDR
@@ -249,7 +308,9 @@ module Bosh::Cli::Command
       netw_arr.each do |netw|
         subnets = netw["subnets"]
         check_valid_network_config(netw, subnets)
-        helper[netw["name"]] = NetAddr::CIDR.create(subnets.first["range"])
+        helper[netw["name"]] = {}
+        helper[netw["name"]]["range"] = get_range(subnets)
+        helper[netw["name"]]["static"] = get_static_ranges(subnets)
       end
       helper
     end
@@ -282,7 +343,7 @@ module Bosh::Cli::Command
       copy_to_file = @diff_works ? @deployment_file : @deployment_file + ".new"
       agree_text = @diff_works ?
           KEEP_NEW_VERSION_TEXT : (DIFF_FAILED_KEEP_NEW_TEXT % copy_to_file)
-      if agree(agree_text)
+      if non_interactive? or agree(agree_text)
         say("New version copied to '#{copy_to_file}'")
         FileUtils.cp(@temp_file_path_2, copy_to_file)
       end

data/lib/cli/commands/stemcell.rb

@@ -110,18 +110,21 @@ module Bosh::Cli::Command
     end
 
     # Prints out the publicly available stemcells.
-    def list_public
+    def list_public(*args)
+      full = args.include?("--full")
       yaml = get_public_stemcell_list
       stemcells_table = table do |t|
         t.headings = "Name", "Url"
         yaml.keys.sort.each do |key|
           if key != PUBLIC_STEMCELL_INDEX
-            t << [key, yaml[key]["url"]]
+            url = full ? yaml[key]["url"] : "#{yaml[key]["url"][0..49]}..."
+            t << [key, url]
           end
         end
       end
       puts(stemcells_table)
-      puts("To download use 'bosh download public stemcell <stemcell_name>'.")
+      puts("To download use 'bosh download public stemcell <stemcell_name>'." +
+          "For full url use --full.")
     end
 
     # Downloads one of the publicly available stemcells.

data/lib/cli/runner.rb

@@ -454,6 +454,7 @@ module Bosh::Cli
         usage "public stemcells"
         desc  "Show the list of publicly available stemcells for download."
         route :stemcell, :list_public
+        option "--full", "show the full download url"
       end
 
       command :download_public_stemcell do

data/lib/cli/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module Cli
-    VERSION = "0.19"
+    VERSION = "0.19.1"
   end
 end

data/spec/unit/biff_spec.rb

@@ -122,7 +122,7 @@ describe Bosh::Cli::Command::Biff do
 
   it "allows ip_range to take negative ranges" do
     @biff.ip_helper = {
-        "default" => NetAddr::CIDR.create("192.168.1.0/22")
+        "default" => { "range" => NetAddr::CIDR.create("192.168.1.0/22") }
     }
     @biff.ip_range(-11..-2, "default").should == "192.168.3.245 - 192.168.3.254"
   end
@@ -137,4 +137,26 @@ describe Bosh::Cli::Command::Biff do
     @biff.delete_all_except(obj, "b").should == [ {"name" => "b"} ]
   end
 
+  it "gets a range from a static ip list correctly" do
+    @biff.ip_helper = {
+      "default" => {
+        "static" => [
+          NetAddr::CIDR.create("192.168.1.1"),
+          NetAddr::CIDR.create("192.168.1.2"),
+          NetAddr::CIDR.create("192.168.1.3") ]
+      }}
+    @biff.ip_range((1..2), "default.static").should ==
+        "192.168.1.2 - 192.168.1.3"
+  end
+
+  it "gets an IP from a static ip list correctly" do
+    @biff.ip_helper = {
+      "default" => {
+        "static" => [
+          NetAddr::CIDR.create("192.168.1.1"),
+          NetAddr::CIDR.create("192.168.1.2"),
+          NetAddr::CIDR.create("192.168.1.3") ]
+      }}
+    @biff.ip(0, "default.static").should == "192.168.1.1"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cli
 version: !ruby/object:Gem::Version
-  version: '0.19'
+  version: 0.19.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-25 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
@@ -317,7 +317,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2317006899427919460
+      hash: -854955838650099269
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -326,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2317006899427919460
+      hash: -854955838650099269
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23