vmonkey 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c508835c077aca3004f773a73dfb541babb3819
-  data.tar.gz: 326b56af7fd2c5dd1ba364fe834fd0546863e859
+  metadata.gz: 5b5abf9886b87a12c8c10b8325e21b066efbde2e
+  data.tar.gz: e5dbdfb1e613e7bb2bddfc548daac3a2fb2f006b
 SHA512:
-  metadata.gz: 47e5a378a2fadf4304ff8d4bf19f66b30ce9745dabc44ac5a30262b428f57500285a1bd730bb90df0709d7c2daeb858c220ceb4114f5be33c5f81d73d2ed864d
-  data.tar.gz: 04c89a6f1bf9e2f978bbdf4b78086616a174e6f5326b3a3095868c4ef555e83fc3d7759111b5d991038f6d6cdd70d43b42033dc5a9020e6608a144b0a19dad77
+  metadata.gz: 179e134d60a7800751beee309ef87abed62b5d06032eb0ef3f37af53e3da762631c02662a2382205c6388ca7456192c2bd94fc11b6d8ed29203843df03a4bc89
+  data.tar.gz: cc36d62392f7c923dbc1fd3cd4588652f7c86fb60fd9f247f8c22047a5d1bcc7c6ef0a71a72b9ea8b21539478ed148f0864c629fbcca70455f54235d30dd18de

data/lib/vmonkey/version.rb

@@ -1,3 +1,3 @@
 module Vmonkey
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

data/lib/vmonkey/vim/VirtualApp.rb

@@ -12,12 +12,12 @@ class RbVmomi::VIM::VirtualApp
   end
 
   def start
-    PowerOnVApp_Task().wait_for_completion unless vapp_state? 'started'
+    self.PowerOnVApp_Task().wait_for_completion unless vapp_state? 'started'
   end
 
   def stop
     return if vapp_state? 'stopped'
-    PowerOffVApp_Task()
+    self.PowerOffVApp_Task( force: true )
     sleep 2 until vapp_state? 'stopped'
   end
 
@@ -37,12 +37,16 @@ class RbVmomi::VIM::VirtualApp
     vm.find { |vm| vm.name == vm_name }
   end
 
+  def find_vm!(vm_name)
+    find_vm(vm_name) || raise("VM not found. [#{vm_name}]")
+  end
+
   def annotation
     vAppConfig.annotation
   end
 
   def annotation=(value)
-    UpdateVAppConfig(spec: {annotation: value})
+    self.UpdateVAppConfig(spec: {annotation: value})
   end
 
   def properties
@@ -53,10 +57,10 @@ class RbVmomi::VIM::VirtualApp
     case args.size
     when 1
       read_property(*args)
-    when 2
+    when 2, 3
       set_property(*args)
     else
-      raise ArgumentError.new("wrong number of arguments (#{args.size} for 1 or 2)")
+      raise ArgumentError.new("wrong number of arguments (#{args.size} for 1, 2 or 3)")
     end
   end
 
@@ -85,10 +89,20 @@ class RbVmomi::VIM::VirtualApp
 
   def read_property(name)
     p = find_property(name)
-    p.nil? ? nil : p[:value]
+    value = nil
+    unless p.nil?
+      value = p[:value]
+      value = p[:defaultValue] if value.empty?
+    end
+    value
   end
 
-  def set_property(name, value)
+  def set_property(name, value, opts={})
+    opts = {
+        type: 'string',
+        userConfigurable: true
+      }.merge opts
+
     if vAppConfig.property
       existing_property = find_property(name)
     end
@@ -101,19 +115,17 @@ class RbVmomi::VIM::VirtualApp
       property_key = name.object_id
     end
 
-    vm_config_spec = RbVmomi::VIM.VAppConfigSpec(
+    vapp_config_spec = RbVmomi::VIM.VAppConfigSpec(
         property: [
           RbVmomi::VIM.VAppPropertySpec(
             operation: operation,
-            info: {
+            info: opts.merge({
               key: property_key,
               id: name.to_s,
-              type: 'string',
-              userConfigurable: true,
               value: value.to_s
-              })])
+              }))])
 
-    UpdateVAppConfig( spec: vm_config_spec )
+    self.UpdateVAppConfig( spec: vapp_config_spec )
   end
 
   def port_ready?(port, timeout=5)
