bosh-bootstrap 0.10.2 → 0.11.0

data/lib/bosh-bootstrap/microbosh_providers/openstack.rb

@@ -0,0 +1,61 @@
+require "bosh-bootstrap/microbosh_providers/base"
+
+module Bosh::Bootstrap::MicroboshProviders
+  class OpenStack < Base
+    def to_hash
+      super.merge({
+       "network"=>network_configuration,
+       "resources"=>
+        {"persistent_disk"=>persistent_disk,
+         "cloud_properties"=>resources_cloud_properties},
+       "cloud"=>
+        {"plugin"=>"openstack",
+         "properties"=>
+          {"openstack"=>cloud_properties}},
+      })
+    end
+
+    def persistent_disk
+      settings.bosh.persistent_disk
+    end
+
+    def resources_cloud_properties
+      {"instance_type"=>"m1.medium"}
+    end
+
+    # network:
+    #   name: default
+    #   type: dynamic
+    #   label: private
+    #   ip: 1.2.3.4
+    def network_configuration
+      {"name"=>"default",
+        "type"=>"dynamic",
+        "label"=>"private",
+        "ip"=>public_ip
+      }
+    end
+
+    def cloud_properties
+      {
+        "auth_url"=>settings.provider.credentials.openstack_auth_url,
+        "username"=>settings.provider.credentials.openstack_username,
+        "api_key"=> settings.provider.credentials.openstack_api_key,
+        "tenant"=>  settings.provider.credentials.openstack_tenant,
+        "default_security_groups"=>security_groups,
+        "default_key_name"=>microbosh_name,
+        "private_key"=>private_key_path}
+    end
+
+    def security_groups
+      ["ssh",
+       "bosh_agent_http",
+       "bosh_nats_server",
+       "bosh_blobstore",
+       "bosh_director",
+       "bosh_registry"]
+    end
+
+  end
+end
+Bosh::Bootstrap::MicroboshProviders.register_provider("openstack", Bosh::Bootstrap::MicroboshProviders::OpenStack)

data/lib/bosh-bootstrap/microbosh_providers/vsphere.rb

@@ -0,0 +1,78 @@
+require "bosh-bootstrap/microbosh_providers/base"
+
+module Bosh::Bootstrap::MicroboshProviders
+  class VSphere < Base
+    def to_hash
+      super.merge({
+        "network" => network_configuration,
+        "cloud"=>
+         {"plugin"=>"vsphere",
+          "properties"=>{
+            "agent"=>{"ntp"=>ntps},
+            "vcenters"=>[vcenter_configuration]
+          }}})
+    end
+
+    # network:
+    #   ip: 172.23.194.100
+    #   netmask: 255.255.254.0
+    #   gateway: 172.23.194.1
+    #   dns:
+    #   - 172.22.22.153
+    #   - 172.22.22.154
+    #   cloud_properties:
+    #     name: VLAN2194
+    def network_configuration
+      dns = settings.provider.network.dns
+      dns = dns.split(",") if dns.is_a?(String)
+      {
+        "ip"=>public_ip,
+        "netmask"=>settings.provider.network.netmask,
+        "gateway"=>settings.provider.network.gateway,
+        "dns"=>dns,
+        "cloud_properties"=>{
+          "name"=>settings.provider.network.name
+        }
+      }
+    end
+
+    def ntps
+      settings.provider.npt
+    end
+
+    # vcenters:
+    # - host: HOST
+    #   user: dev\cloudfoundry-auth
+    #   password: TempP@ss
+    #   datacenters:
+    #     - name: LAS01
+    #       vm_folder: BOSH_VMs
+    #       template_folder: BOSH_Templates
+    #       disk_path: BOSH_Deployer
+    #       datastore_pattern: las01-.*
+    #       persistent_datastore_pattern: las01-.*
+    #       allow_mixed_datastores: true
+    #       clusters:
+    #       - CLUSTER01
+    def vcenter_configuration
+      clusters = settings.provider.datacenter.clusters
+      clusters = clusters.split(",") if clusters.is_a?(String)
+      {
+        "host"=>settings.provider.credentials.host,
+        "user"=>settings.provider.credentials.user,
+        "password"=>settings.provider.credentials.password,
+        "datacenters"=>[{
+          "name"=>settings.provider.datacenter.name,
+          "vm_folder"=>settings.provider.datacenter.vm_folder,
+          "template_folder"=>settings.provider.datacenter.template_folder,
+          "disk_path"=>settings.provider.datacenter.disk_path,
+          "datastore_pattern"=>settings.provider.datacenter.datastore_pattern,
+          "persistent_datastore_pattern"=>settings.provider.datacenter.persistent_datastore_pattern,
+          "allow_mixed_datastores"=>settings.provider.datacenter.allow_mixed_datastores,
+          "clusters"=>clusters
+        }]
+      }
+    end
+  end
+end
+Bosh::Bootstrap::MicroboshProviders.register_provider("vsphere", Bosh::Bootstrap::MicroboshProviders::VSphere)

