vm_shepherd 3.4.3 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43d31078d70454ba342478843bfe081cd0f1ad09
-  data.tar.gz: ad2929a6441cd0b6b41641be5c9960fa4b65efbc
+  metadata.gz: a056d918fa69521babd0636b90a36bbc4e75a9bc
+  data.tar.gz: 23ec4f0d83d118542fc213139604efaaa5b52fd2
 SHA512:
-  metadata.gz: 2b0287bcc30353b217f60b924df03b22566c7dfb9b2a214d83f7e6dd74c224d9762c5770c55757d93ad2f467e0b794e074d4a4df156a6147d918725e9b4d705b
-  data.tar.gz: 1727afdb454f41b600a8916a94f5e3757619936fed96b53857c8b4997506f273dcb010b7e86c30d2b6d526a643876652a6444d30a0b030fe548027b79f587d84
+  metadata.gz: ce2cf10d6f705dd3633ec9d3c537c97131568ca6d91f5692a3c887d2f42fb44ffbd28ed854814f0d953a842f4424fcad651410c0b0b436a7b8af26dba7ab3a0d
+  data.tar.gz: be9a971752b45af0359c8bd41825ef85f545ba97a1f69b29119a96816e4821de46ee7e43aeca36705127d99551860c932da318aa5b6c89df0a81fb33b9e586f3

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Pivotal CF
+Copyright (c) 2013-Present Pivotal Software, Inc.
 
 MIT License
 

data/lib/vm_shepherd/shepherd.rb

@@ -8,10 +8,11 @@ module VmShepherd
     class InvalidIaas < StandardError;
     end
 
-    def initialize(settings:)
+    def initialize(settings:,system_env:)
       @iaas_type = settings.dig('iaas_type')
       @configs = settings.dig('vm_shepherd', 'vm_configs') || []
       @env_config = settings.dig('vm_shepherd', 'env_config')
+      @system_env = system_env
     end
 
     def deploy(paths:)
@@ -190,12 +191,21 @@ module VmShepherd
         cpus: input_config.dig('vm', 'cpus'),
         ram_mb: input_config.dig('vm', 'ram_mb'),
         vm_password: (input_config.dig('vm', 'vm_password') || 'tempest'),
+        public_ssh_key: read_assets_home(input_config.dig('vm', 'public_ssh_key')),
       }.tap do |result|
         hostname = input_config.dig('vm', 'custom_hostname')
         result[:custom_hostname] = hostname unless hostname.nil?
       end
     end
 
