vmonkey 0.4.0 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0b377b2e2e04e33a7e11a78bfdba2a9359e2f7a6
+  data.tar.gz: 69f2335719ab9d9fde2e4a7a2b1d91a86567c06d
+SHA512:
+  metadata.gz: e24027bf933a229dedc82fe9958b0e1b57ca9eb79fff135d358805f5ab372d0946d0215af39c06f554b9c4cbe3366a49b9f4b6ecff85d8003f9fc9a2cc73ef20
+  data.tar.gz: d5812887c249c9cca6cbc72ae0985b7eb9b46776615b64a9c5edd9819a2862957109cd917f68de5287b2eccd0807e84436c563eda58fea1eb0ebcfebea13ef24

data/lib/vmonkey.rb

@@ -15,14 +15,16 @@ module VMonkey
   end
 end
 
-class String
-  def parent
-    p = self.split('/')[0...-1].join('/')
-    p == '' ? '/' : p
-  end
+module VMonkey
+  refine String do
+    def parent
+      p = self.split('/')[0...-1].join('/')
+      p == '' ? '/' : p
+    end
 
-  def basename
-    p = self.split('/').last
+    def basename
+      p = self.split('/').last
+    end
   end
 end
 

data/lib/vmonkey/version.rb

@@ -1,3 +1,3 @@
 module Vmonkey
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/lib/vmonkey/vim/VirtualApp.rb

@@ -1,4 +1,12 @@
+using VMonkey
+
 class RbVmomi::VIM::VirtualApp
+
+  def destroy
+    self.PowerOffVApp_Task( force: true ).wait_for_completion unless summary.vAppState.downcase == 'stopped'
+    self.Destroy_Task( force: true ).wait_for_completion
+  end
+
   def vm_pool
     self
   end
@@ -10,6 +18,97 @@ class RbVmomi::VIM::VirtualApp
   def find_vm(vm_name)
     vm.find { |vm| vm.name == vm_name }
   end
+
+  def annotation
+    vAppConfig.annotation
+  end
+
+  def annotation=(value)
+    UpdateVAppConfig(spec: {annotation: value})
+  end
+
+  def properties
+    vAppConfig.property
+  end
+
+  def property(*args)
+    case args.size
+    when 1
+      read_property(*args)
+    when 2
+      set_property(*args)
+    else
+      raise ArgumentError.new("wrong number of arguments (#{args.size} for 1 or 2)")
+    end
+  end
+
+  def property!(name)
+    read_property(name) || raise("vApp Property not found. [#{name}]")
+  end
+
+  def clone_to(path, opts = {})
+    dest = monkey.get(path.parent)
+    unless dest.is_a? RbVmomi::VIM::Folder or dest.is_a? RbVmomi::VIM::VirtualApp
+      raise "Cannot clone_to [#{path.parent}] - destination must specify a Folder or VirtualApp"
+    end
+
+    if opts[:datastore].nil?
+      opts[:datastore] = datastore.first   #take the first datastore on the vApp to be cloned
+    end
+
+    params = _clone_params(path.basename, dest, opts)
+
+    self.CloneVApp_Task(params).wait_for_completion
+  end
+
+  def find_property(name)
+    vAppConfig.property.find { |p| p.props[:id] == name.to_s  }
+  end
+
+  def read_property(name)
+    p = find_property(name)
+    p.nil? ? nil : p[:value]
+  end
+
+  def set_property(name, value)
+    if vAppConfig.property
+      existing_property = find_property(name)
+    end
+
+    if existing_property
+      operation = 'edit'
+      property_key = existing_property.props[:key]
+    else
+      operation = 'add'
+      property_key = name.object_id
+    end
+
+    vm_config_spec = RbVmomi::VIM.VAppConfigSpec(
+        property: [
+          RbVmomi::VIM.VAppPropertySpec(
+            operation: operation,
+            info: {
+              key: property_key,
+              id: name.to_s,
+              type: 'string',
+              userConfigurable: true,
+              value: value
+              })])
+
+    UpdateVAppConfig( spec: vm_config_spec )
+  end
+
+  def _clone_params(vapp_name, dest, opts)
+    {
+      name: vapp_name,
+      target: monkey.cluster.resourcePool,
+      spec: RbVmomi::VIM.VAppCloneSpec(
+        location: opts[:datastore],
+        vmFolder: dest
+        )
+    }
+  end
+
 end
 
 