data/lib/bosh-bootstrap/microbosh_providers.rb

@@ -0,0 +1,11 @@
+module Bosh::Bootstrap::MicroboshProviders
+  extend self
+  def register_provider(provider_name, provider_klass)
+    @providers ||= {}
+    @providers[provider_name] = provider_klass
+  end
+
+  def provider_class(provider_name)
+    @providers[provider_name]
+  end
+end

data/lib/bosh-bootstrap/network.rb

@@ -0,0 +1,33 @@
+require "bosh-bootstrap/network_providers"
+require "bosh-bootstrap/network_providers/dummy"
+
+class Bosh::Bootstrap::Network
+
+  attr_reader :provider_name
+  attr_reader :provider_client
+
+  def initialize(provider_name, provider_client)
+    @provider_name = provider_name
+    @provider_client = provider_client
+  end
+
+  def deploy
+    network_provider.perform
+  end
+
+  # Attempt to load and instantiate a NetworkProviders class
+  # Else return NetworkProviders::Dummy which does nothing
+  def network_provider
+    @network_provider ||= begin
+      begin
+        require "bosh-bootstrap/network_providers/#{provider_name}"
+        klass = Bosh::Bootstrap::NetworkProviders.provider_class(provider_name)
+      rescue LoadError
+        klass = Bosh::Bootstrap::NetworkProviders.provider_class("dummy")
+      end
+      klass.new(provider_client)
+    end
+  end
+
+end
+

data/lib/bosh-bootstrap/network_providers/aws.rb

@@ -0,0 +1,28 @@
+module Bosh::Bootstrap::NetworkProviders
+  class AWS
+    attr_reader :provider_client
+
+    def initialize(provider_client)
+      @provider_client = provider_client
+    end
+
+    def perform
+      security_groups.each do |name, ports|
+        provider_client.create_security_group(name.to_s, name.to_s, ports: ports)
+      end
+    end
+
+    protected
+    def security_groups
+      {
+        ssh: 22,
+        bosh_nats_server: 4222,
+        bosh_agent_http: 6868,
+        bosh_blobstore: 25250,
+        bosh_director: 25555,
+        bosh_registry: 25777
+      }
+    end
+  end
+end
+Bosh::Bootstrap::NetworkProviders.register_provider("aws", Bosh::Bootstrap::NetworkProviders::AWS)

data/lib/bosh-bootstrap/network_providers/dummy.rb

@@ -0,0 +1,10 @@
+module Bosh::Bootstrap::NetworkProviders
+  class Dummy
+    def initialize(provider_client)
+    end
+
+    def perform
+    end
+  end
+end
+Bosh::Bootstrap::NetworkProviders.register_provider("dummy", Bosh::Bootstrap::NetworkProviders::Dummy)

data/lib/bosh-bootstrap/network_providers/openstack.rb

@@ -0,0 +1,28 @@
+module Bosh::Bootstrap::NetworkProviders
+  class OpenStack
+    attr_reader :provider_client
+
+    def initialize(provider_client)
+      @provider_client = provider_client
+    end
+
+    def perform
+      security_groups.each do |name, ports|
+        provider_client.create_security_group(name.to_s, name.to_s, ports)
+      end
+    end
+
+    protected
+    def security_groups
+      {
+        ssh: 22,
+        bosh_nats_server: 4222,
+        bosh_agent_http: 6868,
+        bosh_blobstore: 25250,
+        bosh_director: 25555,
+        bosh_registry: 25777
+      }
+    end
+  end
+end
+Bosh::Bootstrap::NetworkProviders.register_provider("openstack", Bosh::Bootstrap::NetworkProviders::OpenStack)

data/lib/bosh-bootstrap/network_providers.rb

@@ -0,0 +1,11 @@
+module Bosh::Bootstrap::NetworkProviders
+  extend self
+  def register_provider(provider_name, provider_klass)
+    @providers ||= {}
+    @providers[provider_name] = provider_klass
+  end
+
+  def provider_class(provider_name)
+    @providers[provider_name]
+  end
+end

