ohboshwillitfit 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a73b0603f734bf9b868daf32fb7e95e9de171dd
-  data.tar.gz: 44b62bc8889bb050b3539e690dd82dd9b34db8e4
+  metadata.gz: d4a0ab05faaceb6d40ede364306a259078f562da
+  data.tar.gz: bb43c4199e2394052384bcf059e9c6e38bcfa3e1
 SHA512:
-  metadata.gz: 9bd591dd66ba07790f6d91259de62ab4f3ee8f3319b957ee0705b722f5bf58c9a78611c296ee823d207da7ee4b9dbb99a59ad1fbf94f267ef84ed4819e0e0bbf
-  data.tar.gz: e6ac405fbf24ad26aa9bfceeaf81c765bd6c1e0999ce139c47e2dbacd95fc79345c0ca15592da6d8e6d9845a0df13337897f95c60f95a89933325a43a764bb11
+  metadata.gz: 00d65e6fcce97032220d9b33794a0a40c8393c04347c69f40628d5fe8270e903ca77c2d3a3e162f8e198bb7ca3f2bab7cdf2eed15c5839c4b81217630b1a8fb7
+  data.tar.gz: 8a8209599e2f1be2a07f83652c56bf26681090fdbdfd753be402d9d5ace3a56032b73ce937a68bb1129a252ba9322f99bc62291c7e9b6e671d6d1a91f224fe4b

data/ChangeLog.md

@@ -0,0 +1,10 @@
+# Change Log
+
+## v1.1
+
+* shows volume size & volume count comparisons against quotas
+* added an --ignore-invalid-flavors option
+
+## v1.0
+
+* initial release

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in ohboshwillitfit.gemspec
 gemspec
+
+group :development do
+  gem "guard-rspec"
+end

data/Guardfile

@@ -0,0 +1,8 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard :rspec do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/ohboshwillitfit/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end

data/lib/bosh/cli/commands/will_it_fit.rb

@@ -6,16 +6,19 @@ module Bosh::Cli::Command
     usage "will it fit"
     desc  "check if this deployment will fit into OpenStack tenancy"
     option "--fog-key default", "Look up credentials in ~/.fog"
+    option "--ignore-invalid-flavors", "Do not fail if invalid flavors being used"
     def will_it_fit
       deployment_required
+      ignore_invalid_flavors = options[:ignore_invalid_flavors]
 
       if fog_key = options[:fog_key]
         credentials = OhBoshWillItFit::FogCredentials.load_from_file(fog_key)
       end
       fog_compute = Fog::Compute.new({provider: 'OpenStack'}.merge(credentials))
-      limits = OhBoshWillItFit::Limits.new(fog_compute)
-      unless limits.limits_available?
-        say "Older OpenStacks like this do not provide current resources being used.".make_yellow
+      fog_volumes = Fog::Volume.new({provider: 'OpenStack'}.merge(credentials))
+      limits = OhBoshWillItFit::Limits.new(fog_compute, fog_volumes)
+      unless limits.volumes_limits_available?
+        say "Older OpenStacks like this do not provide current volume resources being used.".make_yellow
         say "Can only display output based on quotas, rather than unused limits."
       end
 
@@ -42,12 +45,16 @@ module Bosh::Cli::Command
         flavors.sort {|f1, f2| f1.ram <=> f2.ram}.each do |flavor|
           say "  #{flavor.name}: ram: #{flavor.ram} disk: #{flavor.disk} cpus: #{flavor.vcpus}"
         end
-      else
+      end
+
+      if !flavor_errors || ignore_invalid_flavors
         say "Resources used:"
         resource_totals = OhBoshWillItFit::Resource.resource_totals(resources)
+        display_resource "instances", resource_totals["instances"], limits.instances_available
         display_resource "ram", resource_totals["ram"], limits.ram_size_available
-        display_resource "disk", resource_totals["disk"]
         display_resource "cpus", resource_totals["cpus"], limits.cores_available
+        display_resource "volumes", resource_totals["volumes"], limits.volumes_available
+        display_resource "disk", resource_totals["disk"], limits.volume_size_available
       end
     rescue => e
       err e.message

data/lib/ohboshwillitfit/limits.rb

@@ -1,57 +1,126 @@
 module OhBoshWillItFit
   class Limits
-    attr_reader :fog_compute
+    attr_reader :fog_compute, :fog_volumes
 
-    def initialize(fog_compute)
+    def initialize(fog_compute, fog_volumes)
       @fog_compute = fog_compute
+      @fog_volumes = fog_volumes
     end
 
     def max_total_cores
-      absolute_limits["maxTotalCores"]
+      compute_quotas["cores"]
     end
 
     def max_total_instances
