bosh_warden_cpi 1.5.0.pre.3 → 1.2513.0

data/spec/unit/diskutils_spec.rb

@@ -0,0 +1,146 @@
+require 'spec_helper'
+
+describe Bosh::WardenCloud::DiskUtils do
+
+  let(:image_path) { asset('stemcell-warden-test.tgz') }
+  let(:bad_image_path) { asset('stemcell-not-existed.tgz') }
+
+  before :each do
+    @disk_root = Dir.mktmpdir('warden-cpi-path')
+    @stemcell_path =  Dir.mktmpdir('stemcell-path')
+    @stemcell_root = File.join(@stemcell_path, 'stemcell-uuid')
+    @disk_util =  described_class.new(@disk_root, @stemcell_path, 'ext4')
+    allow(@disk_util).to receive(:sleep) {}
+  end
+
+  after :each do
+    FileUtils.rm_rf @disk_root
+    FileUtils.rm_rf @stemcell_path
+  end
+
+  context 'create_stemcell' do
+    it 'will use create stemcell' do
+      mock_sh("tar -C #{@stemcell_root} -xzf #{image_path} 2>&1", true)
+      @disk_util.stemcell_unpack(image_path, 'stemcell-uuid')
+      Dir.chdir(@stemcell_path) do
+        expect(Dir.glob('*').size).to eq(1)
+        expect(Dir.glob('*')).to include('stemcell-uuid')
+      end
+    end
+
+    it 'should raise error with bad image path' do
+      mock_sh("rm -rf #{@stemcell_root}", true)
+      expect {
+        @disk_util.stemcell_unpack(bad_image_path, 'stemcell-uuid')
+      }.to raise_error
+    end
+  end
+
+  context 'delete_stemcell' do
+    it 'can delete stemcell' do
+      Dir.chdir(@stemcell_path) do
+        mock_sh("tar -C #{@stemcell_root} -xzf #{image_path} 2>&1", true)
+        @disk_util.stemcell_unpack(image_path, 'stemcell-uuid')
+        expect(Dir.glob('*').size).to eq(1)
+        expect(Dir.glob('*')).to include('stemcell-uuid')
+        mock_sh("rm -rf #{@stemcell_root}", true)
+        @disk_util.stemcell_delete('stemcell-uuid')
+      end
+    end
+  end
+
+  context 'create_disk' do
+    it 'can create disk' do
+      mock_sh("/sbin/mkfs -t ext4 -F #{@disk_root}/disk-uuid.img 2>&1")
+      @disk_util.create_disk('disk-uuid', 1)
+      Dir.chdir(@disk_root) do
+        image = 'disk-uuid.img'
+        expect(Dir.glob('*').size).to eq(1)
+        expect(Dir.glob('*')).to include(image)
+        expect(File.stat(image).size).to eq(1 << 20)
+      end
+      expect(@disk_util.disk_exist?('disk-uuid')).to be true
+    end
+
+    it 'should raise error if size is 0' do
+      expect {
+        @disk_util.create_disk('disk-uuid', 0)
+      }.to raise_error ArgumentError
+    end
+
+    it 'should raise error if size is smaller than 0' do
+      expect {
+        @disk_util.create_disk('disk-uuid', -1)
+      }.to raise_error ArgumentError
+    end
+
+    it 'should clean up when create disk failed' do
+      allow(@disk_util).to receive(:image_path) { '/path/not/exist' }
+      expect {
+        @disk_util.create_disk('disk-uuid', 1)
+      }.to raise_error
+      Dir.chdir(@disk_root) do
+        expect(Dir.glob('*')).to be_empty
+      end
+    end
+  end
+
+  context 'delete_disk' do
+    before :each do
+      mock_sh("/sbin/mkfs -t ext4 -F #{@disk_root}/disk-uuid.img 2>&1")
+      @disk_util.create_disk('disk-uuid', 1)
+    end
+
+    it 'can delete disk' do
+      Dir.chdir(@disk_root) do
+        expect(Dir.glob('*').size).to eq(1)
+        expect(Dir.glob('*')).to include('disk-uuid.img')
+        @disk_util.delete_disk('disk-uuid')
+        expect(Dir.glob('*')).to be_empty
+      end
+    end
+  end
+
+  context 'disk exist' do
+    it 'should detect non-existed disk' do
+      expect(@disk_util.disk_exist?('12345')).to be false
+    end
+
+    it 'should return true for existed disk' do
+      @disk_util.create_disk('disk-uuid', 1)
+      expect(@disk_util.disk_exist?('disk-uuid')).to be true
+    end
+  end
+
+  context 'mount & umount disk' do
+    before :each do
+      @vm_path =  Dir.mktmpdir('warden-cpi-path')
+      @vm_id_path = File.join(@vm_path, 'vm-id')
+    end
+
+    after :each do
+      FileUtils.rm_rf @vm_path
+    end
+
+    it 'will invoke sudo mount to attach loop device' do
+      mock_sh("mount #{@disk_root}/disk-uuid.img #{@vm_id_path} -o loop", true)
+      @disk_util.mount_disk(@vm_id_path, 'disk-uuid')
+    end
+
+    it 'will sudo invoke umount to detach loop device' do
+      mock_sh("umount #{@vm_id_path}", true)
+      allow(@disk_util).to receive(:mount_entry).and_return('nop', nil)
+      @disk_util.umount_disk(@vm_id_path)
+    end
+
+    it 'will retry umount for detach disk' do
+      mock_sh("umount #{@vm_id_path}", true, Bosh::WardenCloud::DiskUtils::UMOUNT_GUARD_RETRIES + 1, false)
+      allow(@disk_util).to receive(:mount_entry).and_return('nop')
+
+      expect {
+        @disk_util.umount_disk(@vm_id_path)
+      }. to raise_error
+    end
+  end
+
+end

