bosh-bootstrap 0.12.0 → 0.13.0

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

@@ -0,0 +1,43 @@
+---
+name: test-bosh
+logging:
+  level: DEBUG
+network:
+  type: manual
+  ip: 10.10.10.3
+  cloud_properties:
+    net_id: 7b8788eb-b49e-4424-9065-75a6b07094ea
+resources:
+  persistent_disk: 16384
+  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
+      region: REGION
+      default_security_groups:
+      - ssh
+      - dns_server
+      - bosh
+      default_key_name: test-bosh
+      private_key: ~/.microbosh/ssh/test-bosh
+      boot_from_volume: false
+apply_spec:
+  agent:
+    blobstore:
+      address: 10.10.10.3
+    nats:
+      address: 10.10.10.3
+  properties:
+    director:
+      max_threads: 3
+    hm:
+      resurrector_enabled: true
+    ntp:
+      - 0.north-america.pool.ntp.org
+      - 1.north-america.pool.ntp.org

data/spec/assets/microbosh_yml/{micro_bosh.openstack.yml → micro_bosh.openstack.neutron_vip.yml}

@@ -1,33 +1,32 @@
---- 
+---
 name: test-bosh
-logging: 
+logging:
   level: DEBUG
 network:
   type: dynamic
   vip: 1.2.3.4
-resources: 
+  cloud_properties:
+    net_id: 7b8788eb-b49e-4424-9065-75a6b07094ea
+resources:
   persistent_disk: 16384
-  cloud_properties: 
+  cloud_properties:
     instance_type: m1.medium
-cloud: 
+cloud:
   plugin: openstack
-  properties: 
-    openstack: 
+  properties:
+    openstack:
       auth_url: http://10.0.0.2:5000/v2.0/tokens
       username: USER
       api_key: PASSWORD
       tenant: TENANT
       region: REGION
-      default_security_groups: 
+      default_security_groups:
       - ssh
       - dns_server
-      - bosh_agent_https
-      - bosh_nats_server
-      - bosh_blobstore
-      - bosh_director
-      - bosh_registry
+      - bosh
       default_key_name: test-bosh
       private_key: ~/.microbosh/ssh/test-bosh
+      boot_from_volume: false
 apply_spec:
   agent:
     blobstore:

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

@@ -0,0 +1,41 @@
+---
+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: openstack
+  properties:
+    openstack:
+      auth_url: http://10.0.0.2:5000/v2.0/tokens
+      username: USER
+      api_key: PASSWORD
+      tenant: TENANT
+      region: REGION
+      default_security_groups:
+      - ssh
+      - dns_server
+      - bosh
+      default_key_name: test-bosh
+      private_key: ~/.microbosh/ssh/test-bosh
+      boot_from_volume: false
+apply_spec:
+  agent:
+    blobstore:
+      address: 1.2.3.4
+    nats:
+      address: 1.2.3.4
+  properties:
+    director:
+      max_threads: 3
+    hm:
+      resurrector_enabled: true
+    ntp:
+      - 0.north-america.pool.ntp.org
+      - 1.north-america.pool.ntp.org

data/spec/spec_helper.rb

@@ -29,13 +29,13 @@ end
 def files_match(filename, expected_filename)
   file = File.read(filename)
   expected_file = File.read(expected_filename)
-  file.should == expected_file
+  expect(file).to eq(expected_file)
 end
 
 def yaml_files_match(filename, expected_filename)
   yaml = YAML.load_file(filename)
   expected_yaml = YAML.load_file(expected_filename)
-  yaml.should == expected_yaml
+  expect(yaml).to eq(expected_yaml)
 end
 
 def setup_home_dir
@@ -56,7 +56,7 @@ RSpec.configure do |c|
     setup_home_dir
   end
 
-  c.color_enabled = true
+  c.color = true
 end
 
 def get_tmp_file_path(content)

data/spec/support/rspec-fire.rb

@@ -0,0 +1,9 @@
+require 'rspec/fire'
+
+RSpec.configure do |config|
+  config.include(RSpec::Fire)
+end
+
+RSpec::Fire.configure do |config|
+  config.verify_constant_names = true
+end

data/spec/unit/commands/deploy_spec.rb

@@ -22,43 +22,51 @@ describe Bosh::Bootstrap::Cli::Commands::Deploy do
   # * create_microbosh_manifest
   # * microbosh_deploy
   describe "aws" do