@@ -150,11 +162,11 @@ class RbVmomi::VIM::VirtualApp
     reparent = parent != to_folder
 
     if reparent
-      Rename_Task(newName: "#{path.basename}-tmp").wait_for_completion if rename
+      self.Rename_Task(newName: "#{path.basename}-tmp").wait_for_completion if rename
       to_folder.MoveIntoFolder_Task(list: [self]).wait_for_completion
-      Rename_Task(newName: path.basename).wait_for_completion if rename
+      self.Rename_Task(newName: path.basename).wait_for_completion if rename
     else
-      Rename_Task(newName: path.basename).wait_for_completion
+      self.Rename_Task(newName: path.basename).wait_for_completion
     end
   end
 

data/lib/vmonkey/vim/VirtualMachine.rb

@@ -37,10 +37,10 @@ class RbVmomi::VIM::VirtualMachine
     case args.size
     when 1
       read_property(*args)
-    when 2
+    when 2, 3
       set_property(*args)
     else
-      raise ArgumentError.new("wrong number of arguments (#{args.size} for 1 or 2)")
+      raise ArgumentError.new("wrong number of arguments (#{args.size} for 1, 2 or 3)")
     end
   end
 
@@ -175,10 +175,20 @@ class RbVmomi::VIM::VirtualMachine
 
   def read_property(name)
     p = find_property(name)
-    p.nil? ? nil : p[:value]
+    value = nil
+    unless p.nil?
+      value = p[:value]
+      value = p[:defaultValue] if value.empty?
+    end
+    value
   end
 
-  def set_property(name, value)
+  def set_property(name, value, opts={})
+    opts = {
+        type: 'string',
+        userConfigurable: true
+      }.merge opts
+
     if config.vAppConfig && config.vAppConfig.property
       existing_property = find_property(name)
     end
@@ -198,13 +208,11 @@ class RbVmomi::VIM::VirtualMachine
         property: [
           RbVmomi::VIM.VAppPropertySpec(
             operation: operation,
-            info: {
+            info: opts.merge({
               key: property_key,
               id: name.to_s,
-              type: 'string',
-              userConfigurable: true,
-              value: value
-              })]))
+              value: value.to_s
+              }))]))
 
     if config.vAppConfig.nil? || config.vAppConfig.ovfEnvironmentTransport.empty?
       vm_config_spec[:vAppConfig][:ovfEnvironmentTransport] = ['com.vmware.guestInfo']

data/spec/vapp_property_spec.rb

@@ -0,0 +1,51 @@
+require_relative 'spec_helper'
+using VMonkey unless RUBY_VERSION.split('.')[0] == '1'
+
+describe RbVmomi::VIM::VirtualApp do
+
+  before :all do
+    @monkey   ||= VMonkey.connect
+    @vapp     ||= @monkey.vapp VM_SPEC_OPTS[:vapp_path]
+    @spec_vapp_path = "#{VM_SPEC_OPTS[:working_folder]}/vmonkey_spec_vapp"
+  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'
+        @spec_vapp.property :ip_prop, nil, type: 'ip'
+        @spec_vapp.property :ip_prop_with_default, nil, type: 'ip', defaultValue: '0.0.0.0'
+      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 }
+
+      it { expect(@spec_vapp.property :ip_prop).to be_empty }
+      it { expect(@spec_vapp.find_property(:ip_prop)[:type]).to eq 'ip' }
+
+      it { expect(@spec_vapp.property :ip_prop_with_default).to eq '0.0.0.0' }
+      it { expect(@spec_vapp.find_property(:ip_prop_with_default)[:type]).to eq 'ip' }
+    end
+
+  end
+end

data/spec/vapp_spec.rb

@@ -35,25 +35,6 @@ describe RbVmomi::VIM::VirtualApp do
       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
-
     describe '#move_to' do
       it 'should raise a RuntimeError when given a path of an existing vApp' do
         expect { @spec_vapp.move_to @spec_vapp_path }.to raise_error RuntimeError
@@ -137,6 +118,7 @@ describe RbVmomi::VIM::VirtualApp do
 
     context 'that has had #start called' do
       before(:all) { @spec_vapp.start }
+      after(:all) { @spec_vapp.stop }
 
       context 'immediately following start' do
         describe '#port_ready?' do
@@ -156,7 +138,6 @@ describe RbVmomi::VIM::VirtualApp do
         end
       end
 
-      after(:all) { @spec_vapp.stop }
     end
 
   end

