vm_shepherd 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de929fb4a764180cac7a407c9af64ae3e366aa2d
-  data.tar.gz: 7cb4fbeab70a0a935dbf86207bac4bd4ac52a4ef
+  metadata.gz: d4efffe61b1dadc42e8b80ea6418891f27123a06
+  data.tar.gz: 7939d7f0d8dfb2f0adb5cf189fb548e214e9f55b
 SHA512:
-  metadata.gz: c88e36d8e2d33eda28ff8d8393ea30a1dab8e5fbfe02be84c38c0a9bc48d4d52c4f163a391e9a1b896de7322aec3cb649e95944eec3eb24c325581fcd604e425
-  data.tar.gz: df3b18222e369f83fe355d09dc5eb9c89879c3164546c3ca99b3660a1632875ca23a069f6350bada169c34338eb3ce89c47c42a6db5096cc8c078c31df875895
+  metadata.gz: f3051aeb00de1e9af855be8b5613304586e598cfc60e4b303f4f0207ec0c83c3c0ccde5059f1c0eb34e790afb719fdea8502614d612d5b009c7238365441834a
+  data.tar.gz: 3a5b21ce773494d42dd0fcd93454d93621e6982a759905167c32991a7d4c471adca20099783ff702d322b24bf0e74e75c77c8cee2c0012b92b8d716362ac8dad

data/lib/vm_shepherd/openstack_manager.rb

@@ -20,7 +20,7 @@ module VmShepherd
       )
       say 'Finished uploading the image'
 
-      flavor = find_flavor(vm_options[:min_disk_size])
+      flavor = find_flavor(vm_options[:flavor_name])
       network = network_service.networks.find { |net| net.name == vm_options[:network_name] }
       security_groups = vm_options[:security_group_names]
 
@@ -152,8 +152,8 @@ module VmShepherd
       puts message
     end
 
-    def find_flavor(min_disk)
-      service.flavors.find { |flavor| flavor.disk >= min_disk }
+    def find_flavor(flavor_name)
+      service.flavors.find { |flavor| flavor.name == flavor_name }
     end
   end
 end

data/lib/vm_shepherd/shepherd.rb

@@ -219,7 +219,7 @@ module VmShepherd
     def openstack_vm_options(vm_shepherd_config)
       {
         name: vm_shepherd_config.vm.name,
-        min_disk_size: vm_shepherd_config.vm.flavor_parameters.min_disk_size,
+        flavor_name: vm_shepherd_config.vm.flavor_name,
         network_name: vm_shepherd_config.vm.network_name,
         key_name: vm_shepherd_config.vm.key_name,
         security_group_names: vm_shepherd_config.vm.security_group_names,

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '1.1.1'.freeze
+  VERSION = '1.2.0'.freeze
 end

data/spec/fixtures/shepherd/openstack.yml

@@ -8,8 +8,7 @@ vm_shepherd:
       tenant: 'tenant'
     vm:
       name: 'some-vm-name'
-      flavor_parameters:
-        min_disk_size: 150
+      flavor_name: 'some-flavor'
       network_name: 'some-network'
       key_name: 'some-key'
       security_group_names:
@@ -25,8 +24,7 @@ vm_shepherd:
       tenant: 'tenant-2'
     vm:
       name: 'some-vm-name-2'
-      flavor_parameters:
-        min_disk_size: 152
+      flavor_name: 'some-flavor-2'
       network_name: 'some-network-2'
       key_name: 'some-key-2'
       security_group_names:

data/spec/vm_shepherd/openstack_manager_spec.rb

@@ -17,7 +17,7 @@ module VmShepherd
     let(:openstack_vm_options) do
       {
         name: 'some-vm-name',
-        min_disk_size: 150,
+        flavor_name: 'some-flavor',
         network_name: 'Public',
         key_name: 'some-key',
         security_group_names: [
@@ -86,6 +86,7 @@ module VmShepherd
       let(:image_service) { openstack_vm_manager.image_service }
       let(:network_service) { openstack_vm_manager.network_service }
 
+      let(:flavors) { compute_service.flavors }
       let(:servers) { compute_service.servers }
       let(:addresses) { compute_service.addresses }
       let(:instance) { servers.find { |server| server.name == openstack_vm_options[:name] } }
@@ -99,7 +100,10 @@ module VmShepherd
         Fog::Mock.delay = 0
 
         allow(compute_service).to receive(:servers).and_return(servers)
+        allow(compute_service).to receive(:flavors).and_return(flavors)
         allow(compute_service).to receive(:addresses).and_return(addresses)
+
+        flavors << flavors.create(name: 'some-flavor', ram: 1, vcpus: 1, disk: 1)
       end
 
       it 'uploads the image' do
@@ -122,10 +126,11 @@ module VmShepherd
         end
 
         it 'uses the correct flavor for the instance' do
+
           openstack_vm_manager.deploy(path, openstack_vm_options)
 
           instance_flavor = compute_service.flavors.find { |flavor| flavor.id == instance.flavor['id'] }
-          expect(instance_flavor.disk).to be >= 150
+          expect(instance_flavor.name).to eq('some-flavor')
         end
 
         it 'uses the previously uploaded image' do
@@ -185,6 +190,7 @@ module VmShepherd
       let(:image_service) { openstack_vm_manager.image_service }
 
       let(:servers) { compute_service.servers }
+      let(:flavors) { compute_service.flavors }
       let(:images) { image_service.images }
       let(:image) { images.find { |image| image.name == openstack_vm_options[:name] } }
       let(:instance) { servers.find { |server| server.name == openstack_vm_options[:name] } }
@@ -197,9 +203,11 @@ module VmShepherd
         Fog::Mock.reset
         Fog::Mock.delay = 0
 
+        allow(compute_service).to receive(:flavors).and_return(flavors)
         allow(compute_service).to receive(:servers).and_return(servers)
         allow(image_service).to receive(:images).and_return(images)
 
+        flavors << flavors.create(name: 'some-flavor', ram: 1, vcpus: 1, disk: 1)
         openstack_vm_manager.deploy(path, openstack_vm_options)
       end
 

data/spec/vm_shepherd/shepherd_spec.rb

@@ -205,7 +205,7 @@ module VmShepherd
         let(:first_openstack_vm_options) do
           {
             name: 'some-vm-name',
-            min_disk_size: 150,
+            flavor_name: 'some-flavor',
             network_name: 'some-network',
             key_name: 'some-key',
             security_group_names: [
@@ -220,7 +220,7 @@ module VmShepherd
         let(:last_openstack_vm_options) do
           {
             name: 'some-vm-name-2',
-            min_disk_size: 152,
+            flavor_name: 'some-flavor-2',
             network_name: 'some-network-2',
             key_name: 'some-key-2',
             security_group_names: [
@@ -357,7 +357,7 @@ module VmShepherd
         let(:first_openstack_vm_options) do
           {
             name: 'some-vm-name',
-            min_disk_size: 150,
+            flavor_name: 'some-flavor',
             network_name: 'some-network',
             key_name: 'some-key',
             security_group_names: [
@@ -380,7 +380,7 @@ module VmShepherd
         let(:last_openstack_vm_options) do
           {
             name: 'some-vm-name-2',
-            min_disk_size: 152,
+            flavor_name: 'some-flavor-2',
             network_name: 'some-network-2',
             key_name: 'some-key-2',
             security_group_names: [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Ops Manager Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: A tool for booting and tearing down Ops Manager VMs on various Infrastructures.