vm_shepherd 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d98309744c225528a19bef7390b48890aee53ba
-  data.tar.gz: 67303b911ade251ff41855276d4f320b0cbc0950
+  metadata.gz: 6d6273df41a1db4583c88e2b1139acf836f78983
+  data.tar.gz: 94c0f08587030e100ed9d6dd534769b876516165
 SHA512:
-  metadata.gz: 86e6da715493b630ff838740f3714906576e38055aeca7db687b3c38e164122d74599e7b041279835eae65b397a9736e81bfbb5c30bc644203037255d5f67154
-  data.tar.gz: 01fd81fa9f2c94829e65c69c0b361757ebf0f99a2c50899647e170f40775f5d5ed8db7b50f50c51520fd354be832af5428b7c3043ee231a7cbb37f78db848326
+  metadata.gz: d03b514667b963aa9f8e15a377258a49fc8d68bf32a806203e3996549bce3ac3d6642dbd04145d71a9688843e86fb0a5f268a796c1da4be20473a8f35c4396d1
+  data.tar.gz: 8559843b647a40f7c09a5ecd95f1063999592e60eb9628a5e0f9cc0718680da97e268ef871000d17f99f2c5c7b4e47cdcdbf8c021775037e6eaa774579a7b2a7

data/lib/vm_shepherd/openstack_manager.rb

@@ -45,14 +45,20 @@ module VmShepherd
     end
 
     def destroy(vm_options)
+      say('Destroying Ops Manager instances')
       ip = service.addresses.find { |address| address.ip == vm_options[:public_ip] }
       server = service.servers.get(ip.instance_id)
       if server
+        say("Found running Ops Manager instance #{server.id}")
         image = image_service.images.get(server.image['id'])
+        say("Found Ops Manager image #{image.id}")
 
         server.destroy
+        say('Ops Manager instance destroyed')
         image.destroy
+        say('Ops Manager image destroyed')
       end
+      say('Done destroying Ops Manager instances')
     end
 
     def service

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

data/lib/vm_shepherd/vsphere_manager.rb

@@ -4,6 +4,7 @@ require 'rbvmomi'
 module VmShepherd
   class VsphereManager
     TEMPLATE_PREFIX = 'tpl'.freeze
+    VALID_FOLDER_REGEX = /\A([\w-]{1,80}\/)*[\w-]{1,80}\/?\z/
 
     def initialize(host, username, password, datacenter_name)
       @host = host
@@ -14,45 +15,77 @@ module VmShepherd
     end
 
     def deploy(ova_path, vm_config, vsphere_config)
-      raise ArgumentError unless folder_name_is_valid?(vsphere_config[:folder])
+      validate_folder_name!(vsphere_config[:folder])
 
-      ova_path = File.expand_path(ova_path.strip)
       ensure_no_running_vm(vm_config)
 
-      tmp_dir = untar_vbox_ova(ova_path)
-      ovf_file_path = ovf_file_path_from_dir(tmp_dir)
-
-      template = deploy_ovf_template(ovf_file_path, vsphere_config)
-      vm = create_vm_from_template(template, vsphere_config)
+      ovf_file_path = extract_ovf_from(ova_path)
 
-      reconfigure_vm(vm, vm_config)
-      power_on_vm(vm)
+      boot_vm(ovf_file_path, vm_config, vsphere_config)
     ensure
       FileUtils.remove_entry_secure(ovf_file_path, force: true) unless ovf_file_path.nil?
     end
 
     def destroy(folder_name)
-      fail("#{folder_name.inspect} is not a valid folder name") unless folder_name_is_valid?(folder_name)
+      validate_folder_name!(folder_name)
 
       delete_folder_and_vms(folder_name)
-
-      fail("#{folder_name.inspect} already exists") unless datacenter.vmFolder.traverse(folder_name).nil?
-
-      datacenter.vmFolder.traverse(folder_name, RbVmomi::VIM::Folder, true)
     end
 
     private
 
     attr_reader :host, :username, :password, :datacenter_name, :logger
 
+    def validate_folder_name!(folder_name)
+      VALID_FOLDER_REGEX.match(folder_name) || fail("#{folder_name.inspect} is not a valid folder name")
+    end
+
+    def ensure_no_running_vm(vm_config)
+      ip_port = "#{vm_config.fetch(:ip)} #{vm_config.fetch(:external_port, 443)}"
+      logger.info("BEGIN checking for VM at #{ip_port}")
+      fail("VM exists at #{ip_port}") if system("nc -z -w 5 #{ip_port}")
+      logger.info("END   checking for VM at #{ip_port}")
+    end
+
+    def extract_ovf_from(ova_path)
+      logger.info("BEGIN extract_ovf_from #{ova_path}")
+      ova_path = File.expand_path(ova_path.strip)
+
+      untar_dir = Dir.mktmpdir
+
+      system("cd #{untar_dir} && tar xfv '#{ova_path}'") || fail("ERROR: Untarring #{ova_path}")
+
+      Dir["#{untar_dir}/*.ovf"].first.tap { logger.info("END   extract_ovf_from #{ova_path}") } ||
+        fail('Failed to find ovf')
+    end
+
+    def create_network_mappings(ovf_file_path, vsphere_config)
+      ovf = Nokogiri::XML(File.read(ovf_file_path))
+      ovf.remove_namespaces!
+      networks = ovf.xpath('//NetworkSection/Network').map { |x| x['name'] }
+      Hash[networks.map { |ovf_network| [ovf_network, network(vsphere_config)] }]
+    end
+
+    def boot_vm(ovf_file_path, vm_config, vsphere_config)
+      datacenter.vmFolder.traverse(vsphere_config[:folder], RbVmomi::VIM::Folder, true)
+      template = deploy_ovf_template(ovf_file_path, vsphere_config)
+      vm = create_vm_from_template(template, vsphere_config)
+
+      reconfigure_vm(vm, vm_config)
+      power_on_vm(vm)
+    end
+
     def delete_folder_and_vms(folder_name)
