bosh-cloudfoundry 0.7.0.alpha.5 → 0.7.0.alpha.6

data/ChangeLog.md

@@ -16,7 +16,7 @@ The rewrite introduces some new implementation/feature concepts:
 
 * using `bosh diff` (aka biff) to generate the deployment file
 * bundles all final releases into the project & distributed rubygem/plugin (no runtime dependency on cf-release git repository; only the public blobstore)
-* templates are versioned for the final releases
+* templates are versioned for each final release (unless new templates not required for new release)
 * different sizes of deployments (orders of magnitude), such as small, medium & large
 
 The latter means that new versions of this rubygem can be published that are backwards compatible with aging deployments of Cloud Foundry. There should not be any forced coupling of old `bosh-cloudfoundry` to old `cf-release` final releases.

data/bosh-cloudfoundry.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "bosh-cloudfoundry"
-  spec.version       = "0.7.0.alpha.5"
+  spec.version       = "0.7.0.alpha.6"
   spec.authors       = ["Dr Nic Williams"]
   spec.email         = ["drnicwilliams@gmail.com"]
   spec.description   = %q{Create & manage Cloud Foundry deployments}
@@ -20,5 +20,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rspec", "~> 2.13.0"
+  spec.add_development_dependency "rspec-fire"
   spec.add_development_dependency "fakeweb"
 end

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

@@ -22,9 +22,13 @@ module Bosh::Cli::Command
     desc "upload latest Cloud Foundry release to bosh"
     def prepare_cf
       auth_required
+      bosh_status # preload
 
       release_yml = Dir[File.join(bosh_release_dir, "releases", "*-#{latest_release_version}.yml")].first
       release_cmd(non_interactive: true).upload(release_yml)
+
+      stemcell_url = "http://bosh-jenkins-artifacts.s3.amazonaws.com/bosh-stemcell/#{bosh_cpi}/latest-bosh-stemcell-#{bosh_cpi}.tgz"
+      stemcell_cmd(non_interactive: true).upload(stemcell_url)
     end
 
     usage "create cf"
@@ -161,5 +165,22 @@ module Bosh::Cli::Command
     def bosh_cpi
       bosh_status["cpi"]
     end
+
+    # TODO move into PrepareBosh class
+    def release_cmd(options = {})
+      cmd ||= Bosh::Cli::Command::Release.new
+      options.each do |key, value|
+        cmd.add_option key.to_sym, value
+      end
+      cmd
+    end
+
+    def stemcell_cmd(options = {})
+      cmd ||= Bosh::Cli::Command::Stemcell.new
+      options.each do |key, value|
+        cmd.add_option key.to_sym, value
+      end
+      cmd
+    end
   end
 end

data/spec/assets/v133/aws/medium.yml

@@ -33,7 +33,7 @@ compilation:
 resource_pools:
   - name: small
     network: default
-    size: 3
+    size: 4
     stemcell:
       name: bosh-stemcell
       version: latest
@@ -42,7 +42,7 @@ resource_pools:
 
   - name: medium
     network: default
-    size: 2
+    size: 1
     stemcell:
       name: bosh-stemcell
       version: latest
@@ -99,7 +99,7 @@ jobs:
       - cloud_controller_ng
       - gorouter
     instances: 1
-    resource_pool: medium
+    resource_pool: small
     networks:
     - name: default
       default:

data/spec/plugin_spec.rb

@@ -1,5 +1,4 @@
 require "bosh/cli/commands/cf"
-require "fakeweb"
 
 describe Bosh::Cli::Command::CloudFoundry do
   include FileUtils
@@ -12,7 +11,6 @@ describe Bosh::Cli::Command::CloudFoundry do
   end
 
   before { setup_home_dir }
-  before { FakeWeb.allow_net_connect = false }
 
   it "shows help" do
     subject.cf_help
@@ -23,15 +21,24 @@ describe Bosh::Cli::Command::CloudFoundry do
       command.add_option(:config, home_file(".bosh_config"))
       command.add_option(:non_interactive, true)
       command.should_receive(:auth_required)