-    it "deploy creates provisions IP address micro_bosh.yml, discovers/downloads stemcell/AMI, runs 'bosh micro deploy'" do
+    before do
       setting "provider.name", "aws"
       setting "key_pair.name", "test-bosh"
       setting "key_pair.private_key", "PRIVATE"
+    end
 
-      provider = double(Cyoi::Cli::Provider)
-      provider.stub(:execute!)
-      Cyoi::Cli::Provider.should_receive(:new).with([settings_dir]).and_return(provider)
-
-      provider_client = double(Cyoi::Providers::Clients::AwsProviderClient)
-      provider_client.stub(:create_security_group)
-      cmd.stub(:provider_client).and_return(provider_client)
-
-      address = double(Cyoi::Cli::Address)
-      address.stub(:execute!)
-      Cyoi::Cli::Address.should_receive(:new).with([settings_dir]).and_return(address)
-
-      microbosh_provider = stub()
-      microbosh_provider.should_receive(:stemcell).exactly(1).times.and_return("")
-      microbosh_provider.should_receive(:stemcell).exactly(1).times.and_return("ami-123456")
-      cmd.stub(:microbosh_provider).and_return(microbosh_provider)
-
-      key_pair = double(Cyoi::Cli::KeyPair)
-      key_pair.stub(:execute!)
-      Cyoi::Cli::KeyPair.should_receive(:new).with(["test-bosh", settings_dir]).and_return(key_pair)
-
-      keypair = double(Bosh::Bootstrap::KeyPair)
-      keypair.should_receive(:execute!)
-      keypair.should_receive(:path).and_return(home_file(".microbosh/ssh/test-bosh"))
-      Bosh::Bootstrap::KeyPair.stub(:new).with(settings_dir, "test-bosh", "PRIVATE").and_return(keypair)
-
-      microbosh = double(Bosh::Bootstrap::Microbosh)
-      microbosh.stub(:deploy)
-      Bosh::Bootstrap::Microbosh.stub(:new).with(settings_dir, microbosh_provider).and_return(microbosh)
+    it "deploy creates provisions IP address micro_bosh.yml, discovers/downloads stemcell/AMI, runs 'bosh micro deploy'" do
+      # select_provider
+      cli_provider = instance_double("Cyoi::Cli::Provider")
+      expect(cli_provider).to receive(:execute!)
+      expect(Cyoi::Cli::Provider).to receive(:new).with([settings_dir]).and_return(cli_provider)
+
+      cyoi_provider_client = instance_double("Cyoi::Providers::Clients::AwsProviderClient")
+      expect(cyoi_provider_client).to receive(:create_security_group).exactly(3).times
+      expect(Cyoi::Providers).to receive(:provider_client).with("name" => "aws").and_return(cyoi_provider_client)
+
+      # select_or_provision_public_networking
+      address = instance_double("Cyoi::Cli::Address")
+      expect(address).to receive(:execute!)
+      expect(Cyoi::Cli::Address).to receive(:new).with([settings_dir]).and_return(address)
+
+      # microbosh_provider & select_public_image_or_download_stemcell
+      microbosh_provider = instance_double("Bosh::Bootstrap::MicroboshProviders::AWS")
+      expect(microbosh_provider).to receive(:stemcell).exactly(1).times.and_return("")
+      expect(microbosh_provider).to receive(:stemcell).exactly(1).times.and_return("ami-123456")
+      expect(cmd).to receive(:microbosh_provider).and_return(microbosh_provider).exactly(3).times
+
+      # setup_keypair
+      key_pair = instance_double(Cyoi::Cli::KeyPair)
+      expect(key_pair).to receive(:execute!)
+      expect(Cyoi::Cli::KeyPair).to receive(:new).with(["test-bosh", settings_dir]).and_return(key_pair)
+
+      keypair = instance_double(Bosh::Bootstrap::KeyPair)
+      expect(keypair).to receive(:execute!)
+      expect(keypair).to receive(:path).and_return(home_file(".microbosh/ssh/test-bosh"))
+      expect(Bosh::Bootstrap::KeyPair).to receive(:new).with(settings_dir, "test-bosh", "PRIVATE").and_return(keypair)
+
+      # perform_microbosh_deploy
+      microbosh = instance_double(Bosh::Bootstrap::Microbosh)
+      expect(microbosh).to receive(:deploy)
+      expect(Bosh::Bootstrap::Microbosh).to receive(:new).with(settings_dir, microbosh_provider).and_return(microbosh)
 
       capture_stdout { cmd.perform }
     end