data/lib/vmonkey/vim/VirtualMachine.rb

@@ -1,3 +1,5 @@
+using VMonkey
+
 class RbVmomi::VIM::VirtualMachine
 
   def destroy

data/lib/vmonkey/vim/vim.rb

@@ -65,6 +65,14 @@ module RbVmomi
       dc.vmFolder.traverse path
     end
 
+    def datastore(datastore_name)
+      dc.datastore.find { |ds| ds.info.name.to_s == datastore_name.to_s }
+    end
+
+    def datastore!(datastore_name)
+      datastore(datastore_name) || raise("Datastore not found. [#{datastore_name}]")
+    end
+
     def customization_spec(spec_name)
       return nil if spec_name.nil?
       serviceContent.customizationSpecManager.GetCustomizationSpec(name: spec_name).spec

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require_relative '../lib/vmonkey'
+require 'rspec/its'
 
 instructions = "
   For the integration tests to run, you need:
@@ -28,6 +29,7 @@ instructions = "
       :vapp_pool_path: /cluster_name/monkey_vapp
       :vapp_path: /path/to/a/vapp
       :customization_spec: name-of-a-cust-spec
+      :datastore: name-of-a-datastore
   "
 
 raise instructions unless File.exists? ENV['VMONKEY_YML']
@@ -40,9 +42,10 @@ raise instructions unless monkey.vm VM_SPEC_OPTS[:template_path]
 raise instructions unless monkey.vapp VM_SPEC_OPTS[:vapp_path]
 raise instructions unless monkey.dc.find_pool VM_SPEC_OPTS[:vapp_pool_path]
 raise instructions unless monkey.customization_spec VM_SPEC_OPTS[:customization_spec]
+raise instructions unless monkey.datastore VM_SPEC_OPTS[:datastore]
 
 RSpec.configure do |config|
-  config.color_enabled = true
-  config.tty = true
-  config.formatter = :documentation
+  config.color      = true
+  config.tty        = true
+  config.formatter  = :documentation
 end

data/spec/vapp_spec.rb

@@ -1,14 +1,59 @@
 require_relative 'spec_helper'
+using VMonkey
 
-describe RbVmomi::VIM::Folder do
+describe RbVmomi::VIM::VirtualApp do
 
   before :all do
-    @monkey ||= VMonkey.connect
-    @vapp ||= @monkey.vapp VM_SPEC_OPTS[:vapp_path]
+    @monkey   ||= VMonkey.connect
+    @vapp     ||= @monkey.vapp VM_SPEC_OPTS[:vapp_path]
+    @spec_vapp_path = "#{VM_SPEC_OPTS[:working_folder]}/vmonkey_spec_vapp"
   end
 
   describe '#vm_pool' do
     subject { @vapp.vm_pool }
     it { should_not be_nil }
   end
+
+  describe '#_clone_params' do
+    context 'with Folder destination' do
+      subject { @params ||= @vapp._clone_params(@spec_vapp_path.basename, @monkey.get(@spec_vapp_path.parent), {}) }
+
+      it { expect(subject[:name]).to eq @spec_vapp_path.basename }
+      it { expect(subject[:spec].location).to be_nil }
+      it { expect(subject[:spec].vmFolder.name).to eql @spec_vapp_path.parent.basename }
+    end
+  end
+
+  context 'with a cloned vapp' do
+    before(:all) { @spec_vapp = @vapp.clone_to @spec_vapp_path }
+    after(:all)  { @spec_vapp.destroy }
+
+    describe '#clone' do
+      context 'to a Folder' do
+        subject { @monkey.vapp @spec_vapp_path }
+        it { should_not be_nil }
+      end
+    end
+
+    describe '#annotation=' do
+      it 'sets the annotation' do
+        @spec_vapp.annotation = 'xyzzy'
+        expect(@spec_vapp.annotation).to eq 'xyzzy'
+      end
+    end
+
+    describe '#property' do
+      before(:all) do
+        @spec_vapp.property :prop, 'xyzzy'
+        @spec_vapp.property :prop2, 'abc123'
+        @spec_vapp.property :prop2, 'abc456'
+      end
+
+      it { expect(@spec_vapp.property :prop).to eq 'xyzzy' }
+      it { expect(@spec_vapp.property :prop2).to eq 'abc456' }
+      it { expect(@spec_vapp.property :xyzzy).to be_nil }
+    end
+
+  end
+
 end

