fog-vsphere 1.11.3 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 259e868ec79a58fd97457645401a8771432781d2
-  data.tar.gz: 5e4890489b7f412b31af88069c3fae0f2b32bf68
+  metadata.gz: 6948368d6c3ede9335c8c621c43c5c72a54f8747
+  data.tar.gz: e5eb87794542a2b897959da77baedea015f77d97
 SHA512:
-  metadata.gz: cf035226cec5df7395df07c46707af0369ed277dddc60ef41bf2bb8c737a01092db58b614b22ffd9285f5158b713711b078f37fa7858341243792b940c416734
-  data.tar.gz: 91398f19bfd736f7e14a1f91c5178a49b18a888baf4f6d225b440a9b3ac56865f4de54ef0fa450fb0acff76357f852fc5c553cc0622bb2a9eec860db0dbc80f8
+  metadata.gz: d7b9b802dbbf729f610364aa5a08fe9ad2bce3f1653ff6832db9ed752c362028342fad45571ffa13ca69f3c357ad727ad415a94c6699797021696e2d33b55f2a
+  data.tar.gz: d1e3c7165715a76e4b08d3ba9af8e16895c426396bef500986d02be02bb7cae94e6a41c9daf3d4feee2f3362a04471f7a1e53b52eea2e74b1d8a3dd8ec037bac

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.12.0
+
+* Add existing state validation for power on/off requests
+* Add ability for server to acquire WebMKS ticket
+
 ## v1.11.3
 
 * Fix issue when cloning and interface is in boot order

data/CONTRIBUTORS.md

@@ -75,6 +75,7 @@
 * karmab <karimboumedhel@gmail.com>
 * karimb <karimboumedhel@gmail.com>
 * milo_cheung <milo.cheung@appcara.com>
+* scottd018 <scottd018@users.noreply.github.com>
 * slivik <jakub.sliva@gmail.com>
 * theOpenBit <theopenbit@users.noreply.github.com>
 * tipt0e <topo-2@charter.net>

data/lib/fog/vsphere/compute.rb

@@ -49,6 +49,8 @@ module Fog
       collection :rules
       model :host
       collection :hosts
+      model :ticket
+      collection :tickets
 
       request_path 'fog/vsphere/requests/compute'
       request :current_time
@@ -123,6 +125,7 @@ module Fog
       request :modify_vm_controller
       request :vm_revert_snapshot
       request :vm_remove_snapshot
+      request :vm_acquire_ticket
 
       module Shared
         attr_reader :vsphere_is_vcenter

data/lib/fog/vsphere/models/compute/server.rb

@@ -97,13 +97,13 @@ module Fog
 
         def start(options = {})
           requires :instance_uuid
-          service.vm_power_on('instance_uuid' => instance_uuid)
+          service.vm_power_on('instance_uuid' => instance_uuid) unless ready?
         end
 
         def stop(options = {})
           options = { :force => !tools_installed? || !tools_running? }.merge(options)
           requires :instance_uuid
-          service.vm_power_off('instance_uuid' => instance_uuid, 'force' => options[:force])
+          service.vm_power_off('instance_uuid' => instance_uuid, 'force' => options[:force]) unless power_state == 'poweredOff'
         end
 
         def suspend(options = {})
@@ -324,6 +324,10 @@ module Fog
           (path.split('/').reject {|e| e.empty?} - ["Datacenters", datacenter, "vm"]).join("/")
         end
 
+        def acquire_ticket(type = nil)
+          service.tickets(:server => self).create
+        end
+
         private
 
         def defaults

data/lib/fog/vsphere/models/compute/ticket.rb

@@ -0,0 +1,17 @@
+require 'fog/compute/models/server'
+
+module Fog
+  module Compute
+    class Vsphere
+      class Ticket < Fog::Model
+
+        attribute :server_id
+
+        attribute :ticket
+        attribute :host
+        attribute :port
+        attribute :ssl_thumbprint
+      end
+    end
+  end
+end

data/lib/fog/vsphere/models/compute/tickets.rb

@@ -0,0 +1,25 @@
+module Fog
+  module Compute
+    class Vsphere
+      class Tickets < Fog::Collection
+        autoload :Ticket, File.expand_path('../ticket', __FILE__)
+
+        model Fog::Compute::Vsphere::Ticket
+
+        attr_accessor :server
+
+        def create(opts = {})
+          requires :server
+          raise 'server must be a Fog::Compute::Vsphere::Server' unless server.is_a?(Fog::Compute::Vsphere::Server)
+          new(
+            service.vm_acquire_ticket(
+              opts.merge(
+                'instance_uuid' => server.instance_uuid
+              )
+            )
+          )
+        end
+     end
+    end
+  end
+end

data/lib/fog/vsphere/requests/compute/vm_acquire_ticket.rb