-      return unless (folder = datacenter.vmFolder.traverse(folder_name))
+      folder = datacenter.vmFolder.traverse(folder_name) ||
+        fail("ERROR no folder found with name=#{folder_name.inspect}")
 
       find_vms(folder).each { |vm| power_off(vm) }
 
       logger.info("BEGIN folder.destroy_task folder=#{folder_name}")
       folder.Destroy_Task.wait_for_completion
       logger.info("END   folder.destroy_task folder=#{folder_name}")
+
+      fail("#{folder_name.inspect} already exists") unless datacenter.vmFolder.traverse(folder_name).nil?
     rescue RbVmomi::Fault => e
       logger.info("ERROR folder.destroy_task folder=#{folder_name}", e)
       raise
@@ -79,28 +112,6 @@ module VmShepherd
       end
     end
 
-    def folder_name_is_valid?(folder_name)
-      /\A([\w-]{1,80}\/)*[\w-]{1,80}\/?\z/.match(folder_name)
-    end
-
-    def ensure_no_running_vm(ova_config)
-      logger.info('--- Running: Checking for existing VM')
-      ip = ova_config[:external_ip] || ova_config[:ip]
-      port = ova_config[:external_port] || 443
-      fail("VM exists at #{ip}") if system("nc -z -w 5 #{ip} #{port}")
-    end
-
-    def untar_vbox_ova(ova_path)
-      logger.info("--- Running: Untarring #{ova_path}")
-      Dir.mktmpdir.tap do |dir|
-        system_or_exit("cd #{dir} && tar xfv '#{ova_path}'")
-      end
-    end
-
-    def ovf_file_path_from_dir(dir)
-      Dir["#{dir}/*.ovf"].first || fail('Failed to find ovf')
-    end
-
     def deploy_ovf_template(ovf_file_path, vsphere_config)
       template_name = [TEMPLATE_PREFIX, Time.new.strftime('%F-%H-%M'), cluster(vsphere_config).name].join('-')
       logger.info("BEGIN deploy_ovf ovf_file=#{ovf_file_path} template_name=#{template_name}")
@@ -139,13 +150,6 @@ module VmShepherd
       end || fail('ERROR finding host to upload OVF to')
     end
 
-    def create_network_mappings(ovf_file_path, vsphere_config)
-      ovf = Nokogiri::XML(File.read(ovf_file_path))
-      ovf.remove_namespaces!
-      networks = ovf.xpath('//NetworkSection/Network').map { |x| x['name'] }
-      Hash[networks.map { |ovf_network| [ovf_network, network(vsphere_config)] }]
-    end
-
     def create_vm_from_template(template, vsphere_config)
       logger.info("BEGIN clone_vm_task tempalte=#{template.name}")
       template.CloneVM_Task(
@@ -273,27 +277,17 @@ module VmShepherd
     end
 
     def resource_pool(vsphere_config)
-      find_resource_pool(cluster(vsphere_config), vsphere_config[:resource_pool]) ||
-        fail("ERROR finding resource_pool #{vsphere_config[:resource_pool].inspect}")
+      cluster = cluster(vsphere_config)
+      if vsphere_config[:resource_pool]
+        cluster.resourcePool.resourcePool.find { |rp| rp.name == vsphere_config[:resource_pool] }
+      else
+        cluster.resourcePool
+      end || fail("ERROR finding resource_pool #{vsphere_config[:resource_pool].inspect}")
     end
 
     def datastore(vsphere_config)
       datacenter.find_datastore(vsphere_config[:datastore]) ||
         fail("ERROR finding datastore #{vsphere_config[:datastore].inspect}")
     end
-
-    def find_resource_pool(cluster, resource_pool_name)
-      if resource_pool_name
-        cluster.resourcePool.resourcePool.find { |rp| rp.name == resource_pool_name }
-      else
-        cluster.resourcePool
-      end
-    end
-
-    def system_or_exit(command)
-      logger.info("BEGIN running #{command.inspect}")
-      system(command) || fail("ERROR running #{command.inspect}")
-      logger.info("END   running #{command.inspect}")
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ops Manager Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-04 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1