data/spec/vim_spec.rb

@@ -108,7 +108,21 @@ describe RbVmomi::VIM do
 
       it { should be_nil }
     end
+  end
 
+  describe '#datastore' do
+    context 'given an existing datastore' do
+      subject { @ds ||= @monkey.datastore VM_SPEC_OPTS[:datastore] }
+      it { should_not be_nil }
+      its(:name) { should == VM_SPEC_OPTS[:datastore] }
+    end
   end
 
+  describe '#datastore!' do
+    it 'should raise a RuntimeError given a non-existent datastore' do
+      expect { @monkey.datastore! '/xyzzy' }.to raise_error RuntimeError
+    end
+  end
+
+
 end

data/spec/virtualmachine_spec.rb

@@ -1,4 +1,5 @@
 require_relative 'spec_helper'
+using VMonkey
 
 describe RbVmomi::VIM::VirtualMachine do
   before :all do
@@ -167,7 +168,7 @@ describe RbVmomi::VIM::VirtualMachine do
 
     describe '#port_ready?' do
       it 'should be false when the VM is powered off' do
-        expect( @spec_vm.port_ready? 22 ).to be_false
+        expect( @spec_vm.port_ready? 22 ).to be_falsey
       end
     end
 
@@ -177,13 +178,13 @@ describe RbVmomi::VIM::VirtualMachine do
       context 'immediately following start' do
         describe '#ready?' do
           it 'should be false' do
-            expect(@spec_vm.ready?).to be_false
+            expect(@spec_vm.ready?).to be_falsey
           end
         end
 
         describe '#port_ready?' do
           it 'should be false' do
-            expect(@spec_vm.port_ready? 22).to be_false
+            expect(@spec_vm.port_ready? 22).to be_falsey
           end
         end
       end
@@ -193,13 +194,13 @@ describe RbVmomi::VIM::VirtualMachine do
 
         describe '#ready?' do
           it 'should be true' do
-            expect(@spec_vm.ready?).to be_true
+            expect(@spec_vm.ready?).to be_truthy
           end
         end
 
         describe '#port_ready?' do
           it 'should be true' do
-            expect(@spec_vm.port_ready? 22).to be_true
+            expect(@spec_vm.port_ready? 22).to be_truthy
           end
         end
       end

data/vmonkey.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['brian@duprasville.com', 'dsmith@rallydev.com']
   spec.summary       = %q{ simple to use vsphere methods }
   spec.description   = %q{ simple to use vsphere methods }
-  spec.homepage      = 'https://github.com/something/vmonkey'
+  spec.homepage      = 'https://github.com/vmtricks/vmonkey'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 2.14'
+  spec.add_development_dependency 'rspec-its'
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmonkey
 version: !ruby/object:Gem::Version
-  version: 0.4.0
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - Brian Dupras
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -31,7 +28,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -47,7 +42,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,7 +49,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,23 +56,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   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: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -87,12 +77,25 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
-description: ! ' simple to use vsphere methods '
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ' simple to use vsphere methods '
 email:
 - brian@duprasville.com
 - dsmith@rallydev.com
@@ -121,36 +124,29 @@ files:
 - spec/virtualmachine_spec.rb
 - spec/vmonkey_spec.rb
 - vmonkey.gemspec
-homepage: https://github.com/something/vmonkey
+homepage: https://github.com/vmtricks/vmonkey
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 683573069034948857
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 683573069034948857
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: simple to use vsphere methods
 test_files:
 - spec/datacenter_spec.rb