-      absolute_limits["maxTotalInstances"]
+      compute_quotas["instances"]
     end
 
     def max_total_ram_size
-      absolute_limits["maxTotalRAMSize"]
+      compute_quotas["ram"]
     end
 
+    def max_total_volume_size
+      volume_quotas["gigabytes"]
+    end
+
+    def max_total_volumes
+      volume_quotas["volumes"]
+    end
+
+
     def total_cores_used
-      absolute_limits["totalCoresUsed"]
+      compute_servers.inject(0) { |total, server| total + flavor_for_server(server).vcpus }
     end
 
     def total_instances_used
-      absolute_limits["totalInstancesUsed"]
+      compute_servers.size
     end
 
     def total_ram_size_used
-      absolute_limits["totalRAMUsed"]
+      compute_servers.inject(0) { |total, server| total + flavor_for_server(server).ram }
     end
 
-    def limits_available?
-      total_cores_used && total_instances_used && total_ram_size_used
+    def total_volume_size_used
+      @total_volume_size_used ||= volumes.inject(0) {|size, vol| size + vol.size }
+    end
+
+    def total_volumes_used
+      @total_volumes_used ||= volumes.size
+    end
+
+    def volumes_limits_available?
+      max_total_volume_size
     end
 
     def cores_available
-      max_total_cores - (total_cores_used || 0)
+      max_total_cores - total_cores_used
     end
 
     def instances_available
-      max_total_instances - (total_instances_used || 0)
+      max_total_instances - total_instances_used
     end
 
     def ram_size_available
-      max_total_ram_size - (total_ram_size_used || 0)
+      max_total_ram_size - total_ram_size_used
+    end
+
+    # return nil if target OpenStack doesn't support volumes.get_quota
+    def volume_size_available
+      max_total_volume_size ? (max_total_volume_size - total_volume_size_used) : nil
+    end
+
+    # return nil if target OpenStack doesn't support volumes.get_quota
+    def volumes_available
+      max_total_volumes ? (max_total_volumes - total_volumes_used) : nil
+    end
+
+    def compute_servers
+      @compute_servers ||= fog_compute.servers
+    end
+
+    def volumes
+      @volumes ||= fog_volumes.volumes
+    end
+
+    def flavor_for_server(server)
+      flavor_id = server.flavor["id"]
+      @flavors ||= {}
+      @flavors[flavor_id] ||= fog_compute.flavors.get(flavor_id)
+    end
+
+    # {
+    #   "metadata_items"=>128,
+    #   "ram"=>204800,
+    #   "floating_ips"=>10,
+    #   "key_pairs"=>100,
+    #   "instances"=>40,
+    #   "security_group_rules"=>20,
+    #   "injected_files"=>5,
+    #   "cores"=>50,
+    #   "fixed_ips"=>-1,
+    #   "security_groups"=>10
+    # }
+    def compute_quotas
+      @compute_quotas ||= fog_compute.get_quota(current_tenant_id).data[:body]["quota_set"]
     end
 
-    def limits
-      @limits ||= fog_compute.get_limits
+    # {
+    #   "snapshots"=>10,
+    #   "gigabytes"=>15000,
+    #   "volumes"=>40,
+    # }
+    def volume_quotas
+      @volume_quotas ||= fog_volumes.get_quota(current_tenant_id).data[:body]["quota_set"]
+    rescue Fog::Compute::OpenStack::NotFound
+      @volume_quotas = {
+        "snapshots"=>nil,
+        "gigabytes"=>nil,
+        "volumes"=>nil,
+      }
     end
 
-    def absolute_limits
-      limits.data[:body]["limits"]["absolute"]
+    def current_tenant_id
+      fog_compute.current_tenant["id"]
     end
 
   end

data/lib/ohboshwillitfit/resource.rb

@@ -30,11 +30,13 @@ module OhBoshWillItFit
     end
 
     def self.resource_totals(resources)
-      totals = { "ram" => 0, "disk" => 0, "cpus" => 0 }
+      totals = { "ram" => 0, "disk" => 0, "cpus" => 0, "instances" => 0, "volumes" => 0 }
       resources.each do |resource|
         totals["ram"] += resource.total_ram if resource.total_ram
-        totals["disk"] += resource.total_disk if resource.total_disk
         totals["cpus"] += resource.total_cpus if resource.total_cpus
+        totals["disk"] += resource.total_disk if resource.total_disk
+        totals["instances"] += resource.size
+        totals["volumes"] += resource.size # one boot volume per VM
       end
       totals
     end

data/lib/ohboshwillitfit/version.rb