data/lib/bosh-bootstrap/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Bootstrap
-    VERSION = "0.10.2"
+    VERSION = "0.11.0"
   end
 end

data/lib/bosh-bootstrap.rb

@@ -8,7 +8,6 @@ module Bosh
 end
 
 require "bosh-bootstrap/version"
-require "bosh-bootstrap/commander"
-require "bosh-bootstrap/stages"
-
-require "bosh/providers"
+require "bosh-bootstrap/network"
+require "bosh-bootstrap/key_pair"
+require "bosh-bootstrap/microbosh"

data/spec/assets/microbosh_yml/micro_bosh.aws_ec2.yml

@@ -0,0 +1,37 @@
+--- 
+name: test-bosh
+logging: 
+  level: DEBUG
+network: 
+  type: dynamic
+  vip: 1.2.3.4
+resources: 
+  persistent_disk: 16384
+  cloud_properties: 
+    instance_type: m1.medium
+cloud: 
+  plugin: aws
+  properties: 
+    aws: 
+      access_key_id: ACCESS
+      secret_access_key: SECRET
+      region: us-west-2
+      ec2_endpoint: ec2.us-west-2.amazonaws.com
+      default_security_groups: 
+      - ssh
+      - bosh_agent_http
+      - bosh_nats_server
+      - bosh_blobstore
+      - bosh_director
+      - bosh_registry
+      default_key_name: test-bosh
+      ec2_private_key: ~/.microbosh/ssh/test-bosh
+apply_spec: 
+  agent: 
+    blobstore: 
+      address: 1.2.3.4
+    nats: 
+      address: 1.2.3.4
+  properties: 
+    aws_registry: 
+      address: 1.2.3.4

data/spec/assets/microbosh_yml/micro_bosh.aws_vpc.yml

@@ -0,0 +1,39 @@
+--- 
+name: test-bosh
+logging: 
+  level: DEBUG
+network: 
+  type: dynamic
+  vip: 1.2.3.4
+  cloud_properties: 
+    subnet: $SUBNET_ID$
+resources: 
+  persistent_disk: 16384
+  cloud_properties: 
+    instance_type: m1.medium
+cloud: 
+  plugin: aws
+  properties: 
+    aws: 
+      access_key_id: ACCESS
+      secret_access_key: SECRET
+      region: us-west-2
+      ec2_endpoint: ec2.us-west-2.amazonaws.com
+      default_security_groups: 
+      - ssh
+      - bosh_agent_http
+      - bosh_nats_server
+      - bosh_blobstore
+      - bosh_director
+      - bosh_registry
+      default_key_name: test-bosh
+      ec2_private_key: ~/.microbosh/ssh/test-bosh
+apply_spec: 
+  agent: 
+    blobstore: 
+      address: 1.2.3.4
+    nats: 
+      address: 1.2.3.4
+  properties: 
+    aws_registry: 
+      address: 1.2.3.4

data/spec/assets/microbosh_yml/micro_bosh.openstack.yml

@@ -0,0 +1,30 @@
+--- 
+name: test-bosh
+logging: 
+  level: DEBUG
+network: 
+  name: default
+  type: dynamic
+  label: private
+  ip: 1.2.3.4
+resources: 
+  persistent_disk: 4096
+  cloud_properties: 
+    instance_type: m1.medium
+cloud: 
+  plugin: openstack
+  properties: 
+    openstack: 
+      auth_url: http://10.0.0.2:5000/v2.0/tokens
+      username: USER
+      api_key: PASSWORD
+      tenant: TENANT
+      default_security_groups: 
+      - ssh
+      - bosh_agent_http
+      - bosh_nats_server
+      - bosh_blobstore
+      - bosh_director
+      - bosh_registry
+      default_key_name: test-bosh
+      private_key: ~/.microbosh/ssh/test-bosh

data/spec/assets/microbosh_yml/micro_bosh.vsphere.yml

@@ -0,0 +1,34 @@
+--- 
+name: test-bosh
+logging: 
+  level: DEBUG
+network: 
+  ip: 172.23.194.100
+  netmask: 255.255.254.0
+  gateway: 172.23.194.1
+  dns: 
+  - 172.22.22.153
+  - 172.22.22.154
+  cloud_properties: 
+    name: VLAN2194
+cloud: 
+  plugin: vsphere
+  properties: 
+    agent: 
+      ntp: 
+      - ntp01.las01.emcatmos.com
+      - ntp02.las01.emcatmos.com
+    vcenters: 
+    - host: HOST
+      user: user
+      password: TempP@ss
+      datacenters: 
+      - name: LAS01
+        vm_folder: BOSH_VMs
+        template_folder: BOSH_Templates
+        disk_path: BOSH_Deployer
+        datastore_pattern: las01-.*
+        persistent_datastore_pattern: las01-.*
+        allow_mixed_datastores: true
+        clusters: 
+        - CLUSTER01