data/spec/unit/helper_spec.rb

@@ -0,0 +1,106 @@
+require 'spec_helper'
+
+describe Bosh::WardenCloud::Helpers do
+  include Bosh::WardenCloud::Helpers
+
+  before :each do
+    @warden_client = double('Warden::Client')
+    allow(Warden::Client).to receive(:new).and_return(@warden_client)
+
+    allow(@warden_client).to receive(:connect) {}
+    allow(@warden_client).to receive(:disconnect) {}
+  end
+
+  context 'uuid' do
+    it 'can generate the correct uuid' do
+      expect(uuid('disk')).to start_with 'disk'
+    end
+  end
+
+  context 'sudo/sh' do
+    it 'run sudo cmd with sudo' do
+      mock_sh('fake', true)
+      sudo('fake')
+    end
+
+    it 'run sh cmd with sh' do
+      mock_sh('fake')
+      sh('fake')
+    end
+  end
+
+  context 'generate and get agent env' do
+    before :each do
+      allow(@warden_client).to receive(:call) do |req|
+        res = req.create_response
+        case req
+          when Warden::Protocol::RunRequest
+            expect(req.script).to eq("cat #{agent_settings_file}")
+            res.stdout = %{{"vm":{"name":"vm-name","id":"vm-id"},"agent_id":"vm-agent"}}
+          else
+            raise "#{req} not supported"
+        end
+        res
+      end
+      @agent_properties = { 'ntp' => 'test' }
+    end
+
+    it 'generate agent env from agent_properties' do
+      env = generate_agent_env('vm-id', 'agent-id', {}, { 'password' => 'abc' })
+      expect(env['vm']['name']).to eq('vm-id')
+      expect(env['vm']['id']).to eq('vm-id')
+      expect(env['agent_id']).to eq('agent-id')
+      expect(env['ntp']).to eq('test')
+      expect(env['env']['password']).to eq('abc')
+    end
+
+    it 'invoke warden to cat agent_settings_file' do
+      env = get_agent_env('fake_handle')
+      expect(env['vm']['name']).to eq('vm-name')
+      expect(env['vm']['id']).to eq('vm-id')
+      expect(env['agent_id']).to eq('vm-agent')
+    end
+  end
+
+  context 'set agent env' do
+    before :each do
+      allow(@warden_client).to receive(:call) do |req|
+        res = req.create_response
+        case req
+          when Warden::Protocol::RunRequest
+            expect(req.script).to eq("mv /tmp/100 #{agent_settings_file}")
+          when Warden::Protocol::CopyInRequest
+            expect(req.dst_path).to eq('/tmp/100')
+          else
+            raise "#{req} not supported"
+        end
+        res
+      end
+    end
+
+    it 'generate a random file in tmp and mv to agent_setting_file' do
+      allow(Kernel).to receive(:rand).and_return(100)
+      set_agent_env('fake_handle', {})
+    end
+  end
+
+  context 'start agent' do
+    before :each do
+      allow(@warden_client).to receive(:call) do |req|
+        res = req.create_response
+        case req
+          when Warden::Protocol::SpawnRequest
+            expect(req.script).to eq('/usr/sbin/runsvdir-start')
+          else
+            raise "#{req} not supported"
+        end
+        res
+      end
+    end
+
+    it 'runs runsvdir-start when start agent' do
+      start_agent('fake_handle')
+    end
+  end
+
+end