@@ -1,3 +1,3 @@
 module OhBoshWillItFit
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/assets/quotas_compute.json

@@ -0,0 +1,17 @@
+{
+  "quota_set": {
+    "injected_file_content_bytes": 10240,
+    "metadata_items": 128,
+    "ram": 204800,
+    "floating_ips": 10,
+    "key_pairs": 100,
+    "id": "b166027658ad441d8baee6ec8f37f853",
+    "instances": 40,
+    "security_group_rules": 20,
+    "injected_files": 5,
+    "cores": 50,
+    "fixed_ips": -1,
+    "injected_file_path_bytes": 255,
+    "security_groups": 10
+  }
+}

data/spec/assets/quotas_volumes.json

@@ -0,0 +1,44 @@
+{
+  "quota_set": {
+    "gigabytes_Volume-type--tempest-1301196564": -1,
+    "gigabytes_volume-type--tempest-420079685": -1,
+    "snapshots_standard": -1,
+    "volumes_ssd": -1,
+    "snapshots": 10,
+    "gigabytes_standard": -1,
+    "volumes_standard": -1,
+    "volumes_Volume-type--tempest-1474277584": -1,
+    "gigabytes_volume-type--tempest-342896740": -1,
+    "volumes_Volume-type--tempest-414041718": -1,
+    "id": "b166027658ad441d8baee6ec8f37f853",
+    "gigabytes_Volume-type--tempest-1474277584": -1,
+    "volumes_volume-type--tempest-1608932681": -1,
+    "snapshots_Volume-type--tempest-1474277584": -1,
+    "snapshots_ssd": -1,
+    "gigabytes_volume-type--tempest-1608932681": -1,
+    "snapshots_Volume-type--tempest-1406109096": -1,
+    "gigabytes_Volume-type--tempest-1406109096": -1,
+    "snapshots_volume-type--tempest-1608932681": -1,
+    "snapshots_Volume-type--tempest-1301196564": -1,
+    "volumes_volume-type--tempest-342896740": -1,
+    "gigabytes": 15000,
+    "gigabytes_Volume-type--tempest-636458420": -1,
+    "volumes_Volume-type--tempest-1301196564": -1,
+    "snapshots_Volume-type--tempest-636458420": -1,
+    "snapshots_Volume-type--tempest-1799390857": -1,
+    "volumes_Volume-type--tempest-1799390857": -1,
+    "gigabytes_Volume-type--tempest-1799390857": -1,
+    "volumes_volume-type--tempest-1488186639": -1,
+    "gigabytes_Volume-type--tempest-414041718": -1,
+    "volumes_Volume-type--tempest-1406109096": -1,
+    "snapshots_Volume-type--tempest-414041718": -1,
+    "snapshots_volume-type--tempest-1488186639": -1,
+    "snapshots_volume-type--tempest-342896740": -1,
+    "volumes_Volume-type--tempest-636458420": -1,
+    "volumes": 40,
+    "snapshots_volume-type--tempest-420079685": -1,
+    "gigabytes_ssd": -1,
+    "volumes_volume-type--tempest-420079685": -1,
+    "gigabytes_volume-type--tempest-1488186639": -1
+  }
+}

data/spec/limits_spec.rb

@@ -1,81 +1,103 @@
 require "json"
+require "fog/openstack/models/compute/flavor"
+require "fog/openstack/models/compute/flavors"
+require "fog/openstack/models/compute/server"
+require "fog/openstack/models/volume/volume"
 
 describe OhBoshWillItFit::Limits do
-  context "fog_limits - no_totals" do
-    let(:fog_limits) { JSON.parse(File.read(spec_asset("fog_limits_no_totals.json"))) }
-    let(:get_limits) { instance_double("Excon::Response", data: { body: fog_limits} ) }
-    let(:fog_compute) { instance_double("Fog::Compute::OpenStack::Real", get_limits: get_limits) }
-    subject { OhBoshWillItFit::Limits.new(fog_compute) }
-    it {
-      expect(subject.max_total_cores).to eq(1000)
+  context "quotas" do
+    let(:tenant) do { "id" => "tenant-id" } end
+    let(:servers) do
+      [
+        instance_double("Fog::Compute::OpenStack::Server", flavor: {"id" => "2"}),
+        instance_double("Fog::Compute::OpenStack::Server", flavor: {"id" => "3"})
+      ]
+    end
+
+    let(:small_flavor) { instance_double("Fog::Compute::OpenStack::Flavor", id: "2", ram: 2048, vcpus: 2) }
+    let(:medium_flavor) { instance_double("Fog::Compute::OpenStack::Flavor", id: "3", ram: 4096, vcpus: 1) }
+    let(:flavors) { instance_double("Fog::Compute::OpenStack::Flavors") }
+    before do
+      flavors.stub(:get).with("2").and_return(small_flavor)
+      flavors.stub(:get).with("3").and_return(medium_flavor)
+    end
+
+    let(:compute_quotas) { JSON.parse(File.read(spec_asset("quotas_compute.json"))) }
+    let(:compute_get_quota) { instance_double("Excon::Response", data: { body: compute_quotas } ) }
+    let(:fog_compute) {
+      instance_double("Fog::Compute::OpenStack::Real",
+        servers: servers,
+        flavors: flavors,
+        get_quota: compute_get_quota,
+        current_tenant: tenant)
     }
-    it {
-      expect(subject.max_total_instances).to eq(100)
+
+    let(:volumes) do
+      [
+        instance_double("Fog::Volume::OpenStack::Volume", size: 50),
+        instance_double("Fog::Volume::OpenStack::Volume", size: 50),
+      ]
+    end
+    let(:volumes_quotas) { JSON.parse(File.read(spec_asset("quotas_volumes.json"))) }
+    let(:volumes_get_quota) { instance_double("Excon::Response", data: { body: volumes_quotas} ) }
+    let(:fog_volumes) {
+      instance_double("Fog::Volume::OpenStack::Real",
+        volumes: volumes,
+        get_quota: volumes_get_quota)
     }
+
+    subject { OhBoshWillItFit::Limits.new(fog_compute, fog_volumes) }
+
     it {
-      expect(subject.max_total_ram_size).to eq(1966080)
+      expect(subject.max_total_cores).to eq(50)
     }
     it {
-      expect(subject.total_cores_used).to eq(nil)
+      expect(subject.max_total_instances).to eq(40)
     }
     it {
-      expect(subject.total_instances_used).to eq(nil)
+      expect(subject.max_total_ram_size).to eq(204800)
     }
     it {
-      expect(subject.total_ram_size_used).to eq(nil)
+      expect(subject.max_total_volume_size).to eq(15000)
     }
-
     it {
-      expect(subject.limits_available?).to be_false
+      expect(subject.max_total_volumes).to eq(40)
     }
 
     it {
-      expect(subject.cores_available).to eq(1000)
-    }
-    it {
-      expect(subject.instances_available).to eq(100)
-    }
-    it {
-      expect(subject.ram_size_available).to eq(1966080)
+      expect(subject.total_cores_used).to eq(3)
     }
-  end
-
-  context "fog_limits - totals" do
-    let(:fog_limits) { JSON.parse(File.read(spec_asset("fog_limits_totals.json"))) }
-    let(:get_limits) { instance_double("Excon::Response", data: { body: fog_limits} ) }
-    let(:fog_compute) { instance_double("Fog::Compute::OpenStack::Real", get_limits: get_limits) }
-    subject { OhBoshWillItFit::Limits.new(fog_compute) }
     it {
-      expect(subject.max_total_cores).to eq(50)
+      expect(subject.total_instances_used).to eq(2)
     }
     it {
-      expect(subject.max_total_instances).to eq(40)
+      expect(subject.total_ram_size_used).to eq(6144)
     }
     it {
-      expect(subject.max_total_ram_size).to eq(204800)
+      expect(subject.total_volume_size_used).to eq(100)
     }
     it {
-      expect(subject.total_cores_used).to eq(43)
+      expect(subject.total_volumes_used).to eq(2)
     }
+
     it {
-      expect(subject.total_instances_used).to eq(24)
+      expect(subject.volumes_limits_available?).to be_true
     }
+
     it {
-      expect(subject.total_ram_size_used).to eq(169472)
+      expect(subject.cores_available).to eq(50-3)
     }
-
     it {
-      expect(subject.limits_available?).to be_true
+      expect(subject.instances_available).to eq(40-2)
     }
-
     it {
-      expect(subject.cores_available).to eq(50-43)
+      expect(subject.ram_size_available).to eq(204800-6144)
     }
     it {
-      expect(subject.instances_available).to eq(40-24)
+      expect(subject.volume_size_available).to eq(15000-100)
     }
     it {
-      expect(subject.ram_size_available).to eq(204800-169472)
+      expect(subject.volumes_available).to eq(40-2)
     }
   end
 

data/spec/resource_spec.rb

@@ -27,7 +27,7 @@ describe OhBoshWillItFit::Resource do
       it { expect(subject.first.total_cpus).to eq(2) }
       it {
         totals = OhBoshWillItFit::Resource.resource_totals(subject)
-        expect(totals).to eq({"ram" => 4096, "disk" => 24, "cpus" => 2})
+        expect(totals).to eq({"ram" => 4096, "disk" => 24, "cpus" => 2, "volumes" => 2, "instances" => 2})
       }
     end
   end
@@ -51,7 +51,7 @@ describe OhBoshWillItFit::Resource do
       it { expect(subject.first.total_cpus).to eq(50 * 8) }
       it {
         totals = OhBoshWillItFit::Resource.resource_totals(subject)
-        expect(totals).to eq({"ram" => 50 * 16384, "disk" => 50 * 80, "cpus" => 50 * 8})
+        expect(totals).to eq({"ram" => 50 * 16384, "disk" => 50 * 80, "cpus" => 50 * 8, "volumes" => 50, "instances" => 50})
       }
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohboshwillitfit
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Dr Nic Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-20 00:00:00.000000000 Z
+date: 2014-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -78,7 +78,9 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ChangeLog.md
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -91,8 +93,8 @@ files:
 - ohboshwillitfit.gemspec
 - spec/assets/deployment-small.yml
 - spec/assets/deployment-wontfit.yml
-- spec/assets/fog_limits_no_totals.json
-- spec/assets/fog_limits_totals.json
+- spec/assets/quotas_compute.json
+- spec/assets/quotas_volumes.json
 - spec/fog_credentials_spec.rb
 - spec/limits_spec.rb
 - spec/resource_spec.rb
@@ -125,8 +127,8 @@ summary: Will this OpenStack BOSH deployment fit or not? If not, fail fast.
 test_files:
 - spec/assets/deployment-small.yml
 - spec/assets/deployment-wontfit.yml
-- spec/assets/fog_limits_no_totals.json
-- spec/assets/fog_limits_totals.json
+- spec/assets/quotas_compute.json
+- spec/assets/quotas_volumes.json
 - spec/fog_credentials_spec.rb
 - spec/limits_spec.rb
 - spec/resource_spec.rb

data/spec/assets/fog_limits_no_totals.json

@@ -1,68 +0,0 @@
-{
-  "limits": {
-    "rate": [
-      {
-        "regex": ".*",
-        "limit": [
-          {
-            "next-available": "2014-03-17T19:30:42Z",
-            "unit": "MINUTE",
-            "verb": "POST",
-            "remaining": 9,
-            "value": 10
-          },
-          {
-            "next-available": "2014-03-20T00:56:41Z",
-            "unit": "MINUTE",
-            "verb": "PUT",
-            "remaining": 10,
-            "value": 10
-          },
-          {
-            "next-available": "2014-03-18T03:47:22Z",
-            "unit": "MINUTE",
-            "verb": "DELETE",
-            "remaining": 99,
-            "value": 100
-          }
-        ],
-        "uri": "*"
-      },
-      {
-        "regex": "^/servers",
-        "limit": [
-          {
-            "next-available": "2014-03-20T00:56:41Z",
-            "unit": "DAY",
-            "verb": "POST",
-            "remaining": 50,
-            "value": 50
-          }
-        ],
-        "uri": "*/servers"
-      },
-      {
-        "regex": ".*changes-since.*",
-        "limit": [
-          {
-            "next-available": "2014-03-20T00:56:41Z",
-            "unit": "MINUTE",
-            "verb": "GET",
-            "remaining": 3,
-            "value": 3
-          }
-        ],
-        "uri": "*changes-since*"
-      }
-    ],
-    "absolute": {
-      "maxServerMeta": 128,
-      "maxPersonality": 5,
-      "maxImageMeta": 128,
-      "maxPersonalitySize": 10240,
-      "maxTotalCores": 1000,
-      "maxTotalInstances": 100,
-      "maxTotalRAMSize": 1966080
-    }
-  }
-}

data/spec/assets/fog_limits_totals.json

@@ -1,26 +0,0 @@
-{
-  "limits": {
-    "rate": [
-
-    ],
-    "absolute": {
-      "maxServerMeta": 128,
-      "maxPersonality": 5,
-      "maxImageMeta": 128,
-      "maxPersonalitySize": 10240,
-      "maxSecurityGroupRules": 20,
-      "maxTotalKeypairs": 100,
-      "maxSecurityGroups": 10,
-      "maxTotalCores": 50,
-      "maxTotalFloatingIps": 10,
-      "maxTotalInstances": 40,
-      "maxTotalRAMSize": 204800,
-
-      "totalSecurityGroupsUsed": 0,
-      "totalRAMUsed": 169472,
-      "totalInstancesUsed": 24,
-      "totalFloatingIpsUsed": 0,
-      "totalCoresUsed": 43
-    }
-  }
-}