+    def read_assets_home(path_or_value)
+      assets_home = @system_env.to_h.dig('ASSETS_HOME')
+      return path_or_value if path_or_value.nil? || assets_home.nil?
+
+      file_path = File.join(assets_home, path_or_value)
+      File.read(file_path)
+    end
+
     def vcloud_deploy_options(vm_shepherd_config)
       VmShepherd::Vcloud::VappConfig.new(
         name: vm_shepherd_config.dig('vapp', 'ops_manager_name'),

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '3.4.3'.freeze
+  VERSION = '3.5.0'.freeze
 end

data/lib/vm_shepherd/vsphere_manager.rb

@@ -296,6 +296,15 @@ module VmShepherd
         spec.operation = 'edit'
         spec.info      = RbVmomi::VIM::VAppPropertyInfo.new.tap do |p|
           p.key   = 6 # ditto. see above. it makes me sad, too.
+          p.label = 'public_ssh_key'
+          p.value = vm_config[:public_ssh_key]
+        end
+      end
+
+      vapp_property_specs << RbVmomi::VIM::VAppPropertySpec.new.tap do |spec|
+        spec.operation = 'edit'
+        spec.info      = RbVmomi::VIM::VAppPropertyInfo.new.tap do |p|
+          p.key   = 7 # ditto. see above. it makes me sad, too.
           p.label = 'custom_hostname'
           p.value = vm_config[:custom_hostname]
         end

data/spec/fixtures/shepherd/vsphere.yml

@@ -18,6 +18,7 @@ vm_shepherd:
       netmask: OVA_NETMASK
       dns: OVA_DNS
       ntp_servers: OVA_NTP
+      public_ssh_key: OVA_SSH_KEY
       cpus: OVA_CPUS
       ram_mb: OVA_RAM_MB
       vm_password: not-tempest

data/spec/vm_shepherd/shepherd_spec.rb

@@ -1,3 +1,5 @@
+#require 'tmpdir'
+#require 'fileutils'
 require 'vm_shepherd/backport_refinements'
 using VmShepherd::BackportRefinements
 
@@ -5,7 +7,8 @@ require 'vm_shepherd/shepherd'
 
 module VmShepherd
   RSpec.describe Shepherd do
-    subject(:manager) { Shepherd.new(settings: settings) }
+    subject(:manager) { Shepherd.new(settings: settings, system_env: system_env) }
+    let(:system_env) { {} }
     let(:first_config) { settings.dig('vm_shepherd', 'vm_configs').first }
     let(:last_config) { settings.dig('vm_shepherd', 'vm_configs').last }
     let(:settings) { YAML.load_file(File.join(SPEC_ROOT, 'fixtures', 'shepherd', settings_fixture_name)) }
@@ -151,6 +154,7 @@ module VmShepherd
               cpus:        first_config.dig('vm', 'cpus'),
               ram_mb:      first_config.dig('vm', 'ram_mb'),
               vm_password: first_config.dig('vm', 'vm_password'),
+              public_ssh_key:  first_config.dig('vm', 'public_ssh_key'),
               custom_hostname: first_config.dig('vm', 'custom_hostname')
             },
             {
@@ -171,6 +175,7 @@ module VmShepherd
               dns:         last_config.dig('vm', 'dns'),
               ntp_servers: last_config.dig('vm', 'ntp_servers'),
               vm_password: 'tempest',
+              public_ssh_key: nil,
               cpus:        last_config.dig('vm', 'cpus'),
               ram_mb:      last_config.dig('vm', 'ram_mb'),
             },
@@ -189,6 +194,93 @@ module VmShepherd
         it 'fails if improper paths are given' do
           expect { manager.deploy(paths: ['FIRST_FAKE_PATH']) }.to raise_error(ArgumentError)
         end
+
+        context 'when the ASSETS_HOME path is available' do
+          let(:first_config) do
+            settings.dig('vm_shepherd', 'vm_configs').first.tap do |vm_config|
+              vm_config.dig('vm').merge!({ 'public_ssh_key' => 'subdir/pub.key' })
+            end
+          end
+          let(:system_env) { { 'ASSETS_HOME' => assets_home } }
+          let(:assets_home) { Dir.mktmpdir }
+
+          before do
+            assets_subdir = File.join(assets_home, 'subdir')
+            Dir.mkdir(assets_subdir)
+            File.open(File.join(assets_subdir, 'pub.key'), 'w') do |f|
+              f.write('public key contents')
+            end
+          end
+
+          after do
+            FileUtils.rm_rf(assets_home)
+          end
+
+          it 'reads the value from the relative path in ASSETS_HOME' do
+            expect(VsphereManager).to receive(:new).with(
+              first_config.dig('vcenter_creds', 'ip'),
+              first_config.dig('vcenter_creds', 'username'),
+              first_config.dig('vcenter_creds', 'password'),
+              first_config.dig('vsphere', 'datacenter'),
+              instance_of(Logger),
+            ).and_return(first_ova_manager)
+
+            expect(VsphereManager).to receive(:new).with(
+              last_config.dig('vcenter_creds', 'ip'),
+              last_config.dig('vcenter_creds', 'username'),
+              last_config.dig('vcenter_creds', 'password'),
+              last_config.dig('vsphere', 'datacenter'),
+              instance_of(Logger),
+            ).and_return(last_ova_manager)
+
+            expect(first_ova_manager).to receive(:deploy).with(
+              'FIRST_FAKE_PATH',
+              {
+                ip:          first_config.dig('vm', 'ip'),
+                gateway:     first_config.dig('vm', 'gateway'),
+                netmask:     first_config.dig('vm', 'netmask'),
+                dns:         first_config.dig('vm', 'dns'),
+                ntp_servers: first_config.dig('vm', 'ntp_servers'),
+                cpus:        first_config.dig('vm', 'cpus'),
+                ram_mb:      first_config.dig('vm', 'ram_mb'),
+                vm_password: first_config.dig('vm', 'vm_password'),
+                public_ssh_key:     'public key contents',
+                custom_hostname: first_config.dig('vm', 'custom_hostname')
+              },
+              {
+                cluster:       first_config.dig('vsphere', 'cluster'),
+                resource_pool: first_config.dig('vsphere', 'resource_pool'),
+                datastore:     first_config.dig('vsphere', 'datastore'),
+                network:       first_config.dig('vsphere', 'network'),
+                folder:        first_config.dig('vsphere', 'folder'),
+              },
+            )
+
+            expect(last_ova_manager).to receive(:deploy).with(
+              'LAST_FAKE_PATH',
+              {
+                ip:          last_config.dig('vm', 'ip'),
+                gateway:     last_config.dig('vm', 'gateway'),
+                netmask:     last_config.dig('vm', 'netmask'),
+                dns:         last_config.dig('vm', 'dns'),
+                ntp_servers: last_config.dig('vm', 'ntp_servers'),
+                vm_password: 'tempest',
+                public_ssh_key: nil,
+                cpus:        last_config.dig('vm', 'cpus'),
+                ram_mb:      last_config.dig('vm', 'ram_mb'),
+              },
+              {
+                cluster:       last_config.dig('vsphere', 'cluster'),
+                resource_pool: last_config.dig('vsphere', 'resource_pool'),
+                datastore:     last_config.dig('vsphere', 'datastore'),
+                network:       last_config.dig('vsphere', 'network'),
+                folder:        last_config.dig('vsphere', 'folder'),
+              },
+            )
+
+            manager.deploy(paths: ['FIRST_FAKE_PATH', 'LAST_FAKE_PATH'])
+          end
+        end
       end
 
       context 'with AWS settings' do