metadata

@@ -1,16 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: bosh_warden_cpi
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.3
-  prerelease: 6
+  version: 1.2513.0
+  prerelease: 
 platform: ruby
 authors:
-- Cloud Foundry
+- VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2014-04-30 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bosh_common
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -75,23 +91,42 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: BOSH Warden CPI
-email: support@cloudfoundry.org
+email: support@cloudfoundry.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- db/migrations/20130312211408_initial.rb
 - lib/cloud/warden.rb
 - lib/cloud/warden/cloud.rb
-- lib/cloud/warden/device_pool.rb
+- lib/cloud/warden/diskutils.rb
 - lib/cloud/warden/helpers.rb
-- lib/cloud/warden/models/disk.rb
-- lib/cloud/warden/models/vm.rb
 - lib/cloud/warden/version.rb
 - README
-homepage: http://github.com/cloudfoundry/bosh
-licenses: []
+- spec/assets/stemcell-warden-test.tgz
+- spec/spec_helper.rb
+- spec/unit/cloud_spec.rb
+- spec/unit/diskutils_spec.rb
+- spec/unit/helper_spec.rb
+homepage: https://github.com/cloudfoundry/bosh
+licenses:
+- Apache 2.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -101,17 +136,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -2647859539726025791
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: BOSH Warden CPI
-test_files: []
+test_files:
+- spec/assets/stemcell-warden-test.tgz
+- spec/spec_helper.rb
+- spec/unit/cloud_spec.rb
+- spec/unit/diskutils_spec.rb
+- spec/unit/helper_spec.rb

data/db/migrations/20130312211408_initial.rb

@@ -1,22 +0,0 @@
-Sequel.migration do
-  up do
-    create_table(:warden_vm) do
-      primary_key :id
-      String :container_id
-    end
-
-    create_table(:warden_disk) do
-      primary_key :id
-      foreign_key :vm_id, :warden_vm
-      Integer :device_num
-      String :device_path
-      String :image_path
-      Boolean :attached, :default => false
-    end
-  end
-
-  down do
-    drop_table :warden_disk
-    drop_table :warden_vm
-  end
-end

data/lib/cloud/warden/device_pool.rb

@@ -1,36 +0,0 @@
-module Bosh::WardenCloud
-
-  class DevicePool
-    def initialize(count)
-      @mutex = Mutex.new
-      @pool = []
-
-      @pool = count.times.map { |i| block_given? ? yield(i) : i }
-    end
-
-    def size
-      @mutex.synchronize do
-        @pool.size
-      end
-    end
-
-    def acquire
-      @mutex.synchronize do
-        @pool.shift
-      end
-    end
-
-    def release(entry)
-      @mutex.synchronize do
-        @pool << entry
-      end
-    end
-
-    def delete_if(&blk)
-      @mutex.synchronize do
-        @pool.delete_if &blk
-      end
-    end
-  end
-
-end

data/lib/cloud/warden/models/disk.rb

@@ -1,5 +0,0 @@
-module Bosh::WardenCloud::Models
-  class Disk < Sequel::Model(Bosh::Clouds::Config.db[:warden_disk])
-    many_to_one :vm, :key => :vm_id, :class => Bosh::WardenCloud::Models::VM
-  end
-end

data/lib/cloud/warden/models/vm.rb

@@ -1,5 +0,0 @@
-module Bosh::WardenCloud::Models
-  class VM < Sequel::Model(Bosh::Clouds::Config.db[:warden_vm])
-    one_to_many :disks, :key => :vm_id
-  end
-end