+
+      director = instance_double("Bosh::Cli::Director")
+      director.should_receive(:get_status).and_return({"uuid" => "UUID", "cpi" => "aws"})
+      command.stub(:director_client).and_return(director)
     end
 
     context "director does not already have release" do
       it "upload release" do
         release_yml = File.expand_path("../../bosh_release/releases/cf-release-133.yml", __FILE__)
-        release_cmd = mock("release_cmd")
+        release_cmd = instance_double("Bosh::Cli::Command::Release")
         release_cmd.should_receive(:upload).with(release_yml)
         command.stub(:release_cmd).and_return(release_cmd)
 
+        aws_full_stemcell_url = "http://bosh-jenkins-artifacts.s3.amazonaws.com/bosh-stemcell/aws/latest-bosh-stemcell-aws.tgz"
+        stemcell_cmd = instance_double("Bosh::Cli::Command::Stemcell")
+        stemcell_cmd.should_receive(:upload).with(aws_full_stemcell_url)
+        command.stub(:stemcell_cmd).and_return(stemcell_cmd)
+
         command.prepare_cf
       end
     end
@@ -42,16 +49,23 @@ describe Bosh::Cli::Command::CloudFoundry do
   end
 
   context "create cf" do
-    it "requires --ip 1.2.3.4" do
-      command.add_option(:dns, "mycloud.com")
-      command.add_option(:size, "xlarge")
-      expect { command.create_cf }.to raise_error(Bosh::Cli::CliError)
-    end
+    context "validation failures" do
+      before do
+        director = instance_double("Bosh::Cli::Director")
+        director.stub(:get_status).and_return({"uuid" => "UUID", "cpi" => "aws"})
+        command.stub(:director_client).and_return(director)
+      end
+      it "requires --ip 1.2.3.4" do
+        command.add_option(:dns, "mycloud.com")
+        command.add_option(:size, "xlarge")
+        expect { command.create_cf }.to raise_error(Bosh::Cli::CliError)
+      end
 
-    it "requires --dns" do
-      command.add_option(:ip, ["1.2.3.4"])
-      command.add_option(:size, "xlarge")
-      expect { command.create_cf }.to raise_error(Bosh::Cli::CliError)
+      it "requires --dns" do
+        command.add_option(:ip, ["1.2.3.4"])
+        command.add_option(:size, "xlarge")
+        expect { command.create_cf }.to raise_error(Bosh::Cli::CliError)
+      end
     end
 
     context "with requirements" do
@@ -65,7 +79,7 @@ describe Bosh::Cli::Command::CloudFoundry do
 
         command.should_receive(:auth_required)
 
-        director = mock("director_client")
+        director = instance_double("Bosh::Cli::Director")
         director.should_receive(:get_status).and_return({"uuid" => "UUID", "cpi" => "aws"})
         command.stub(:director_client).and_return(director)
 

data/spec/spec_helper.rb

@@ -9,6 +9,8 @@ Bundler.setup(:default, :test)
 $:.unshift(File.expand_path("../../lib", __FILE__))
 
 require "rspec/core"
+require 'rspec/fire'
+
 require "tmpdir"
 
 # for the #sh helper
@@ -20,6 +22,13 @@ require "cli"
 
 require "bosh/cloudfoundry"
 
+require "fakeweb"
+FakeWeb.allow_net_connect = false
+
+RSpec.configure do |config|
+  config.include(RSpec::Fire)
+end
+
 # load all files in spec/support/* (but not lower down)
 Dir[File.dirname(__FILE__) + '/support/*'].each do |path|
   require path unless File.directory?(path)

data/templates/v132/aws/medium/deployment_file.yml.erb

@@ -211,7 +211,7 @@ properties:
     use_datadog: false
 
   nfs_server:
-    address: 0.data.default.<%= name %>.microbosh
+    address: 0.core.default.<%= name %>.microbosh
     #network: "*.<%= name %>.microbosh"
     #idmapd_domain: <%= dns %>
 
@@ -220,7 +220,7 @@ properties:
 
   databases: &databases
     db_scheme: postgres
-    address: 0.data.default.<%= name %>.microbosh
+    address: 0.core.default.<%= name %>.microbosh
     port: 5524
     roles:
       - tag: admin
@@ -239,7 +239,7 @@ properties:
 
   ccdb: &ccdb
     db_scheme: postgres