data/spec/integration/aws/aws_ec2_basic_spec.rb

@@ -0,0 +1,39 @@
+require File.expand_path("../aws_helpers", __FILE__)
+describe "AWS deployment using gems and publish stemcells" do
+  include Bosh::Bootstrap::Cli::Helpers::Settings
+  include AwsHelpers
+
+  let(:cli) do
+    cli = Bosh::Cli::Command::Bootstrap.new(nil)
+    cli.add_option(:non_interactive, true)
+    cli.add_option(:cache_dir, @cache_dir)
+    cli
+  end
+
+  # after { destroy_test_constructs }
+
+  it "creates an EC2 inception/microbosh with the associated resources" do
+    # TODO remove this when finished initial development
+    require "fog"
+    Fog.mock!
+
+    setup_home_dir
+    create_manifest
+    cli.deploy
+
+    # creates ~/.microbosh/settings.yml
+    # creates ~/.microbosh/Gemfile
+    # creates ~/.microbosh/ssh/microbosh-test-bosh
+    # creates ~/.microbosh/deployments/test-bosh/micro_bosh.yml
+
+    # creates a server with a specific tagged name
+    # server has a 16G volume attached (plus a root volume)
+    # IP was provisioned
+    # IP was attached to server
+  end
+
+  it "EC2 microbosh from latest AMI"
+  it "EC2 microbosh from latest stemcell"
+  it "EC2 microbosh from source"
+
+end

data/spec/integration/aws/aws_helpers.rb

@@ -1,78 +1,25 @@
 module AwsHelpers
-  def fog_credentials
-    @fog_credentials ||= begin
-      access_key = ENV['AWS_ACCESS_KEY_ID']
-      secret_key = ENV["AWS_SECRET_ACCESS_KEY"]
-      unless access_key && secret_key
-        raise "Please provided $AWS_ACCESS_KEY_ID and $AWS_SECRET_ACCESS_KEY"
-      end
-      credentials = {
-        :provider                 => 'AWS',
-        :aws_access_key_id        => access_key,
-        :aws_secret_access_key    => secret_key
-      }
-    end
-  end
-
   def keep_after_test?
     ENV['KEEP_AFTER_TEST']
   end
 
-  def fog
-    @fog ||= connection = Fog::Compute.new(fog_credentials.merge(:region => aws_region))
-  end
-
-  def cmd
-    @cmd ||= Bosh::Bootstrap::Cli.new
-  end
-
-  def provider
-    cmd.provider
-  end
-
-  # used by +SettingsSetter+ to access the settings
-  def settings
-    cmd.settings
-  end
-
-  def prepare_aws(spec_name, aws_region)
-    setup_home_dir
-    @cmd = nil
-    @fog = nil
-    @bosh_name = "aws-#{spec_name}-#{aws_region}-#{unique_number}"
-    create_manifest
-    destroy_test_constructs(bosh_name)
-  end
-
   def unique_number
     ENV['UNIQUE_NUMBER'] || Random.rand(100000)
   end
 
   def create_manifest(options = {})
-    setting "bosh_provider", "aws"
-    setting "region_code", aws_region
-    setting "bosh_name", bosh_name
-    setting "inception.create_new", true
-    setting "bosh_username", "testuser"
-    setting "bosh_password", "testpass"
-    setting "fog_credentials", fog_credentials.stringify_keys
-    setting "bosh.salted_password", "pepper"
-    setting "bosh.persistent_disk", 16384
-    setting "git.name", "Dr Nic Williams"
-    setting "git.email", "drnicwilliams@gmail.com"
+    setting "provider.name", "aws"
+    setting "provider.region", "us-east-1"
+    setting "provider.credentials.aws_access_key_id", ENV['AWS_ACCESS_KEY_ID']
+    setting "provider.credentials.aws_secret_access_key", ENV['AWS_SECRET_ACCESS_KEY']
     options.each { |key, value| setting(key, value) }
-    cmd.save_settings!
+    unless settings.exists?("provider.credentials.aws_secret_access_key")
+      raise "Please provided $AWS_ACCESS_KEY_ID and $AWS_SECRET_ACCESS_KEY"
+    end
   end
 
-  def destroy_test_constructs(bosh_name)
+  def destroy_test_constructs
     puts "Destroying everything created by previous tests..."