+
   end
 
   describe "openstack" do
@@ -67,37 +75,42 @@ describe Bosh::Bootstrap::Cli::Commands::Deploy do
       setting "key_pair.name", "test-bosh"
       setting "key_pair.private_key", "PRIVATE"
 
-      provider = double(Cyoi::Cli::Provider)
-      provider.stub(:execute!)
-      Cyoi::Cli::Provider.should_receive(:new).with([settings_dir]).and_return(provider)
-
-      provider_client = double(Cyoi::Providers::Clients::OpenStackProviderClient)
-      provider_client.stub(:create_security_group)
-      cmd.stub(:provider_client).and_return(provider_client)
-
-      address = double(Cyoi::Cli::Address)
-      address.stub(:execute!)
-      Cyoi::Cli::Address.should_receive(:new).with([settings_dir]).and_return(address)
-
-      microbosh_provider = stub()
-      microbosh_provider.should_receive(:stemcell).exactly(1).times.and_return("")
-      microbosh_provider.should_receive(:stemcell).exactly(1).times.and_return("openstack.tgz")
-      cmd.stub(:microbosh_provider).and_return(microbosh_provider)
-
-      key_pair = double(Cyoi::Cli::KeyPair)
-      key_pair.stub(:execute!)
-      Cyoi::Cli::KeyPair.should_receive(:new).with(["test-bosh", settings_dir]).and_return(key_pair)
-
-      keypair = double(Bosh::Bootstrap::KeyPair)
-      keypair.should_receive(:execute!)
-      keypair.should_receive(:path).and_return(home_file(".microbosh/ssh/test-bosh"))
-      Bosh::Bootstrap::KeyPair.stub(:new).with(settings_dir, "test-bosh", "PRIVATE").and_return(keypair)
-
-      microbosh = double(Bosh::Bootstrap::Microbosh)
-      microbosh.stub(:deploy)
-      Bosh::Bootstrap::Microbosh.stub(:new).with(settings_dir, microbosh_provider).and_return(microbosh)
+      # select_provider
+      cli_provider = instance_double("Cyoi::Cli::Provider")
+      expect(cli_provider).to receive(:execute!)
+      expect(Cyoi::Cli::Provider).to receive(:new).with([settings_dir]).and_return(cli_provider)
+
+      cyoi_provider_client = instance_double("Cyoi::Providers::Clients::OpenStackProviderClient")
+      expect(cyoi_provider_client).to receive(:create_security_group).exactly(3).times
+      expect(Cyoi::Providers).to receive(:provider_client).with("name" => "openstack").and_return(cyoi_provider_client)
+
+      # select_or_provision_public_networking
+      address = instance_double("Cyoi::Cli::Address")
+      expect(address).to receive(:execute!)
+      expect(Cyoi::Cli::Address).to receive(:new).with([settings_dir]).and_return(address)
+
+      # microbosh_provider & select_public_image_or_download_stemcell
+      microbosh_provider = instance_double("Bosh::Bootstrap::MicroboshProviders::OpenStack")
+      expect(microbosh_provider).to receive(:stemcell).exactly(1).times.and_return("")
+      expect(microbosh_provider).to receive(:stemcell).exactly(1).times.and_return("openstack.tgz")
+      expect(cmd).to receive(:microbosh_provider).and_return(microbosh_provider).exactly(3).times
+
+      # setup_keypair
+      key_pair = instance_double(Cyoi::Cli::KeyPair)
+      expect(key_pair).to receive(:execute!)
+      expect(Cyoi::Cli::KeyPair).to receive(:new).with(["test-bosh", settings_dir]).and_return(key_pair)
+
+      keypair = instance_double(Bosh::Bootstrap::KeyPair)
+      expect(keypair).to receive(:execute!)
+      expect(keypair).to receive(:path).and_return(home_file(".microbosh/ssh/test-bosh"))
+      expect(Bosh::Bootstrap::KeyPair).to receive(:new).with(settings_dir, "test-bosh", "PRIVATE").and_return(keypair)
+
+      # perform_microbosh_deploy
+      microbosh = instance_double(Bosh::Bootstrap::Microbosh)
+      expect(microbosh).to receive(:deploy)
+      expect(Bosh::Bootstrap::Microbosh).to receive(:new).with(settings_dir, microbosh_provider).and_return(microbosh)
 
       capture_stdout { cmd.perform }
     end
   end
