vmfloaty 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b08c0be5bb4c8a57ce706db190b37bdf89532e30964aca13bd53dc4b2649d46
-  data.tar.gz: aeaeb37cde837b342ddd438b6e3c389e9e84b12fd6caa36a40fcd87ff8b0427b
+  metadata.gz: 3f04ad5dd857d55ff4d7dfa42eb344952bb2eac10d4601a911d8e7255e212d09
+  data.tar.gz: 6b2b56d9cd35e5d48062116a7c17129ed0c4404d2fe9c00461fbc6ab90570181
 SHA512:
-  metadata.gz: d7bb8b68a6dcc391184c910883e4d05c1d7c8580dd7d969f141959fdd46b0e4a9ef4c7ec141a3d4526cab557923d80d0db62e8ae11e8fd76120d2d0e5367fde8
-  data.tar.gz: d0bb6b6ff8fd727a110814ebd3836dcd344b30c0e0fb5791ac4485ed0fafe2d715d00173e7d874ec9a41488eaecd0709d1ce53a8c5162419e3285912a1746b2d
+  metadata.gz: b1785b87fc949e6088f0a8d0d17ce0a599a75bf6d117758adba8583c6aeeb88ff56b4ab3dff217cfc8029ae2115254a3a7a02e864db29a60ab6dac6d7b1eb597
+  data.tar.gz: 2d5ebc3d83665e5fcf5f6bc7ef362f5d8a340e95e456ca859579264eae7d8fa3cd447f880355efec03e31a6de4daba2a816ad46b4e0bf69b5a692949e71ba753

data/lib/vmfloaty/abs.rb

@@ -290,4 +290,16 @@ class ABS
     res = conn.get "host/#{hostname}"
     JSON.parse(res.body)
   end
+
+  def self.modify(_verbose, _url, _hostname, _token, _modify_hash)
+    raise NoMethodError, 'modify is not defined for ABS'
+  end
+
+  def self.disk(_verbose, _url, _hostname, _token, _disk)
+    raise NoMethodError, 'disk is not defined for ABS'
+  end
+
+  def self.revert(_verbose, _url, _hostname, _token, _snapshot_sha)
+    raise NoMethodError, 'revert is not defined for ABS'
+  end
 end

data/lib/vmfloaty/nonstandard_pooler.rb

@@ -77,7 +77,7 @@ class NonstandardPooler
     raise ModifyError, 'Configured service type does not support snapshots'
   end
 
-  def self.delete(verbose, url, hosts, token)
+  def self.delete(verbose, url, hosts, token, _user)
     raise TokenError, 'Token provided was nil; Request cannot be made to delete VM' if token.nil?
 
     conn = Http.get_conn(verbose, url)

data/lib/vmfloaty/pooler.rb

@@ -94,7 +94,7 @@ class Pooler
     res_body
   end
 
-  def self.delete(verbose, url, hosts, token)
+  def self.delete(verbose, url, hosts, token, _user)
     raise TokenError, 'Token provided was nil. Request cannot be made to delete vm' if token.nil?
 
     conn = Http.get_conn(verbose, url)

data/lib/vmfloaty/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Vmfloaty
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

data/spec/vmfloaty/nonstandard_pooler_spec.rb

@@ -274,7 +274,7 @@ describe NonstandardPooler do
         .with(:headers => @auth_token_headers)
         .to_return(:status => 200, :body => @delete_response_success, :headers => {})
 
-      request = NonstandardPooler.delete(false, @nspooler_url, 'sol11-7', 'token-value')
+      request = NonstandardPooler.delete(false, @nspooler_url, 'sol11-7', 'token-value', nil)
       expect(request['sol11-7']['ok']).to be true
     end
 
@@ -283,7 +283,7 @@ describe NonstandardPooler do
         .with(:headers => @auth_token_headers)
         .to_return(:status => 401, :body => @delete_response_failure, :headers => {})
 
-      request = NonstandardPooler.delete(false, @nspooler_url, 'fakehost', 'token-value')
+      request = NonstandardPooler.delete(false, @nspooler_url, 'fakehost', 'token-value', nil)
       expect(request['fakehost']['ok']).to be false
     end
   end

data/spec/vmfloaty/pooler_spec.rb

@@ -119,11 +119,11 @@ describe Pooler do
         .with(:headers => { 'X-Auth-Token' => 'mytokenfile' })
         .to_return(:status => 200, :body => @delete_response_body_success, :headers => {})
 
-      expect(Pooler.delete(false, @vmpooler_url, ['fq6qlpjlsskycq6'], 'mytokenfile')).to eq @delete_response
+      expect(Pooler.delete(false, @vmpooler_url, ['fq6qlpjlsskycq6'], 'mytokenfile', nil)).to eq @delete_response
     end
 
     it 'raises a token error if no token provided' do
-      expect { Pooler.delete(false, @vmpooler_url, ['myfakehost'], nil) }.to raise_error(TokenError)
+      expect { Pooler.delete(false, @vmpooler_url, ['myfakehost'], nil, nil) }.to raise_error(TokenError)
     end
   end
 

data/spec/vmfloaty/vmfloaty_services_spec.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+# All of the interfaces for the different services must be the
+# same, otherwise there will be errors when you change the caller
+# for the services from services.rb.
+#
+
+require_relative '../../lib/vmfloaty/pooler'
+require_relative '../../lib/vmfloaty/abs'
+require_relative '../../lib/vmfloaty/nonstandard_pooler'
+
+shared_examples 'a vmfloaty service' do
+  it { is_expected.to respond_to(:delete).with(5).arguments }
+  it { is_expected.to respond_to(:disk).with(5).arguments }
+  it { is_expected.to respond_to(:list).with(3).arguments }
+  it { is_expected.to respond_to(:list_active).with(4).arguments }
+  it { is_expected.to respond_to(:modify).with(5).arguments }
+  it { is_expected.to respond_to(:retrieve).with(6).arguments }
+  it { is_expected.to respond_to(:revert).with(5).arguments }
+  it { is_expected.to respond_to(:query).with(3).arguments }
+  it { is_expected.to respond_to(:snapshot).with(4).arguments }
+  it { is_expected.to respond_to(:status).with(2).arguments }
+  it { is_expected.to respond_to(:summary).with(2).arguments }
+end
+
+describe Pooler do
+  subject { Pooler }
+  it_behaves_like 'a vmfloaty service'
+end
+
+describe ABS do
+  subject { ABS }
+  it_behaves_like 'a vmfloaty service'
+end
+
+describe NonstandardPooler do
+  subject { NonstandardPooler }
+  it_behaves_like 'a vmfloaty service'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmfloaty
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Brian Cain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-17 00:00:00.000000000 Z
+date: 2020-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -84,6 +84,7 @@ files:
 - spec/vmfloaty/pooler_spec.rb
 - spec/vmfloaty/service_spec.rb
 - spec/vmfloaty/utils_spec.rb
+- spec/vmfloaty/vmfloaty_services_spec.rb
 homepage: https://github.com/briancain/vmfloaty
 licenses:
 - Apache-2.0
@@ -116,4 +117,5 @@ test_files:
 - spec/vmfloaty/nonstandard_pooler_spec.rb
 - spec/vmfloaty/abs_spec.rb
 - spec/vmfloaty/pooler_spec.rb
+- spec/vmfloaty/vmfloaty_services_spec.rb
 - spec/vmfloaty/abs/auth_spec.rb