data/spec/virtualmachine_property_spec.rb

@@ -0,0 +1,48 @@
+require_relative 'spec_helper'
+using VMonkey unless RUBY_VERSION.split('.')[0] == '1'
+
+describe RbVmomi::VIM::VirtualMachine do
+  before :all do
+    @monkey ||= VMonkey.connect
+    @template = @monkey.vm VM_SPEC_OPTS[:template_path]
+    @vm_path = "#{VM_SPEC_OPTS[:working_folder]}/vmonkey_spec"
+  end
+
+  context 'with a cloned VM' do
+    before(:all) { @spec_vm = @template.clone_to @vm_path }
+    after(:all)  { @spec_vm.destroy }
+
+    describe '#annotation=' do
+      it 'sets the annotation' do
+        @spec_vm.annotation = 'xyzzy'
+        expect(@spec_vm.annotation).to eq 'xyzzy'
+      end
+    end
+
+    describe '#property' do
+      before(:all) do
+        @spec_vm.property :prop, 'xyzzy'
+        @spec_vm.property :prop2, 'abc123'
+        @spec_vm.property :prop2, 'abc456'
+        @spec_vm.property :ip_prop, nil, type: 'ip'
+        @spec_vm.property :ip_prop_with_default, nil, type: 'ip', defaultValue: '0.0.0.0'
+      end
+
+      it { expect(@spec_vm.property :prop).to eq 'xyzzy' }
+      it { expect(@spec_vm.property :prop2).to eq 'abc456' }
+      it { expect(@spec_vm.property :xyzzy).to be_nil }
+
+      it { expect(@spec_vm.property :ip_prop).to be_empty }
+      it { expect(@spec_vm.find_property(:ip_prop)[:type]).to eq 'ip' }
+
+      it { expect(@spec_vm.property :ip_prop_with_default).to eq '0.0.0.0' }
+      it { expect(@spec_vm.find_property(:ip_prop_with_default)[:type]).to eq 'ip' }
+    end
+
+    describe '#property!' do
+      it 'should raise a RuntimeError given a path to a non-existent property' do
+        expect { @spec_vm.property! :xyzzy }.to raise_error RuntimeError
+      end
+    end
+  end
+end

data/spec/virtualmachine_spec.rb

@@ -84,31 +84,6 @@ describe RbVmomi::VIM::VirtualMachine do
       end
     end
 
-    describe '#annotation=' do
-      it 'sets the annotation' do
-        @spec_vm.annotation = 'xyzzy'
-        expect(@spec_vm.annotation).to eq 'xyzzy'
-      end
-    end
-
-    describe '#property' do
-      before(:all) do
-        @spec_vm.property :prop, 'xyzzy'
-        @spec_vm.property :prop2, 'abc123'
-        @spec_vm.property :prop2, 'abc456'
-      end
-
-      it { expect(@spec_vm.property :prop).to eq 'xyzzy' }
-      it { expect(@spec_vm.property :prop2).to eq 'abc456' }
-      it { expect(@spec_vm.property :xyzzy).to be_nil }
-    end
-
-    describe '#property!' do
-      it 'should raise a RuntimeError given a path to a non-existent property' do
-        expect { @spec_vm.property! :xyzzy }.to raise_error RuntimeError
-      end
-    end
-
     describe '#move_to' do
       it 'should raise a RuntimeError when given a path of an existing VM' do
         expect { @spec_vm.move_to @vm_path }.to raise_error RuntimeError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmonkey
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Brian Dupras
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -119,8 +119,10 @@ files:
 - spec/datacenter_spec.rb
 - spec/folder_spec.rb
 - spec/spec_helper.rb
+- spec/vapp_property_spec.rb
 - spec/vapp_spec.rb
 - spec/vim_spec.rb
+- spec/virtualmachine_property_spec.rb
 - spec/virtualmachine_spec.rb
 - spec/vmonkey_spec.rb
 - vmonkey.gemspec
@@ -152,7 +154,9 @@ test_files:
 - spec/datacenter_spec.rb
 - spec/folder_spec.rb
 - spec/spec_helper.rb
+- spec/vapp_property_spec.rb
 - spec/vapp_spec.rb
 - spec/vim_spec.rb
+- spec/virtualmachine_property_spec.rb
 - spec/virtualmachine_spec.rb
 - spec/vmonkey_spec.rb