-    address: 0.data.default.<%= name %>.microbosh
+    address: 0.core.default.<%= name %>.microbosh
     port: 5524
     roles:
       - tag: admin
@@ -254,7 +254,7 @@ properties:
 
   uaadb: 
     db_scheme: postgresql
-    address: 0.data.default.<%= name %>.microbosh
+    address: 0.core.default.<%= name %>.microbosh
     port: 5524
     roles:
       - tag: admin

data/templates/v133/aws/medium/deployment_file.yml.erb

@@ -68,7 +68,7 @@ compilation:
 resource_pools:
   - name: small
     network: default
-    size: 3
+    size: 4
     stemcell:
       name: bosh-stemcell
       version: latest
@@ -77,7 +77,7 @@ resource_pools:
 
   - name: medium
     network: default
-    size: 2
+    size: 1
     stemcell:
       name: bosh-stemcell
       version: latest
@@ -134,7 +134,7 @@ jobs:
       - cloud_controller_ng
       - gorouter
     instances: 1
-    resource_pool: medium
+    resource_pool: small
     networks:
     - name: default
       default:

data/templates/v133/openstack/medium/deployment_file.yml.erb

@@ -68,7 +68,7 @@ compilation:
 resource_pools:
   - name: small
     network: default
-    size: 2
+    size: 4
     stemcell:
       name: bosh-stemcell
       version: latest
@@ -77,7 +77,7 @@ resource_pools:
 
   - name: medium
     network: default
-    size: 2
+    size: 1
     stemcell:
       name: bosh-stemcell
       version: latest
@@ -85,26 +85,37 @@ resource_pools:
       instance_type: m1.medium
 
 jobs:
+  - name: data
+    release: cf-release
+    template:
+      - postgres
+      - debian_nfs_server
+    instances: 1
+    resource_pool: small
+    persistent_disk: <%= persistent_disk %>
+    networks:
+    - name: default
+      default:
+      - dns
+      - gateway
+    properties:
+      db: databases
+
   - name: core
     release: cf-release
     template:
       - syslog_aggregator
       - nats
-      - postgres
       - health_manager_next
       - collector
-      - debian_nfs_server
       - login
     instances: 1
     resource_pool: medium
-    persistent_disk: <%= persistent_disk %>
     networks:
     - name: default
       default:
       - dns
       - gateway
-    properties:
-      db: databases
 
   # need a separate job for uaa due to https://github.com/cloudfoundry/cf-release/issues/104
   - name: uaa
@@ -123,7 +134,7 @@ jobs:
       - cloud_controller_ng
       - gorouter
     instances: 1
-    resource_pool: medium
+    resource_pool: small
     networks:
     - name: default
       default:
@@ -211,7 +222,7 @@ properties:
     use_datadog: false
 
   nfs_server:
-    address: 0.core.default.<%= name %>.microbosh
+    address: 0.data.default.<%= name %>.microbosh
     #network: "*.<%= name %>.microbosh"
     #idmapd_domain: <%= dns %>
 
@@ -220,7 +231,7 @@ properties:
 
   databases: &databases
     db_scheme: postgres
-    address: 0.core.default.<%= name %>.microbosh
+    address: 0.data.default.<%= name %>.microbosh
     port: 5524
     roles:
       - tag: admin
@@ -239,7 +250,7 @@ properties:
 
   ccdb: &ccdb
     db_scheme: postgres
-    address: 0.core.default.<%= name %>.microbosh
+    address: 0.data.default.<%= name %>.microbosh
     port: 5524
     roles:
       - tag: admin
@@ -254,7 +265,7 @@ properties:
 
   uaadb: 
     db_scheme: postgresql
-    address: 0.core.default.<%= name %>.microbosh
+    address: 0.data.default.<%= name %>.microbosh
     port: 5524
     roles:
       - tag: admin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-cloudfoundry
 version: !ruby/object:Gem::Version
-  version: 0.7.0.alpha.5
+  version: 0.7.0.alpha.6
   prerelease: 6
 platform: ruby
 authors:
@@ -75,6 +75,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.13.0
+- !ruby/object:Gem::Dependency
+  name: rspec-fire
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
@@ -456,7 +472,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4043648917353129652
+      hash: 4430002613479451948
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: