vm_shepherd 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ceb0f3801ef527e92ea81d31838858b713d4cdc
-  data.tar.gz: 4914b2c8d350a735ad021c8504790f6608fefddc
+  metadata.gz: 3c10ea04c94a577b4dc32587cf9aee9191d7bf6a
+  data.tar.gz: 891e6c41c038a3ef7c575ab2daa72cc525eea7ae
 SHA512:
-  metadata.gz: 07612bcc114e6b4b59557b7557cbed0529381629678b162f1e15b8a14d3a0f7516c7c35aa459661b26688cc032db30e57a21cd88d363086dcbcd875edbae5fd9
-  data.tar.gz: 80f1e48934c3134b55d7a82d4816b3f6e92f677c4ac967204e35f763ecc4b97406ff37356887b085441b2ab1b05902930ec1689a251a69c60cb7f5001a2b6479
+  metadata.gz: d0ce28324a805225b14345ec26ae9ec9c316f12ccbcc1d4d065aa488e8ac3e25ea5c2b4bc7bd4f6a096b1397a34c1233c875e12f30eb5a784a70db4b410e7aef
+  data.tar.gz: 962302ec67a987eab006fe33f21c5ae2edd518f6683e4c26252be259948f697e7975fc7a02b2bec0bf362ed27946a374590a2f629ac57007f2ed5d603f3567c3

data/lib/vm_shepherd/shepherd.rb

@@ -68,13 +68,9 @@ module VmShepherd
               user: settings.vm_shepherd.creds.user,
               password: settings.vm_shepherd.creds.password,
             },
-            {
-              vdc: settings.vm_shepherd.vdc.name,
-              catalog: settings.vm_shepherd.vdc.catalog,
-              network: settings.vm_shepherd.vdc.network,
-            },
+            settings.vm_shepherd.vdc.name,
             error_logger
-          ).destroy([settings.vm_shepherd.vapp.ops_manager_name] + settings.vm_shepherd.vapp.product_names)
+          ).destroy([settings.vm_shepherd.vapp.ops_manager_name], settings.vm_shepherd.vdc.catalog)
         when VmShepherd::VSPHERE_IAAS_TYPE then
           VmShepherd::VsphereManager.new(
             settings.vm_shepherd.vcenter_creds.ip,
@@ -101,13 +97,9 @@ module VmShepherd
               user: settings.vm_shepherd.creds.user,
               password: settings.vm_shepherd.creds.password,
             },
-            {
-              vdc: settings.vm_shepherd.vdc.name,
-              catalog: settings.vm_shepherd.vdc.catalog,
-              network: settings.vm_shepherd.vdc.network,
-            },
-            error_logger
-          ).clean_environment
+            settings.vm_shepherd.vdc.name,
+            error_logger,
+          ).clean_environment(settings.vm_shepherd.vapp.product_names, settings.vm_shepherd.vapp.product_catalog)
         when VmShepherd::VSPHERE_IAAS_TYPE then
           VmShepherd::VsphereManager.new(
             settings.vm_shepherd.vcenter_creds.ip,

data/lib/vm_shepherd/vcloud_manager.rb

@@ -4,13 +4,10 @@ require 'ruby_vcloud_sdk'
 
 module VmShepherd
   class VcloudManager
-    def initialize(login_info, location, logger)
+    def initialize(login_info, vdc_name, logger)
       @login_info = login_info
-      @location = location
+      @vdc_name = vdc_name
       @logger = logger
-      raise 'VDC must be set' unless @location[:vdc]
-      raise 'Catalog must be set' unless @location[:catalog]
-      raise 'Network must be set' unless @location[:network]
     end
 
     def deploy(vapp_template_tar_path, vapp_config)
@@ -27,12 +24,13 @@ module VmShepherd
       FileUtils.remove_entry_secure(tmpdir, force: true)
     end
 
-    def destroy(vapp_names)
+    def destroy(vapp_names, catalog)
       delete_vapps(vapp_names)
-      delete_catalog
+      delete_catalog(catalog)
     end
 
-    def clean_environment
+    def clean_environment(vapp_names, catalog)
+      destroy(vapp_names, catalog)
     end
 
     private
@@ -62,16 +60,16 @@ module VmShepherd
 
     def deploy_vapp(ovf_dir, vapp_config)
       # setup the catalog
-      client.delete_catalog_by_name(@location[:catalog]) if client.catalog_exists?(@location[:catalog])
-      catalog = client.create_catalog(@location[:catalog])
+      client.delete_catalog_by_name(vapp_config[:catalog]) if client.catalog_exists?(vapp_config[:catalog])
+      catalog = client.create_catalog(vapp_config[:catalog])
 
       # upload template and instantiate vapp
-      catalog.upload_vapp_template(@location[:vdc], vapp_config[:name], ovf_dir)
+      catalog.upload_vapp_template(@vdc_name, vapp_config[:name], ovf_dir)
 
       # instantiate template
-      network_config = VCloudSdk::NetworkConfig.new(@location[:network], 'Network 1')
+      network_config = VCloudSdk::NetworkConfig.new(vapp_config[:network], 'Network 1')
       catalog.instantiate_vapp_template(
-        vapp_config[:name], @location[:vdc], vapp_config[:name], nil, nil, network_config)
+        vapp_config[:name], @vdc_name, vapp_config[:name], nil, nil, network_config)
     rescue => e
       @logger.error(e.http_body) if e.respond_to?(:http_body)
       raise e
@@ -155,7 +153,7 @@ module VmShepherd
     end
 
     def vdc
-      @vdc ||= client.find_vdc_by_name(@location[:vdc])
+      @vdc ||= client.find_vdc_by_name(@vdc_name)
     end
 
     def delete_vapps(vapp_names)
@@ -170,8 +168,8 @@ module VmShepherd
       end
     end
 
-    def delete_catalog
-      client.delete_catalog_by_name(@location[:catalog]) if client.catalog_exists?(@location[:catalog])
+    def delete_catalog(catalog)
+      client.delete_catalog_by_name(catalog) if client.catalog_exists?(catalog)
     end
   end
 end

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.6.0'.freeze
 end

data/spec/fixtures/shepherd/vcloud.yml

@@ -11,9 +11,10 @@ vm_shepherd:
     network: VDC_NETWORK
   vapp:
     ops_manager_name: VAPP_NAME
+    product_catalog: PRODUCT_CATALOG
     product_names:
-    - PRODUCT_1
-    - PRODUCT_2
+      - PRODUCT_1
+      - PRODUCT_2
     ip: VAPP_IP
     public_ip:
     gateway: VAPP_GATEWAY

data/spec/vm_shepherd/shepherd_spec.rb

@@ -170,15 +170,14 @@ module VmShepherd
                 user: settings.vm_shepherd.creds.user,
                 password: settings.vm_shepherd.creds.password,
               },
-              {
-                vdc: settings.vm_shepherd.vdc.name,
-                catalog: settings.vm_shepherd.vdc.catalog,
-                network: settings.vm_shepherd.vdc.network,
-              },
+              settings.vm_shepherd.vdc.name,
               instance_of(Logger)
             ).and_return(vcloud_manager)
-          vapp_names = [settings.vm_shepherd.vapp.ops_manager_name] + settings.vm_shepherd.vapp.product_names
-          expect(vcloud_manager).to receive(:destroy).with(vapp_names)
+
+          expect(vcloud_manager).to receive(:destroy).with(
+              [settings.vm_shepherd.vapp.ops_manager_name],
+              settings.vm_shepherd.vdc.catalog,
+            )
 
           manager.destroy
         end
@@ -291,14 +290,14 @@ module VmShepherd
                 user: settings.vm_shepherd.creds.user,
                 password: settings.vm_shepherd.creds.password,
               },
-              {
-                vdc: settings.vm_shepherd.vdc.name,
-                catalog: settings.vm_shepherd.vdc.catalog,
-                network: settings.vm_shepherd.vdc.network,
-              },
+              settings.vm_shepherd.vdc.name,
               instance_of(Logger)
             ).and_return(vcloud_manager)