-    # destroy servers using inception-vm SG
-    provider.delete_security_group_and_servers("#{bosh_name}-inception-vm")
-    provider.delete_security_group_and_servers(bosh_name)
-
-    # TODO delete "inception" key pair? Why isn't it named for the bosh/inception VM?
-    provider.delete_key_pair(bosh_name)
-
     provider.cleanup_unused_ip_addresses
   end
 

data/spec/spec_helper.rb

@@ -9,14 +9,19 @@ Bundler.setup(:default, :test)
 $:.unshift(File.expand_path("../../lib", __FILE__))
 
 require "rspec/core"
-require "bosh/providers"
-require "bosh-bootstrap"
-require "bosh-bootstrap/cli"
+require "cli" # bosh CLI
+require "bosh/cli/commands/bootstrap" # "bosh bootstrap COMMAND" commands added to bosh CLI
+require "bosh-bootstrap/cli/helpers"
 
 # for the #sh helper
 require "rake"
 require "rake/file_utils"
 
+# load all files in spec/support/* (but not lower down)
+Dir[File.dirname(__FILE__) + '/support/*'].each do |path|
+  require path unless File.directory?(path)
+end
+
 def spec_asset(filename)
   File.expand_path("../assets/#{filename}", __FILE__)
 end

data/spec/support/capture_stdout.rb

@@ -0,0 +1,18 @@
+module StdoutCapture
+  # Captures stdout within the block
+  # Usage:
+  #
+  #   out = capture_stdout do
+  #     puts "this will not be shown"
+  #   end
+  #   out.should == "this will not be shown"
+  def capture_stdout(&block)
+    out = StringIO.new
+    $stdout = out
+    yield
+    out.rewind
+    return out.read
+  ensure
+    $stdout = STDOUT
+  end
+end

data/spec/unit/cli/bootstrap_spec.rb

@@ -0,0 +1,41 @@
+# Copyright (c) 2012-2013 Stark & Wayne, LLC
+
+require "bosh-bootstrap/cli/commands/deploy"
+require "bosh-bootstrap/cli/commands/delete"
+require "bosh-bootstrap/cli/commands/ssh"
+describe Bosh::Cli::Command::Bootstrap do
+  include FileUtils
+
+  before do
+    FileUtils.mkdir_p(@stemcells_dir = File.join(Dir.mktmpdir, "stemcells"))
+    FileUtils.mkdir_p(@cache_dir = File.join(Dir.mktmpdir, "cache"))
+  end
+
+  let(:cli) do
+    cli = Bosh::Cli::Command::Bootstrap.new(nil)
+    cli.add_option(:non_interactive, true)
+    cli.add_option(:cache_dir, @cache_dir)
+    cli
+  end
+
+  it "runs deploy command" do
+    cmd = double(Bosh::Bootstrap::Cli::Commands::Deploy)
+    cmd.should_receive(:perform)
+    Bosh::Bootstrap::Cli::Commands::Deploy.stub(:new).and_return(cmd)
+    cli.deploy
+  end
+
+  it "runs delete command" do
+    cmd = double(Bosh::Bootstrap::Cli::Commands::Delete)
+    cmd.should_receive(:perform)
+    Bosh::Bootstrap::Cli::Commands::Delete.stub(:new).and_return(cmd)
+    cli.delete
+  end
+
+  it "runs ssh command" do
+    cmd = double(Bosh::Bootstrap::Cli::Commands::SSH)
+    cmd.should_receive(:perform)
+    Bosh::Bootstrap::Cli::Commands::SSH.stub(:new).and_return(cmd)
+    cli.ssh
+  end
+end

data/spec/unit/commands/delete_spec.rb

@@ -0,0 +1,20 @@
+# Copyright (c) 2012-2013 Stark & Wayne, LLC
+
+require "bosh-bootstrap/cli/commands/delete"
+
+describe Bosh::Bootstrap::Cli::Commands::Delete do
+  include StdoutCapture
+  include Bosh::Bootstrap::Cli::Helpers
+
+  let(:settings_dir) { File.expand_path("~/.microbosh") }
+
+  subject { Bosh::Bootstrap::Cli::Commands::Delete.new }
+
+  it "deletes microbosh VM" do
+    setting "bosh.name", "test-bosh"
+    mkdir_p(File.join(settings_dir, "deployments"))
+    subject.should_receive(:sh).with("bundle exec bosh -n micro deployment test-bosh")
+    subject.should_receive(:sh).with("bundle exec bosh -n micro delete")
+    subject.perform
+  end
+end