-end
+end

data/spec/unit/key_pair_spec.rb

@@ -7,9 +7,9 @@ describe Bosh::Bootstrap::KeyPair do
 
   it "creates local private key file" do
     setup_home_dir
-    File.should_not be_exists(home_file(".microbosh", "ssh", "keyname"))
+    expect(File.exists?(home_file(".microbosh", "ssh", "keyname"))).to eq false
     subject.execute!
     keyfile = home_file(".microbosh", "ssh", "keyname")
-    File.read(keyfile).should == "PRIVATE"
+    expect(File.read(keyfile)).to eq "PRIVATE"
   end
-end
+end

data/spec/unit/microbosh_providers/openstack_spec.rb

@@ -6,23 +6,92 @@ describe Bosh::Bootstrap::MicroboshProviders::OpenStack do
 
   let(:microbosh_yml) { File.expand_path("~/.microbosh/deployments/micro_bosh.yml")}
 
-  it "creates micro_bosh.yml manifest" do
-    setting "provider.name", "openstack"
-    setting "provider.credentials.openstack_auth_url", "http://10.0.0.2:5000/v2.0/tokens"
-    setting "provider.credentials.openstack_username", "USER"
-    setting "provider.credentials.openstack_api_key", "PASSWORD"
-    setting "provider.credentials.openstack_tenant", "TENANT"
-    setting "provider.credentials.openstack_region", "REGION"
-    setting "address.ip", "1.2.3.4"
-    setting "key_pair.path", "~/.microbosh/ssh/test-bosh"
-    setting "bosh.name", "test-bosh"
-    setting "bosh.salted_password", "salted_password"
-    setting "bosh.persistent_disk", 16384
-
-    subject = Bosh::Bootstrap::MicroboshProviders::OpenStack.new(microbosh_yml, settings)
-
-    subject.create_microbosh_yml(settings)
-    File.should be_exists(microbosh_yml)
-    yaml_files_match(microbosh_yml, spec_asset("microbosh_yml/micro_bosh.openstack.yml"))
+  context "creates micro_bosh.yml manifest" do
+    it "on nova with floating IP" do
+      setting "provider.name", "openstack"
+      setting "provider.credentials.openstack_auth_url", "http://10.0.0.2:5000/v2.0/tokens"
+      setting "provider.credentials.openstack_username", "USER"
+      setting "provider.credentials.openstack_api_key", "PASSWORD"
+      setting "provider.credentials.openstack_tenant", "TENANT"
+      setting "provider.credentials.openstack_region", "REGION"
+      setting "address.ip", "1.2.3.4"
+      setting "key_pair.path", "~/.microbosh/ssh/test-bosh"
+      setting "bosh.name", "test-bosh"
+      setting "bosh.salted_password", "salted_password"
+      setting "bosh.persistent_disk", 16384
+
+      subject = Bosh::Bootstrap::MicroboshProviders::OpenStack.new(microbosh_yml, settings)
+
+      subject.create_microbosh_yml(settings)
+      File.should be_exists(microbosh_yml)
+      yaml_files_match(microbosh_yml, spec_asset("microbosh_yml/micro_bosh.openstack.nova_vip.yml"))
+    end
+
+
+    it "on neutron with public gateway & floating IP" do
+      setting "provider.name", "openstack"
+      setting "provider.credentials.openstack_auth_url", "http://10.0.0.2:5000/v2.0/tokens"
+      setting "provider.credentials.openstack_username", "USER"
+      setting "provider.credentials.openstack_api_key", "PASSWORD"
+      setting "provider.credentials.openstack_tenant", "TENANT"
+      setting "provider.credentials.openstack_region", "REGION"
+      setting "address.subnet_id", "7b8788eb-b49e-4424-9065-75a6b07094ea"
+      setting "address.pool_name", "INTERNET"
+      setting "address.ip", "1.2.3.4" # network.vip
+      setting "key_pair.path", "~/.microbosh/ssh/test-bosh"
+      setting "bosh.name", "test-bosh"
+      setting "bosh.salted_password", "salted_password"
+      setting "bosh.persistent_disk", 16384
+
+      subject = Bosh::Bootstrap::MicroboshProviders::OpenStack.new(microbosh_yml, settings)
+
+      subject.create_microbosh_yml(settings)
+      File.should be_exists(microbosh_yml)
+      yaml_files_match(microbosh_yml, spec_asset("microbosh_yml/micro_bosh.openstack.neutron_vip.yml"))
+    end
+
+    it "on neutron with internal static IP only" do
+      setting "provider.name", "openstack"
+      setting "provider.credentials.openstack_auth_url", "http://10.0.0.2:5000/v2.0/tokens"
+      setting "provider.credentials.openstack_username", "USER"
+      setting "provider.credentials.openstack_api_key", "PASSWORD"
+      setting "provider.credentials.openstack_tenant", "TENANT"
+      setting "provider.credentials.openstack_region", "REGION"
+      setting "address.subnet_id", "7b8788eb-b49e-4424-9065-75a6b07094ea"
+      setting "address.ip", "10.10.10.3" # network.ip
+      setting "key_pair.path", "~/.microbosh/ssh/test-bosh"
+      setting "bosh.name", "test-bosh"
+      setting "bosh.salted_password", "salted_password"
+      setting "bosh.persistent_disk", 16384
+
+      subject = Bosh::Bootstrap::MicroboshProviders::OpenStack.new(microbosh_yml, settings)
+
+      subject.create_microbosh_yml(settings)
+      File.should be_exists(microbosh_yml)
+      yaml_files_match(microbosh_yml, spec_asset("microbosh_yml/micro_bosh.openstack.neutron_manual.yml"))
+    end
+
+    it "boot from volume" do
+      setting "provider.name", "openstack"
+      setting "provider.credentials.openstack_auth_url", "http://10.0.0.2:5000/v2.0/tokens"
+      setting "provider.credentials.openstack_username", "USER"
+      setting "provider.credentials.openstack_api_key", "PASSWORD"
+      setting "provider.credentials.openstack_tenant", "TENANT"
+      setting "provider.credentials.openstack_region", "REGION"
+      setting "address.subnet_id", "7b8788eb-b49e-4424-9065-75a6b07094ea"
+      setting "address.ip", "10.10.10.3" # network.ip
+      setting "key_pair.path", "~/.microbosh/ssh/test-bosh"
+      setting "bosh.name", "test-bosh"
+      setting "bosh.salted_password", "salted_password"
+      setting "bosh.persistent_disk", 16384
+
+      setting "provider.options.boot_from_volume", true
+
+      subject = Bosh::Bootstrap::MicroboshProviders::OpenStack.new(microbosh_yml, settings)
+
+      subject.create_microbosh_yml(settings)
+      File.should be_exists(microbosh_yml)
+      yaml_files_match(microbosh_yml, spec_asset("microbosh_yml/micro_bosh.openstack.boot_from_volume.yml"))
+    end
   end
 end

