kitchen-vmpool 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba43fce6af2f6b5d3e8169ce88c85b23264cf443
-  data.tar.gz: 47cfe3bc7f7d189cbe64a9208d0e21fcb06a42d4
+  metadata.gz: 9e4fff8380ee9f18fec8ef01a1d609b54ebfbfc4
+  data.tar.gz: fdaa0e13db8f1efaeca8c49c0a41382f2a793457
 SHA512:
-  metadata.gz: dc037d0dfb9125d2ebaba3d776e17b8ff8ac5954358e2e5e90f1d17ec0d827ba7eb7eacdb1b06a145482c1c4421b89dc408468a64971ae02a33cdb6ddaf31e2c
-  data.tar.gz: ccc435a6f48212d3b3cfc8cf6d743aacca971d134900d2dbe20b25aabb684a3ca42fb2f5be94c681592af68ea0d19149c6ba2d716e9472cf1280b8a8adba2cb8
+  metadata.gz: b3ca03be5000e386e92defb694ac0c9d0efec5778124427c607c190c26b61284e7b33a85447907236955426820059afd313b65cc8b6bcfbf943e1278e56e393b
+  data.tar.gz: 5dc30b54179d657966a1ffdf12b071a58117d25df8533f44e3b72afa631744fa6790a6ab0aef68074a3cb2c3299251d7b6463fb939ccc18ca751476cd776624f

data/README.md