-          expect(vcloud_manager).to receive(:clean_environment)
+
+          expect(vcloud_manager).to receive(:clean_environment).with(
+              settings.vm_shepherd.vapp.product_names,
+              settings.vm_shepherd.vapp.product_catalog,
+            )
 
           manager.clean_environment
         end

data/spec/vm_shepherd/vcloud_manager_spec.rb

@@ -10,16 +10,11 @@ module VmShepherd
         password: 'FAKE_PASSWORD',
       }
     end
-    let(:location) do
-      {
-        catalog: 'FAKE_CATALOG',
-        network: 'FAKE_NETWORK',
-        vdc: 'FAKE_VDC',
-      }
-    end
+    let(:vdc_name) { 'FAKE_VDC_NAME' }
+
     let(:logger) { instance_double(Logger).as_null_object }
 
-    let(:vcloud_manager) { VcloudManager.new(login_info, location, logger) }
+    let(:vcloud_manager) { VcloudManager.new(login_info, vdc_name, logger) }
 
     describe '#deploy' do
       let(:vapp_config) do
@@ -30,8 +25,11 @@ module VmShepherd
           dns: 'FAKE_DNS',
           ntp: 'FAKE_NTP',
           netmask: 'FAKE_NETMASK',
+          catalog: 'FAKE_VAPP_CATALOG',
+          network: 'FAKE_NETWORK',
         }
       end
+
       let(:vapp_template_path) { 'FAKE_VAPP_TEMPLATE_PATH' }
       let(:tmpdir) { 'FAKE_TMP_DIR' }
 
@@ -163,7 +161,7 @@ module VmShepherd
                 let(:catalog_exists) { true }
 
                 it 'deletes the catalog' do
-                  expect(client).to receive(:delete_catalog_by_name).with(location.fetch(:catalog))
+                  expect(client).to receive(:delete_catalog_by_name).with(vapp_config.fetch(:catalog))
 
                   vcloud_manager.deploy(vapp_template_path, vapp_config)
                 end
@@ -173,7 +171,7 @@ module VmShepherd
                 let(:catalog_exists) { false }
 
                 it 'does not delete the catalog' do
-                  expect(client).not_to receive(:delete_catalog_by_name).with(location.fetch(:catalog))
+                  expect(client).not_to receive(:delete_catalog_by_name).with(vapp_config.fetch(:catalog))
 
                   vcloud_manager.deploy(vapp_template_path, vapp_config)
                 end
@@ -181,14 +179,14 @@ module VmShepherd
             end
 
             it 'creates the catalog' do
-              expect(client).to receive(:create_catalog).with(location.fetch(:catalog)).and_return(catalog)
+              expect(client).to receive(:create_catalog).with(vapp_config.fetch(:catalog)).and_return(catalog)
 
               vcloud_manager.deploy(vapp_template_path, vapp_config)
             end
 
             it 'uploads the vApp template' do
               expect(catalog).to receive(:upload_vapp_template).with(
-                  location.fetch(:vdc),
+                  vdc_name,
                   vapp_config.fetch(:name),
                   tmpdir,
                 ).and_return(catalog)
@@ -198,7 +196,7 @@ module VmShepherd
 
             it 'creates a VCloudSdk::NetworkConfig' do
               expect(VCloudSdk::NetworkConfig).to receive(:new).with(
-                  location.fetch(:network),
+                  vapp_config.fetch(:network),
                   'Network 1',
                 ).and_return(network_config)
 