@@ -0,0 +1,34 @@
+module Fog
+  module Compute
+    class Vsphere
+      class Real
+        def vm_acquire_ticket(options = {})
+          raise ArgumentError, "instance_uuid is a required parameter" unless options.key?('instance_uuid')
+          ticket_type = options['ticket_type'] || 'webmks'
+
+          vm_mob_ref = get_vm_ref(options['instance_uuid'])
+
+          ticket = vm_mob_ref.AcquireTicket(:ticketType => ticket_type)
+          {
+            'ticket' => ticket.ticket,
+            'host' => ticket.host,
+            'port' => ticket.port,
+            'ssl_thumbprint' => ticket.sslThumbprint
+          }
+        end
+      end
+
+      class Mock
+        def vm_acquire_ticket(options = {})
+          raise ArgumentError, "instance_uuid is a required parameter" unless options.key?('instance_uuid')
+          {
+            'ticket' => 'fdsfdsf',
+            'host' => 'esxi.example.com',
+            'port' => 443,
+            'ssl_thumbprint' => '1C:63:E1:BD:56:03:EB:44:85:12:12:FC:DA:40:11:65:0E:30:A1:B8'
+          }
+        end
+      end
+    end
+  end
+end

data/lib/fog/vsphere/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Vsphere
-    VERSION = '1.11.3'.freeze
+    VERSION = '1.12.0'.freeze
   end
 end

data/tests/models/compute/server_tests.rb

@@ -36,6 +36,9 @@ Shindo.tests('Fog::Compute[:vsphere] | server model', ['vsphere']) do
           end
         end
       end
+      test('tickets') do
+        test('acquire ticket successfully') { server.acquire_ticket.kind_of? Fog::Compute::Vsphere::Ticket }
+      end
     end
     tests('have attributes') do
       model_attribute_hash = server.attributes

data/tests/models/compute/ticket_tests.rb

@@ -0,0 +1,14 @@
+Shindo.tests('Fog::Compute[:vsphere] | hosts collection', ['vsphere']) do
+
+  servers = Fog::Compute[:vsphere].servers
+  server = servers.last
+  ticket = server.acquire_ticket
+
+  tests('A ticket') do
+    test('should have a ticket') { not ticket.ticket.empty? }
+    test('should have a host') { not ticket.host.empty? }
+    test('should have a port') { ticket.port.kind_of? Fixnum }
+    test('should have a ssl ssl_thumbprint') { not ticket.ssl_thumbprint.empty? }
+  end
+
+end

data/tests/models/compute/tickets_tests.rb

@@ -0,0 +1,10 @@
+Shindo.tests('Fog::Compute[:vsphere] | hosts collection', ['vsphere']) do
+
+  service = Fog::Compute[:vsphere]
+  server = service.servers.last
+
+  tests('The tickets collection') do
+    test('should create a ticket for a server') { service.tickets(:server => server).create.kind_of? Fog::Compute::Vsphere::Ticket }
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.11.3
+  version: 1.12.0
 platform: ruby
 authors:
 - J.R. Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-27 00:00:00.000000000 Z
+date: 2017-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -182,6 +182,8 @@ files:
 - lib/fog/vsphere/models/compute/storage_pods.rb
 - lib/fog/vsphere/models/compute/template.rb
 - lib/fog/vsphere/models/compute/templates.rb
+- lib/fog/vsphere/models/compute/ticket.rb
+- lib/fog/vsphere/models/compute/tickets.rb
 - lib/fog/vsphere/models/compute/volume.rb
 - lib/fog/vsphere/models/compute/volumes.rb
 - lib/fog/vsphere/requests/compute/cloudinit_to_customspec.rb
@@ -238,6 +240,7 @@ files:
 - lib/fog/vsphere/requests/compute/revert_to_snapshot.rb
 - lib/fog/vsphere/requests/compute/set_vm_customvalue.rb
 - lib/fog/vsphere/requests/compute/upload_iso.rb
+- lib/fog/vsphere/requests/compute/vm_acquire_ticket.rb
 - lib/fog/vsphere/requests/compute/vm_clone.rb
 - lib/fog/vsphere/requests/compute/vm_config_vnc.rb
 - lib/fog/vsphere/requests/compute/vm_destroy.rb
@@ -268,6 +271,8 @@ files:
 - tests/models/compute/server_tests.rb
 - tests/models/compute/server_unit_tests.rb
 - tests/models/compute/servers_tests.rb
+- tests/models/compute/ticket_tests.rb
+- tests/models/compute/tickets_tests.rb
 - tests/requests/compute/current_time_tests.rb
 - tests/requests/compute/folder_destroy_tests.rb
 - tests/requests/compute/get_network_tests.rb
@@ -316,7 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support VMware vSphere.
@@ -332,6 +337,8 @@ test_files:
 - tests/models/compute/server_tests.rb
 - tests/models/compute/server_unit_tests.rb
 - tests/models/compute/servers_tests.rb
+- tests/models/compute/ticket_tests.rb
+- tests/models/compute/tickets_tests.rb
 - tests/requests/compute/current_time_tests.rb
 - tests/requests/compute/folder_destroy_tests.rb
 - tests/requests/compute/get_network_tests.rb