@@ -1,8 +1,9 @@
 # Kitchen::Vmpool
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/kitchen/vmpool`. To experiment with that code, run `bin/console` for an interactive prompt.
+Provides the ability to select a memeber of a pool to use during a kitchen test.  This allows you to instantly startup
+a test instead of waiting for a machine to provision.
 
-TODO: Delete this and the text above, and describe your gem
+Pluggable backend is used for storing pool information. 
 
 ## Installation
 

data/exe/vra_create.rb

@@ -0,0 +1,209 @@
+#!/usr/bin/env ruby
+require 'vra'
+require 'fileutils'
+require 'erb'
+require 'highline/import'
+require 'openssl'
+require 'json'
+require 'yaml'
+
+# Purpose: Submits a single request to VRA for vm creation
+
+
+# monkey patch strings to symbols until we can patch upstream
+module Vra
+  class CatalogRequest
+    attr_accessor :template_payload
+
+    def template_payload
+      @template_payload ||= dump_template(@catalog_id) 
+    end
+
+    def template_payload=(payload)
+      @template_payload = payload
+    end
+
+    def write_template(id, filename = nil)
+      filename ||= "#{id}.json" 
+      begin
+        puts "Writing file #{filename}"
+        contents = dump_template(id)
+        data = JSON.parse(contents)
+        pretty_contents = JSON.pretty_generate(data)
+        File.write(filename, pretty_contents)
+      rescue Vra::Exception::HTTPError => e
+        puts e.message
+      end
+    end
+
+    def dump_template(id)
+      response = client.http_get("/catalog-service/api/consumer/entitledCatalogItems/#{id}/requests/template")
+      response.body
+    end
+
+    def merged_payload
+       merge_payload(template_payload)
+    end
+
+    def submit
+      validate_params!
+
+      begin
+        post_response = client.http_post("/catalog-service/api/consumer/entitledCatalogItems/#{@catalog_id}/requests", merged_payload)
+      rescue Vra::Exception::HTTPError => e
+        raise Vra::Exception::RequestError, "Unable to submit request: #{e.errors.join(', ')}"
+      rescue
+        raise
+      end
+
+      request_id = JSON.parse(post_response.body)["id"]
+      Vra::Request.new(client, request_id)
+    end
+
+  end
+  class RequestParameters
+    def set_parameters(key, value_data, parent = nil)
+      value_type = value_data[:type] || value_data['type']
+      data_value = value_data[:value] || value_data['value']
+      if value_type
+        if parent.nil?
+          set(key, value_type, data_value)
+        else
+          parent.add_child(Vra::RequestParameter.new(key, value_type, data_value))
+        end
+      else
+        if parent.nil?
+          p = set(key, nil, nil)
+        else
+          p = Vra::RequestParameter.new(key, nil, nil)
+          parent.add_child(p)
+        end
+
+        value_data.each do |k, data|
+          set_parameters(k, data, p)
+        end
+      end
+    end
+  end
+end
+
+module VraUtilities
+  def classification
+     ENV['VRA_CLASSIFY']
+  end
+
+  def branch
+    `git rev-parse --abbrev-ref HEAD`.chomp if ENV['USE_BRANCH']
+  end
+
+  def sandbox
+    branch || 'dev'
+  end
+
+  def datacenter
+    ENV['DATACENTER']
+  end
+
+  def vra_email
+    @vra_email ||= ENV['VRA_EMAIL'] || ask('What is your frit email for VRA notifications')
+  end
+
+  def subtenant_id
+    ENV['VRA_SUB_TENANT_ID']
+  end
+
+  def vra_user
+    @vra_user ||= ENV['VRA_USER'] || ask('Enter User: ') {|q| q.echo = true}
+  end
+
+  def vra_pass
+    @vra_pass ||= ENV['VRA_PASS'] || ask('Enter VRA Password: ') {|q| q.echo = 'x'}
+  end
+
+  def base_url
+    @server ||= ENV['VRA_URL']
+  end
+
+  # @return [VRA::Client] - creates a new client object and returns it
+  def client
+    @client ||= Vra::Client.new(
+      username: vra_user,
+      password: vra_pass,
+      tenant: 'vsphere.local',
+      base_url: base_url,
+      verify_ssl: false,
+     )
+  end
+
+  # @return Array[String] - returns an array of catalog items
+  def catalog_items
+   client.catalog.all_items.map {|i| {name: i.name, id: i.id}}
+  end
+
+  def template_data
+    @template_data ||= JSON.parse(File.read(@payload_file))
+  end
+
+  def request_options
+    {
+      cpus: template_data['data']['Machine']['data']['cpu'] || 2,
+      memory: template_data['data']['Machine']['data']['memory'] || 4096,
+      requested_for: ENV['VRA_USER'] 
+      lease_days: 2,
+      notes: 'VRA Server Pool Test',
+      subtenant_id: template_data['businessGroupId']
+    }
+  end
+
+  def catalog_request 
+     blueprint = template_data['catalogItemId']
+     cr = client.catalog.request(blueprint, request_options)
+     cr.template_payload = File.read(@payload_file)
+     cr
+  end
+
+  # @return [Vra::Request] - returns a request item
+  def submit_new_request(file)
+    @payload_file = File.expand_path(file)
+    unless @payload_file and File.exist?(@payload_file)
+      puts "The payload file: #{@payload_file} does not exist"
+      exit -1 
+    end
+    cr = catalog_request 
+    cr.submit
+  end
+
+  require 'optparse'
+
+  def dump_templates(dir_name = 'vra7_templates')
+    FileUtils.mkdir(dir_name) unless File.exist?(dir_name)
+    catalog_items.each do |c|
+      cr = catalog_request
+      filename = File.join(dir_name, "#{c[:name]}.json".gsub(' ', '_')).downcase
+      cr.write_template(c[:id], filename)
+    end
+  end
+
+
+  def run
+  	cli_options = {}
+  	o = OptionParser.new do |opts|
+  	  opts.program_name = 'vra-pool'
+  	  opts.on_head(<<-EOF
+
+    Summary: A tool used to provision systems in VRA
+  	  EOF
+  	  )
+  	  opts.on('-n', '--node-file FILE', "Load the request data from this file and create it") do |c|
+  	    cli_options[:node_file] = c
+  	  end
+          opts.on('-t', '--dump-templates', "Dump all catalog templates") do |c|
+            cli_options[:dump_templates] = true
+          end
+        end.parse!
+   @payload_file = cli_options[:node_file]
+   dump_templates if cli_options[:dump_templates]
+   submit_new_request(@payload_file) 
+  end
+end
+include VraUtilities

data/{vra_create_pool → exe/vra_create_pool}

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
-
+require 'hashdiff'
 require 'resolv'
 require 'optparse'
 require 'yaml'
 require_relative 'vra_create'
-require 'kitchen/driver/vmpool_stores/gitlab_store'
+require 'kitchen/driver/vmpool_stores/gitlab_commit_store'
 require 'socket'
 require 'timeout'
 
@@ -20,34 +20,62 @@ def options
 end
 
 def create_pool(pool_data)
-  (1..pool_data['instances']).map {|num| submit_new_request(pool_data['payload_file']).id }
+  (1..pool_data['instances']).map do |num| 
+     puts pool_data['payload_file']
+     submit_new_request(pool_data['payload_file']).id 
+  end
 end
 
 # return hostnames or false
+# @param [VRA::Request] - a request object
 def resolve_vm_name(request)
-  r = client.requests.by_id(request)
+  r = request 
   return r.resources.map(&:name) if r.successful? and r.completed?
   return false
 end
 
+def req_obj(id)
+  client.requests.by_id(id)
+end
+
+# compares the before and after state of the store hashes
+def store_changed?(before, after)
+  HashDiff.diff(before, after).count > 0
+end
+
 # @return [Hash] - a store hash that contains one or more pools
 # @option project_id [Integer] - the project id in gitlab
-# @option snippet_id [Integer] - the snipppet id in the gitlab project
 # @option pool_file [String] - the snipppet file name
 def store(store_options = options)
   # create a new instance of the store with the provided options
-  @store ||= Kitchen::Driver::VmpoolStores::GitlabStore.new(store_options)
+  @store ||= Kitchen::Driver::VmpoolStores::GitlabCommitStore.new(store_options)
 end
 
 # creates the number of instances defined in the pool data
 def create_pools
+  @old_store = store.dup
   pools.map do |key, value|
     # convert the requests to vm names
     pools[key]['requests'] = value['requests'].find_all do |req|
-       if hostnames = resolve_vm_name(req)
-         pools[key]['pool_instances'] = value['pool_instances'] + hostnames
-         false
-       else
+       puts "Checking request: #{req}"
+       r = req_obj(req)
+       if r.completed?
+         puts "The request #{req} has completed, getting hostname"
+         hostnames = resolve_vm_name(r)
+         # remove request from pool file by not returning anything
+         # if hostname does not exist but request completed don't update pool
+         if ! hostnames
+           puts "Provisioning seemed to have failed for #{req}"
+           puts "Removing request #{req} from pool #{key}"
+           false
+         else
+           pools[key]['pool_instances'] = value['pool_instances'] + hostnames
+           false
+         end
+       else 
+         # has not completed
+         # keep the request, since it is not finished
+         puts "The request #{req} is still running"
          req
        end
     end
@@ -63,7 +91,8 @@ def create_pools
       pools[key]['requests'] = reqs
     end
   end
-  store.save
+  # prevents updates from occuring when they are not required
+  store.save if store_changed?(@old_store, store)
 end
 
 # @return [Boolean] - true if the host is alive and listening
@@ -107,22 +136,18 @@ end
 
 # @return [Boolean] - true if options are valid
 def valid_options?
-  options['pool_file'] &&
-  File.exist?(options['pool_file']) &&
-  options['project_id'].to_i > 0 &&
-  options['snippet_id'].to_i > 0
+  options['project_id'].to_i > 0
 end
 
 ## main entry point
 
 OptionParser.new do |opts|
-  opts.program_name = 'create-pool'
   opts.on_head(<<-EOF
 
 Summary: A tool used to create a pool of vra systems
 
   Example:
-     #{__FILE__} -f pool_file.yaml -p 33 -s 103
+     #{__FILE__} -f pool_file.yaml -p 33 -f vmpool
 
   If you wish to store the config in a file, this script will read vmpool_config.yaml
   for the same configs.
@@ -135,9 +160,6 @@ Summary: A tool used to create a pool of vra systems
   opts.on('-p', '--project-id ID', "The gitlab project id") do |c|
     options['project_id'] = c.to_i
   end
-  opts.on('-s', '--snippet-id ID', "The gitlab project snippet id") do |c|
-    options['snippet_id'] = c.to_i
-  end
 
 end.parse!
 

data/kitchen-vmpool.gemspec

@@ -1,10 +1,11 @@
 # coding: utf-8
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'kitchen-vmpool/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "kitchen-vmpool"
-  spec.version       = "0.1.1"
+  spec.version       = KitchenVmpool::VERSION
   spec.authors       = ["Corey Osman"]
   spec.email         = ["corey@nwops.io"]
 

data/lib/kitchen/driver/vmpool.rb

@@ -19,17 +19,21 @@
 #
 require 'kitchen'
 require "kitchen/version"
+require 'kitchen/logging'
 require 'kitchen/driver/base'
+require 'kitchen-vmpool/version'
+
 module Kitchen
   module Driver
 
     class PoolMemberNotFound < Exception; end
 
     class Vmpool < Kitchen::Driver::Base
-      plugin_version "0.1.1"
+      include Kitchen::Logging
+
+      plugin_version KitchenVmpool::VERSION
 
       default_config :pool_name, 'pool1'
-      default_config :pool_file, 'vmpool.yaml'
       default_config :state_store, 'file'
       default_config :store_options, {}
       default_config :reuse_instances, false
@@ -40,7 +44,7 @@ module Kitchen
 
       # (see Base#create)
       def create(state)
-        state[:hostname] = pool_member
+        state[:hostname] = take_pool_member
       end
 
       # (see Base#destroy)
@@ -53,11 +57,12 @@ module Kitchen
       private
 
       # @return [String] - a random host from the list of systems
-      def pool_member
-        sample = pool_hosts.sample
-        raise PoolMemberNotFound.new("No pool members exist for #{config[:pool_name]}, please create some pool members") unless sample
-        member = pool_hosts.delete(sample)
+      # mark them used so nobody else can use it
+      def take_pool_member
+        member = pool_hosts.sample
+        raise PoolMemberNotFound.new("No pool members exist for #{config[:pool_name]}, please create some pool members") unless member
         mark_used(member)
+        info("Pool member #{member} was selected")
         return member
       end
 
@@ -80,37 +85,46 @@ module Kitchen
 
       # @return Array[String] - a list of host names in the pool
       def pool_hosts
-        if config[:reuse_instances]
-          pool['pool_instances'] + pool['used_instances'].to_a
-        else
-          pool['pool_instances']
-        end
+        pool['pool_instances'] ||= []
+      end
+
+      # @return Array[String] - a list of used host names in the pool
+      def used_hosts
+        pool['used_instances'] ||= []
       end
 
       # @param name [String] - the hostname to mark not used
       # @return Array[String] - list of unused instances
       def mark_unused(name)
-        pool['pool_instances'] = [] unless pool['pool_instances']
-        pool['pool_instances'] << name
+        if config[:reuse_instances]
+          info("Marking pool member #{name} as unused")
+          used_hosts.delete(name)
+          pool_hosts << name unless pool_hosts.include?(name)
+        end
         store.save
-        pool['pool_instances']
+        pool_hosts
       end
 
       # @param name [String] - the hostname to mark used
       # @return Array[String] - list of used instances
       def mark_used(name)
-        pool['used_instances'] = [] unless pool['used_instances']
-        pool['used_instances'] << name
+        debug("Marking pool member #{name} as used")
+        # ideally the member should not already be in this array
+        # but just in case we will protect against that
+        pool_hosts.delete(name)
+        used_hosts << name unless used_hosts.include?(name)
         store.save
-        pool['used_instances']
+        used_hosts
       end
 
       # @return [Hash] - a store hash that contains one or more pools
       def store
         @store ||= begin
           # load the store adapter and create a new instance of the store
-          store = sprintf("%s%s", config[:state_store].capitalize, 'Store')
-          require "kitchen/driver/vmpool_stores/#{config[:state_store]}_store"
+          name = config[:state_store].split('_').map(&:capitalize).join('')
+          store = sprintf("%s%s", name, 'Store')
+          store_file = "#{config[:state_store]}_store"
+          require "kitchen/driver/vmpool_stores/#{store_file}"
           klass = Object.const_get("Kitchen::Driver::VmpoolStores::#{store}")
           # create a new instance of the store with the provided options
           store_opts = config[:store_options]
@@ -125,3 +139,24 @@ module Kitchen
     end
   end
 end
+
+require 'gitlab'
+# monkey patch error in error code until it is fixed upstream
+module Gitlab
+  module Error
+    class ResponseError
+      # Human friendly message.
+      #
+      # @return [String]
+      private
+      def build_error_message
+        parsed_response = @response.parsed_response
+        message = parsed_response.respond_to?(:message) ? parsed_response.message : parsed_response['message']
+        message = parsed_response.error unless message
+        "Server responded with code #{@response.code}, message: " \
+        "#{handle_message(message)}. " \
+        "Request URI: #{@response.request.base_uri}#{@response.request.path}"
+      end
+    end
+  end
+end

data/lib/kitchen/driver/vmpool_stores/base_store.rb

@@ -0,0 +1,53 @@
+require 'yaml'
+require 'kitchen/logger'
+require 'kitchen'
+require 'kitchen/logging'
+
+module Kitchen
+  module Driver
+    module VmpoolStores
+      class BaseStore
+        attr_reader :pool_file, :pool_data
+        include Kitchen::Logging
+
+        def update(content = nil)
+          #info("Updating vmpool data")
+          write_content(content)
+          read
+        end
+
+        def create
+          #info("Creating new vmpool data")
+          write_content(base_content)
+          read
+        end
+
+        def read
+          #info("Reading vmpool data")
+          read_content
+        end
+
+        def reread
+          pool_data(true)
+        end
+
+        def save
+          #info("Saving vmpool data")
+          write_content
+          read
+        end
+
+        def pool_data(refresh = false)
+          @pool_data = nil if refresh
+          @pool_data ||= YAML.load(read_content)
+        end
+
+        private
+
+        def read_content
+          raise NotImplementedError
+        end
+      end
+    end
+  end
+end

data/lib/kitchen/driver/vmpool_stores/file_store.rb

@@ -1,11 +1,9 @@
 require 'yaml'
-
+require "kitchen/driver/vmpool_stores/base_store"
 module Kitchen
   module Driver
     module VmpoolStores
-      class FileStore
-
-        attr_reader :pool_file
+      class FileStore < BaseStore
 
         # @option pool_file [String] - the file path that holds the pool information
         def initialize(options = nil)
@@ -14,30 +12,6 @@ module Kitchen
           @pool_file = options['pool_file']
         end
 
-        def update(content)
-          write_content(content)
-          read
-        end
-
-        def create
-          write_content(base_content)
-          read
-        end
-
-        def read
-          puts "Reading snippet"
-          read_content
-        end
-
-        def save
-          write_content
-          read
-        end
-
-        def pool_data
-          @pool_data ||= YAML.load(read_content)
-        end
-
         private
 
         def base_content

data/lib/kitchen/driver/vmpool_stores/gitlab_commit_store.rb

@@ -0,0 +1,82 @@
+require 'gitlab'
+require "kitchen/driver/vmpool_stores/base_store"
+require 'yaml'
+
+module Kitchen
+  module Driver
+    module VmpoolStores
+      class GitlabCommitStore < BaseStore
+
+        attr_accessor :project_id
+        attr_reader :pool_file, :branch
+
+        # @option project_id [Integer] - the project id in gitlab
+        # @option commit_id [Integer] - the snipppet id in the gitlab project
+        # @option pool_file [String] - the snipppet file name
+        def initialize(options = nil)
+          options ||= { project_id: nil, pool_file: 'vmpool.yaml'}
+          raise ArgumentError.new("You must pass the project_id option") unless options['project_id'].to_i > 0
+          @project_id = options['project_id']  #ie. 89
+          @pool_file = options['pool_file'] || 'vmpool.yaml'
+          @branch = 'master'
+        end
+
+        def update(content = nil)
+          #info("Updating vmpool data")
+          update_file
+          read
+        end
+
+        def create
+          #info("Creating new vmpool data commit")
+          create_file unless file_exists?
+          read
+        end
+
+        def save
+         # info("Saving vmpool data")
+          update_file
+          read
+        end
+
+        def file_exists?(project = project_id, file = pool_file)
+          read_content(project, file)
+        end
+
+        private
+
+        def client
+          @client ||= Gitlab.client
+        end
+
+        def create_file(project = project_id)
+          actions = [{
+                         "action" => "create",
+                         "file_path" => pool_file,
+                         "content" => {}.to_yaml
+                     }]
+          client.create_commit(project, branch, "update vmpool data", actions)
+        end
+
+
+        def update_file(project = project_id)
+          actions = [{
+              "action" => "update",
+              "file_path" => pool_file,
+              "content" => pool_data.to_yaml
+          }]
+          client.create_commit(project, branch, "update vmpool data", actions)
+        end
+
+        def read_content(project = project_id, file = pool_file)
+          begin
+            client.file_contents(project, file, branch)
+          rescue Gitlab::Error::NotFound
+            false
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/kitchen/driver/vmpool_stores/{gitlab_store.rb → gitlab_snippet_store.rb}

@@ -1,8 +1,10 @@
 require 'gitlab'
+require "kitchen/driver/vmpool_stores/base_store"
+require 'yaml'
 module Kitchen
   module Driver
     module VmpoolStores
-      class GitlabStore
+      class GitlabSnippetStore < BaseStore
 
         attr_accessor :project_id, :snippet_id
         attr_reader :pool_file
@@ -11,42 +13,32 @@ module Kitchen
         # @option snippet_id [Integer] - the snipppet id in the gitlab project
         # @option pool_file [String] - the snipppet file name
         def initialize(options = nil)
-          options ||= { project_id: nil, snippet_id: nil, pool_file: 'vmpool.yaml'}
+          options ||= { project_id: nil, snippet_id: nil, pool_file: 'vmpool'}
           raise ArgumentError.new("You must pass the project_id option") unless options['project_id'].to_i > 0
-          raise ArgumentError.new("You must pass the snippet_id option") unless options['snippet_id'].to_i > 0
           @snippet_id = options['snippet_id']  #ie. 630
           @project_id = options['project_id']  #ie. 89
           @pool_file = options['pool_file']
         end
 
-        def update
+        def update(content = nil)
+          #info("Updating vmpool data")
           update_snippet
           read
         end
 
         def create
-          create_snippet
+          #info("Creating new vmpool data snippet")
+          snippet = create_snippet
+          @snippet_id = snippet.id
           read
         end
 
-        def read
-          puts "Reading snippet"
-          pool_content
-        end
-
-        def pool_data
-          @pool_data ||= YAML.load(pool_content)
-        end
-
         def save
+          #info("Saving vmpool data")
           update_snippet
           read
         end
 
-        def pool_content
-          read_snippet
-        end
-
         private
 
         def client
@@ -54,19 +46,20 @@ module Kitchen
         end
 
         def snippet_exists?(project = project_id)
+          return false unless snippet_id
           client.snippets(project, {
             title: 'Virtual Machine Pools',
             visibility: 'public',
             file_name: pool_file,
-            code: pool_content})
+            code: {}.to_yaml})
         end
 
         def create_snippet(project = project_id)
-          client.create_snippet(project, {
+          client.create_commit(project, {
             title: 'Virtual Machine Pools',
             visibility: 'public',
             file_name: pool_file,
-            code: pool_content
+            code: {}.to_yaml
             })
         end
 
@@ -83,7 +76,7 @@ module Kitchen
           client.snippets(project).map {|s| s.id }
         end
 
-        def read_snippet(project = project_id, id = snippet_id)
+        def read_content(project = project_id, id = snippet_id)
           client.snippet_content(project, id)
         end
 

data/lib/kitchen-vmpool/version.rb

@@ -0,0 +1,3 @@
+module KitchenVmpool
+  VERSION = "0.2.0"
+end

data/vmpool.yaml

@@ -1,7 +1,7 @@
 ---
 base_rhel6_pool:
   pool_name: base_rhel6
-  payload_file: base_rhel6_payload.yaml
+  payload_file: base_rhel6_payload.json
   instances: 1
   pool_instances: []
   requests: []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vmpool
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Corey Osman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-10 00:00:00.000000000 Z
+date: 2017-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab
@@ -69,7 +69,9 @@ dependencies:
 description: When you need to create pools of vms and manage them with test kitchen
 email:
 - corey@nwops.io
-executables: []
+executables:
+- vra_create.rb
+- vra_create_pool
 extensions: []
 extra_rdoc_files: []
 files:
@@ -83,13 +85,16 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- exe/vra_create.rb
+- exe/vra_create_pool
 - kitchen-vmpool.gemspec
+- lib/kitchen-vmpool/version.rb
 - lib/kitchen/driver/vmpool.rb
+- lib/kitchen/driver/vmpool_stores/base_store.rb
 - lib/kitchen/driver/vmpool_stores/file_store.rb
-- lib/kitchen/driver/vmpool_stores/gitlab_store.rb
+- lib/kitchen/driver/vmpool_stores/gitlab_commit_store.rb
+- lib/kitchen/driver/vmpool_stores/gitlab_snippet_store.rb
 - vmpool.yaml
-- vra_create.rb
-- vra_create_pool
 homepage: https://gitlab.com/nwops/kitchen-vmpool
 licenses:
 - MIT

data/vra_create.rb

@@ -1,156 +0,0 @@
-#!/usr/bin/env ruby
-require 'vra'
-require 'erb'
-require 'highline/import'
-require 'openssl'
-require 'json'
-require 'yaml'
-
-# Purpose: Submits a single request to VRA for vm creation
-module Vra
-  class Client
-    # monkey patch the init method to accept token
-    def initialize(opts)
-      @base_url     = opts[:base_url]
-      @username     = opts[:username]
-      @password     = PasswordMasker.new(opts[:password])
-      @tenant       = opts[:tenant]
-      @verify_ssl   = opts.fetch(:verify_ssl, true)
-      @bearer_token = PasswordMasker.new(nil)
-      @page_size    = opts.fetch(:page_size, 20)
-
-      validate_client_options!
-    end
-  end
-
-  # monkey patch the init method to accept additional params
-  class CatalogRequest
-    def initialize(client, catalog_id, opts = {})
-      @client            = client
-      @catalog_id        = catalog_id
-      @cpus              = opts[:cpus]
-      @memory            = opts[:memory]
-      @requested_for     = opts[:requested_for]
-      @lease_days        = opts[:lease_days]
-      @notes             = opts[:notes]
-      @subtenant_id      = opts[:subtenant_id]
-      @additional_params = opts[:additional_params] || Vra::RequestParameters.new
-      @catalog_item = Vra::CatalogItem.new(client, id: catalog_id)
-    end
-  end
-end
-
-module VraUtilities
-  def classification
-     ENV['VRA_CLASSIFY']
-  end
-
-  def branch
-    `git rev-parse --abbrev-ref HEAD`.chomp if ENV['USE_BRANCH']
-  end
-
-  def sandbox
-    branch || 'dev'
-  end
-
-  def datacenter
-    ENV['DATACENTER'] || 'Eroc'
-  end
-
-  def vra_email
-    @vra_email ||= ENV['VRA_EMAIL'] || ask('What is your frit email for VRA notifications')
-  end
-
-  def subtenant_id
-    ENV['VRA_SUB_TENANT_ID']
-  end
-
-  def vra_user
-    @vra_user ||= ENV['VRA_USER'] || ask('Enter User: ') {|q| q.echo = true}
-  end
-
-  def vra_pass
-    @vra_pass ||= ENV['VRA_PASS'] || ask('Enter VRA Password: ') {|q| q.echo = 'x'}
-  end
-
-  def base_url
-    @server ||= ENV['VRA_URL']
-  end
-
-
-  # @return [VRA::Client] - creates a new client object and returns it
-  def client
-    @client ||= Vra::Client.new(
-      username: vra_user,
-      password: vra_pass,
-      tenant: 'vsphere.local',
-      base_url: base_url,
-      verify_ssl: false,
-     )
-  end
-
-  # @return Array[String] - returns an array of catalog items
-  def catalog_items
-   client.catalog.all_items.map {|i| {name: i.name, id: i.id}}
-  end
-
-  def request_options
-    {
-      cpus: 1,
-      memory: 4096,
-      requested_for: 'someone@localhost',
-      lease_days: 2,
-      additional_params: request_params,
-      notes: 'Corey Test',
-      subtenant_id: request_data['organization']['subtenantRef']
-    }
-  end
-
-  def request_data
-    @request_data ||= YAML.load_file(@payload_file)
-  end
-
-  def parameters
-    request_data['requestData']['entries'].map {|item| [item['key'], item['value'].values].flatten }
-  end
-
-  def request_params
-    unless @request_params
-      @request_params = Vra::RequestParameters.new
-      parameters.each { |p| @request_params.set(*p)}
-    end
-    @request_params
-  end
-
-  def request_item
-     blueprint = request_data['catalogItemRef']['id']
-     client.catalog.request(blueprint, request_options)
-  end
-
-  # @return [Vra::Request] - returns a request item
-  def submit_new_request(payload_file)
-    @payload_file = payload_file
-    request_item.submit
-  end
-
-  require 'optparse'
-
-  def run
-  	options = {}
-  	OptionParser.new do |opts|
-  	  opts.program_name = 'vra-pool'
-  	  opts.on_head(<<-EOF
-
-    Summary: A tool used to provision systems in VRA
-  	  EOF
-  	  )
-  	  opts.on('-n', '--node-file FILE', "Load the request data from this file and create it") do |c|
-  	    options[:node_file] = c
-  	    @payload_file = c
-  	    submit_new_request if File.exist?(@payload_file) # create the request
-  	  end
-  	end.parse!
-  end
-end
-
-include VraUtilities