@@ -208,7 +206,7 @@ module VmShepherd
             it 'instantiates the vApp template' do
               expect(catalog).to receive(:instantiate_vapp_template).with(
                   vapp_config.fetch(:name),
-                  location.fetch(:vdc),
+                  vdc_name,
                   vapp_config.fetch(:name),
                   nil,
                   nil,
@@ -280,24 +278,25 @@ module VmShepherd
         end
       end
     end
-    
+
     describe '#destroy' do
       let(:client) { instance_double(VCloudSdk::Client) }
       let(:vdc) { instance_double(VCloudSdk::VDC) }
       let(:vapp) { instance_double(VCloudSdk::VApp) }
       let(:vapp_name) { 'FAKE_VAPP_NAME' }
+      let(:vapp_catalog) { 'FAKE_VAPP_CATALOG' }
 
       context 'when the catalog exists' do
         before do
-          allow(client).to receive(:catalog_exists?).with(location.fetch(:catalog)).and_return(true)
+          allow(client).to receive(:catalog_exists?).with(vapp_catalog).and_return(true)
         end
 
         it 'uses VCloudSdk::Client to delete the vApp' do
-          expect(client).to receive(:find_vdc_by_name).with(location.fetch(:vdc)).and_return(vdc)
+          expect(client).to receive(:find_vdc_by_name).with(vdc_name).and_return(vdc)
           expect(vdc).to receive(:find_vapp_by_name).with(vapp_name).and_return(vapp)
           expect(vapp).to receive(:power_off)
           expect(vapp).to receive(:delete)
-          expect(client).to receive(:delete_catalog_by_name).with(location.fetch(:catalog))
+          expect(client).to receive(:delete_catalog_by_name).with(vapp_catalog)
 
           expect(VCloudSdk::Client).to receive(:new).with(
               login_info.fetch(:url),
@@ -307,7 +306,7 @@ module VmShepherd
               logger,
             ).and_return(client)
 
-          vcloud_manager.destroy([vapp_name])
+          vcloud_manager.destroy([vapp_name], vapp_catalog)
         end
 
         context 'when an VCloudSdk::ObjectNotFoundError is thrown' do
@@ -324,28 +323,28 @@ module VmShepherd
           it 'catches the error' do
             allow(client).to receive(:find_vdc_by_name).and_raise(VCloudSdk::ObjectNotFoundError)
 
-            expect { vcloud_manager.destroy([vapp_name]) }.not_to raise_error
+            expect { vcloud_manager.destroy([vapp_name], vapp_catalog) }.not_to raise_error
           end
 
           it 'deletes to catalog' do
-            expect(client).to receive(:delete_catalog_by_name).with(location.fetch(:catalog))
+            expect(client).to receive(:delete_catalog_by_name).with(vapp_catalog)
 
-            vcloud_manager.destroy([vapp_name])
+            vcloud_manager.destroy([vapp_name], vapp_catalog)
           end
         end
       end
 
       context 'when the catalog does not exist' do
         before do
-          allow(client).to receive(:catalog_exists?).with(location.fetch(:catalog)).and_return(false)
+          allow(client).to receive(:catalog_exists?).with(vapp_catalog).and_return(false)
         end
 
         it 'uses VCloudSdk::Client to delete the vApp' do
-          expect(client).to receive(:find_vdc_by_name).with(location.fetch(:vdc)).and_return(vdc)
+          expect(client).to receive(:find_vdc_by_name).with(vdc_name).and_return(vdc)
           expect(vdc).to receive(:find_vapp_by_name).with(vapp_name).and_return(vapp)
           expect(vapp).to receive(:power_off)
           expect(vapp).to receive(:delete)
-          expect(client).not_to receive(:delete_catalog_by_name).with(location.fetch(:catalog))
+          expect(client).not_to receive(:delete_catalog_by_name).with(vapp_catalog)
 
           expect(VCloudSdk::Client).to receive(:new).with(
               login_info.fetch(:url),
@@ -355,9 +354,20 @@ module VmShepherd
               logger,
             ).and_return(client)
 
-          vcloud_manager.destroy([vapp_name])
+          vcloud_manager.destroy([vapp_name], vapp_catalog)
         end
       end
     end
+
+    describe '#clean_environment' do
+      let(:vapp_names) { ['VAPP_ONE', 'VAPP_TWO'] }
+      let(:vapp_catalog) { 'VAPP_CATALOG' }
+
+      it 'calls #destroy' do
+        expect(vcloud_manager).to receive(:destroy).with(vapp_names, vapp_catalog)
+
+        vcloud_manager.clean_environment(vapp_names, vapp_catalog)
+      end
+    end
   end
 end

metadata

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