data/spec/unit/microbosh_spec.rb

@@ -6,7 +6,7 @@ describe Bosh::Bootstrap::Microbosh do
   let(:path_or_ami) { "/path/to/stemcell.tgz" }
   let(:base_path) { File.expand_path("~/.microbosh") }
   let(:settings_dir) { base_path }
-  let(:microbosh_provider) { stub(create_microbosh_yml: {}) }
+  let(:microbosh_provider) { instance_double("Bosh::Bootstrap::MicroboshProviders::AWS", create_microbosh_yml: {}) }
   subject { Bosh::Bootstrap::Microbosh.new(base_path, microbosh_provider) }
 
   it "deploys new microbosh" do
@@ -24,4 +24,4 @@ describe Bosh::Bootstrap::Microbosh do
   xit "re-deploys failed microbosh deployment" do
     subject.deploy
   end
-end
+end

data/spec/unit/network_providers/aws_spec.rb

@@ -6,25 +6,21 @@ require "bosh-bootstrap/network_providers/aws"
 describe Bosh::Bootstrap::NetworkProviders::AWS do
   include Bosh::Bootstrap::Cli::Helpers::Settings
 
-  let(:provider_client) { stub() }
-  subject { Bosh::Bootstrap::NetworkProviders::AWS.new(provider_client) }
+  let(:cyoi_provider_client) { instance_double("Cyoi::Providers::Clients::AwsProviderClient") }
+  subject { Bosh::Bootstrap::NetworkProviders::AWS.new(cyoi_provider_client) }
 
   it "is registered" do
-    Bosh::Bootstrap::NetworkProviders.provider_class("aws").should == subject.class
+    expect(Bosh::Bootstrap::NetworkProviders.provider_class("aws")).to eq(subject.class)
   end
 
   it "creates security groups it needs" do
     expected_groups = [
       ["ssh", "ssh", ports: 22],
       ["dns_server", "dns_server", ports: { protocol: "udp", ports: (53..53) }],
-      ["bosh_nats_server", "bosh_nats_server", ports: 4222],
-      ["bosh_agent_https", "bosh_agent_https", ports: 6868],
-      ["bosh_blobstore", "bosh_blobstore", ports: 25250],
-      ["bosh_director", "bosh_director", ports: 25555],
-      ["bosh_registry", "bosh_registry", ports: 25777],
+      ["bosh", "bosh", ports: [4222, 6868, 25250, 25555, 25777]]
     ]
     expected_groups.each do |security_group_name, description, ports|
-      provider_client.stub(:create_security_group).with(security_group_name, description, ports)
+      expect(cyoi_provider_client).to receive(:create_security_group).with(security_group_name, description, ports)
     end
     subject.perform
   end

data/spec/unit/network_providers/openstack_spec.rb

@@ -5,7 +5,7 @@ require "bosh-bootstrap/network_providers/openstack"
 describe Bosh::Bootstrap::NetworkProviders::OpenStack do
   include Bosh::Bootstrap::Cli::Helpers::Settings
 
-  let(:provider_client) { stub() }
+  let(:provider_client) { instance_double("Cyoi::Providers::Clients::OpenStackProviderClient") }
   subject { Bosh::Bootstrap::NetworkProviders::OpenStack.new(provider_client) }
 
   it "is registered" do
@@ -14,16 +14,12 @@ describe Bosh::Bootstrap::NetworkProviders::OpenStack do
 
   it "creates security groups it needs" do
     expected_groups = [
-      ["ssh", "ssh", ports: 22],
-      ["dns_server", "dns_server", ports: { protocol: "udp", ports: (53..53) }],
-      ["bosh_nats_server", "bosh_nats_server", ports: 4222],
-      ["bosh_agent_https", "bosh_agent_https", ports: 6868],
-      ["bosh_blobstore", "bosh_blobstore", ports: 25250],
-      ["bosh_director", "bosh_director", ports: 25555],
-      ["bosh_registry", "bosh_registry", ports: 25777],
+      ["ssh", "ssh", 22],
+      ["dns_server", "dns_server", { protocol: "udp", ports: (53..53) }],
+      ["bosh", "bosh", [4222, 6868, 25250, 25555, 25777]]
     ]
     expected_groups.each do |security_group_name, description, ports|
-      provider_client.stub(:create_security_group).with(security_group_name, description, ports)
+      expect(provider_client).to receive(:create_security_group).with(security_group_name, description, ports)
     end
     subject.perform
   end

data/spec/unit/network_spec.rb

@@ -3,17 +3,16 @@ require "bosh-bootstrap/network"
 describe Bosh::Bootstrap::Network do
   include Bosh::Bootstrap::Cli::Helpers::Settings
 
-  let(:aws_provider_client) { stub() }
-  let(:vsphere_provider_client) { stub() }
+  let(:aws_cyoi_provider_client) { instance_double("Cyoi::Providers::Clients::AwsProviderClient") }
 
   it "uses NetworkProvider if available" do
-    network = Bosh::Bootstrap::Network.new("aws", aws_provider_client)
-    aws_provider_client.should_receive(:create_security_group).exactly(7).times
+    network = Bosh::Bootstrap::Network.new("aws", aws_cyoi_provider_client)
+    expect(aws_cyoi_provider_client).to receive(:create_security_group).exactly(3).times
     network.deploy
   end
 
   it "does nothing if no NetworkProvider for the infrastructure" do
-    network = Bosh::Bootstrap::Network.new("vsphere", vsphere_provider_client)
+    network = Bosh::Bootstrap::Network.new("vsphere", nil)
     network.deploy
   end
-end
+end