data/spec/vm_shepherd/vsphere_manager_spec.rb

@@ -97,6 +97,27 @@ module VmShepherd
           subject.deploy(ova_path, vm_config, vsphere_config)
         end
       end
+
+      context 'when the ssh key is set' do
+        let(:vm_config) { { ip: '10.0.0.1', public_ssh_key: 'ssh-key-contents' } }
+        it 'sets the ssh key' do
+          expect(vsphere_manager).to receive(:create_vm_from_template).and_return(vm1)
+          allow(subject).to receive(:power_on_vm)
+          allow(task).to receive(:wait_for_completion)
+
+          expect(vm1).to receive(:ReconfigVM_Task) do |options|
+            ssh_key_property = options[:spec].vAppConfig.property.find do |prop|
+              prop.instance_variable_get(:@props)[:info].instance_variable_get(:@props)[:label] == 'public_ssh_key'
+            end
+            expect(ssh_key_property).to_not be_nil
+            ssh_key_value = ssh_key_property.instance_variable_get(:@props)[:info].instance_variable_get(:@props)[:value]
+            expect(ssh_key_value).to eq('ssh-key-contents')
+            task
+          end
+
+          subject.deploy(ova_path, vm_config, vsphere_config)
+        end
+      end
     end
 
     describe 'clean_environment' do

data/vm_shepherd.gemspec

@@ -19,11 +19,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'aws-sdk-v1'
   spec.add_dependency 'fog', '1.34.0'
-  spec.add_dependency 'net-ssh' # because fog uses this but doesn't require it
+  spec.add_dependency 'net-ssh', '4.2.0' # because fog uses this but doesn't require it
 
   spec.add_dependency 'ruby_vcloud_sdk', '0.7.4'
 
-  spec.add_dependency 'rbvmomi'
+  spec.add_dependency 'rbvmomi', '1.11.3'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 3.4.3
+  version: 3.5.0
 platform: ruby
 authors:
 - Ops Manager Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-17 00:00:00.000000000 Z
+date: 2018-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
@@ -42,16 +42,16 @@ dependencies:
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: ruby_vcloud_sdk
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +70,16 @@ dependencies:
   name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.11.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.11.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement