vcloud-core 0.4.0 → 0.5.0

data/.travis.yml

@@ -2,8 +2,5 @@
 language: ruby
 rvm:
   - 1.9.3
-branches:
-  except:
-    - master
 notifications:
   email: false

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.5.0 (2014-05-30)
+
+Features:
+
+  - `vcloud-query --version` now only returns the version string and no
+    usage information.
+  - Support 'pool' mode for VM IP address allocation.
+
 ## 0.4.0 (2014-05-23)
 
 Features:

data/Rakefile

@@ -1,7 +1,6 @@
 require 'rspec/core/rake_task'
-require 'cucumber/rake/task'
 
-task :default => [:rubocop, :spec, :features]
+task :default => [:rubocop, :spec]
 
 RSpec::Core::RakeTask.new(:spec) do |task|
   # Set a bogus Fog credential, otherwise it's possible for the unit
@@ -12,11 +11,6 @@ RSpec::Core::RakeTask.new(:spec) do |task|
   task.pattern = FileList['spec/vcloud/**/*_spec.rb']
 end
 
-Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = "--format pretty --no-source"
-  t.fork = false
-end
-
 RSpec::Core::RakeTask.new('integration') do |t|
   t.pattern = FileList['spec/integration/**/*_spec.rb']
 end

data/bin/vcloud-query

@@ -1,76 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
-require 'bundler/setup'
-require 'optparse'
-require 'methadone'
-
 require 'vcloud/core'
 
-class App
-
-  include Methadone::Main
-  include Methadone::CLILogging
-  include Vcloud
-
-  main do |type|
-    Vcloud::Core::Query.new(type, options).run
-  end
-
-  on('-A', '--sort-asc', '=ATTRIBUTE', 'Sort ascending') do |v|
-    options[:sortAsc] = v
-  end
-
-  on('-D', '--sort-desc', '=ATTRIBUTE', 'Sort descending') do |v|
-    options[:sortDesc] = v
-  end
-
-  on('--fields', '=NAMES', 'Attribute or metadata key names') do |v|
-    options[:fields] = v
-  end
-
-  on('--filter', '=FILTER', 'Filter expression') do |v|
-    options[:filter] = v
-  end
-
-  on('-o', '--output-format', '=FORMAT', 'Output format: csv, tsv, yaml') do |v|
-    options[:output_format] = v.downcase
-  end
-
-  arg :type, :optional
-
-  description '
-  vcloud-query takes a query type and returns all vCloud entities of
-  that type, obeying supplied filter rules.
-
-  Query types map to vCloud entities, for example: vApp, vm, orgVdc, orgVdcNetwork.
-
-  Without a type argument, returns a list of available Entity Types to query.
-
-  See https://github.com/alphagov/vcloud-tools/blob/master/README.md for more info.
-
-  Example use:
-
-    # get a list of all vApps, returning all available parameters, in YAML
-
-    vcloud-query -o yaml vApp
-
-    # get a list of all powered off VMs return the name and containerName (vapp
-    # name)
-
-    vcloud-query --filter "status==POWERED_OFF" --fields name,containerName vm
-
-    # list all query types (types are left-most column, possible formats listed
-    # on the left (records is default, and most useful)
-
-    vcloud-query
-
-  '
-
-
-  version Vcloud::Core::VERSION
-
-  #use_log_level_option
-
-  go!
-end
+Vcloud::Core::QueryCli.new(ARGV).run

data/lib/vcloud/core.rb

@@ -16,6 +16,7 @@ require 'vcloud/core/vapp'
 require 'vcloud/core/vapp_template'
 require 'vcloud/core/org_vdc_network'
 require 'vcloud/core/query'
+require 'vcloud/core/query_cli'
 require 'vcloud/core/query_runner'
 
 module Vcloud

data/lib/vcloud/core/query_cli.rb

@@ -0,0 +1,108 @@
+require 'optparse'
+
+module Vcloud
+  module Core
+    class QueryCli
+      def initialize(argv_array)
+        @usage_text = nil
+        @type = nil
+        @options = {}
+
+        parse(argv_array)
+      end
+
+      def run
+        begin
+          Vcloud::Core::Query.new(@type, @options).run
+        rescue => e
+          $stderr.puts(e)
+          exit 1
+        end
+      end
+
+      private
+
+      def parse(args)
+        opt_parser = OptionParser.new do |opts|
+          opts.banner = <<-EOS
+Usage: #{$0} [options] [type]
+
+vcloud-query takes a query type and returns all vCloud entities of
+that type, obeying supplied filter rules.
+
+Query types map to vCloud entities, for example: vApp, vm, orgVdc, orgVdcNetwork.
+
+Without a type argument, returns a list of available Entity Types to query.
+
+See https://github.com/alphagov/vcloud-tools/blob/master/README.md for more info.
+
+Example use:
+
+  # get a list of all vApps, returning all available parameters, in YAML
+
+  vcloud-query -o yaml vApp
+
+  # get a list of all powered off VMs return the name and containerName (vapp
+  # name)
+
+  vcloud-query --filter "status==POWERED_OFF" --fields name,containerName vm
+
+  # list all query types (types are left-most column, possible formats listed
+  # on the left (records is default, and most useful)
+
+  vcloud-query
+          EOS
+
+          opts.on('-A', '--sort-asc ATTRIBUTE', 'Sort ascending') do |v|
+            @options[:sortAsc] = v
+          end
+
+          opts.on('-D', '--sort-desc ATTRIBUTE', 'Sort descending') do |v|
+            @options[:sortDesc] = v
+          end
+
+          opts.on('--fields NAMES', 'Attribute or metadata key names') do |v|
+            @options[:fields] = v
+          end
+
+          opts.on('--filter FILTER', 'Filter expression') do |v|
+            @options[:filter] = v
+          end
+
+          opts.on('-o', '--output-format FORMAT', 'Output format: csv, tsv, yaml') do |v|
+            @options[:output_format] = v.downcase
+          end
+
+          opts.on("-h", "--help", "Print usage and exit") do
+            $stderr.puts opts
+            exit
+          end
+
+          opts.on("--version", "Display version and exit") do
+            puts Vcloud::Core::VERSION
+            exit
+          end
+        end
+
+        @usage_text = opt_parser.to_s
+        begin
+          opt_parser.parse!(args)
+        rescue OptionParser::InvalidOption => e
+          exit_error_usage(e)
+        end
+
+        if args.size > 1
+          exit_error_usage("too many arguments")
+        elsif args.size == 1
+          @type = args.first
+        end
+      end
+
+      def exit_error_usage(error)
+        $stderr.puts "#{$0}: #{error}"
+        $stderr.puts @usage_text
+        exit 2
+      end
+    end
+  end
+end

data/lib/vcloud/core/version.rb

@@ -1,5 +1,5 @@
 module Vcloud
   module Core
-    VERSION = '0.4.0'
+    VERSION = '0.5.0'
   end
 end

data/lib/vcloud/core/vm.rb

@@ -89,9 +89,14 @@ module Vcloud
               NetworkConnectionIndex: i,
               IsConnected: true
           }
-          ip_address = network[:ip_address]
-          connection[:IpAddress] = ip_address unless ip_address.nil?
-          connection[:IpAddressAllocationMode] = ip_address ? 'MANUAL' : 'DHCP'
+          ip_address      = network[:ip_address]
+          allocation_mode = network[:allocation_mode]
+
+          allocation_mode = 'manual' if ip_address
+          allocation_mode = 'dhcp' unless %w{dhcp manual pool}.include?(allocation_mode)
+
+          connection[:IpAddressAllocationMode] = allocation_mode.upcase
+          connection[:IpAddress] = ip_address if ip_address
           connection
         end
         Vcloud::Fog::ServiceInterface.new.put_network_connection_system_section_vapp(id, section)

data/lib/vcloud/fog/service_interface.rb

@@ -9,7 +9,7 @@ module Vcloud
                      :get_execute_query, :get_vapp_metadata, :power_off_vapp, :shutdown_vapp, :session,
                      :post_instantiate_vapp_template, :put_memory, :put_cpu, :power_on_vapp, :put_vapp_metadata_value,
                      :put_vm, :get_edge_gateway, :get_network_complete, :delete_network, :post_create_org_vdc_network,
-                     :post_configure_edge_gateway_services
+                     :post_configure_edge_gateway_services, :get_vdc
 
       #########################
       # FogFacade Inner class to represent a logic free facade over our interactions with Fog

data/spec/integration/core/vdc_spec.rb

@@ -0,0 +1,91 @@
+require 'spec_helper'
+
+describe Vcloud::Core::Vdc do
+
+  let(:uuid_matcher) { '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}' }
+
+  before(:all) do
+    config_file = File.join(File.dirname(__FILE__), "../vcloud_tools_testing_config.yaml")
+    @test_data = Vcloud::Tools::Tester::TestParameters.new(config_file)
+  end
+
+  describe ".get_by_name" do
+
+    subject { Vcloud::Core::Vdc.get_by_name(name) }
+
+    context "when looking up a valid vDC name" do
+
+      let(:name) { @test_data.vdc_1_name }
+
+      it "returns a Vcloud::Core::Vdc object" do
+        expect(subject).to be_instance_of(Vcloud::Core::Vdc)
+      end
+
+      it "returns a Vdc object with a valid id" do
+        expect(subject.id).to match(/\A#{uuid_matcher}\Z/)
+      end
+
+      it "returns a Vdc object with our expected name" do
+        expect(subject.name).to eq(name)
+      end
+
+    end
+
+    context "when looking up an invalid vDC name" do
+
+      let(:name) { "bogus Vdc name 12p412irjof" }
+
+      it "throws an error" do
+        expect { subject }.to raise_error("vDc #{name} not found")
+      end
+
+    end
+
+  end
+
+  describe ".new" do
+
+    subject { Vcloud::Core::Vdc.new(vdc_id) }
+
+    context "when instantiating with a valid ID" do
+
+      let(:vdc_id) { Vcloud::Core::Vdc.get_by_name(@test_data.vdc_1_name).id }
+
+      it "returns a valid Vdc object" do
+        expect(subject).to be_instance_of(Vcloud::Core::Vdc)
+      end
+
+      it "has our expected #id" do
+        expect(subject.id).to eq(vdc_id)
+      end
+
+      it "has our expected #name" do
+        expect(subject.name).to eq(@test_data.vdc_1_name)
+      end
+
+    end
+
+    context "when instantiating with a valid UUID, that does not refer to a Vdc" do
+
+      let(:vdc_id) { '12345678-1234-1234-1234-123456789012' }
+
+      it "returns a valid Vdc object" do
+        expect(subject).to be_instance_of(Vcloud::Core::Vdc)
+      end
+
+      it "has our expected #id" do
+        expect(subject.id).to eq(vdc_id)
+      end
+
+      it "throws a Forbidden error when trying to access the #name of the Vdc" do
+        expect { subject.name }.to raise_error(
+          Fog::Compute::VcloudDirector::Forbidden,
+          /\ANo access to entity /
+        )
+      end
+
+    end
+
+  end
+
+end

data/spec/integration/core/vm_spec.rb

@@ -0,0 +1,260 @@
+require 'spec_helper'
+
+describe Vcloud::Core::Vm do
+
+  before(:all) do
+    config_file = File.join(File.dirname(__FILE__), "../vcloud_tools_testing_config.yaml")
+    @test_data = Vcloud::Tools::Tester::TestParameters.new(config_file)
+    @network_names = [ @test_data.network_1, @test_data.network_2 ]
+    @network_ips = {
+      @test_data.network_1 => @test_data.network_1_ip,
+      @test_data.network_2 => @test_data.network_2_ip,
+    }
+    @test_case_vapps = IntegrationHelper.create_test_case_vapps(
+      1,
+      @test_data.vdc_1_name,
+      @test_data.catalog,
+      @test_data.vapp_template,
+      @network_names,
+      "vcloud-core-vm-tests"
+    )
+    @vapp = @test_case_vapps.first
+    vapp_vms = @vapp.fog_vms.map do |fog_vm|
+      vm_id = fog_vm[:href].split('/').last
+      Vcloud::Core::Vm.new(vm_id, @vapp)
+    end
+    @vm = vapp_vms.first
+  end
+
+  context "#vcloud_attributes" do
+
+    it "has a :href element containing the expected VM id" do
+      expect(@vm.vcloud_attributes[:href].split('/').last).to eq(@vm.id)
+    end
+
+  end
+
+  context "#update_memory_size_in_mb" do
+
+    it "can increase the memory size by 512MB" do
+      initial_memory_size = Integer(@vm.memory)  # Vm#memory returns a string
+      memory_to_add_in_mb = 512
+      new_memory_size = initial_memory_size + memory_to_add_in_mb
+      @vm.update_memory_size_in_mb(new_memory_size)
+      expect(Integer(@vm.memory)).to eq(new_memory_size)
+    end
+
+    it "can reduce the memory size by 512MB" do
+      initial_memory_size = Integer(@vm.memory)  # Vm#memory returns a string
+      memory_to_remove_in_mb = 512
+      new_memory_size = initial_memory_size - memory_to_remove_in_mb
+      @vm.update_memory_size_in_mb(new_memory_size)
+      expect(Integer(@vm.memory)).to eq(new_memory_size)
+    end
+
+  end
+
+  context "#update_name" do
+
+    it "can update the name of the vm" do
+      current_name = @vm.name
+      new_name = "#{current_name}-updated"
+      @vm.update_name(new_name)
+      expect(@vm.name).to eq(new_name)
+    end
+
+  end
+
+  context "#vapp_name" do
+
+    it "can retrieve the name of its parent vApp" do
+      expect(@vm.vapp_name).to eq(@vapp.name)
+    end
+
+  end
+
+  context "#update_cpu_count" do
+
+    it "can increase the number of CPUs in a VM" do
+      initial_cpu_count = Integer(@vm.cpu) # Vm#cpu returns a string :(
+      new_cpu_count = initial_cpu_count * 2
+      @vm.update_cpu_count(new_cpu_count)
+      expect(Integer(@vm.cpu)).to eq(new_cpu_count)
+    end
+
+    it "can decrease the number of CPUs in a VM to 1" do
+      initial_cpu_count = Integer(@vm.cpu) # Vm#cpu returns a string :(
+      new_cpu_count = 1
+      expect(initial_cpu_count).to be > new_cpu_count
+      @vm.update_cpu_count(new_cpu_count)
+      expect(Integer(@vm.cpu)).to eq(new_cpu_count)
+    end
+
+  end
+
+  context "#update_metadata" do
+
+    before(:all) do
+      @initial_vm_metadata = Vcloud::Core::Vm.get_metadata(@vm.id)
+      @initial_vapp_metadata = Vcloud::Core::Vapp.get_metadata(@vapp.id)
+    end
+
+    it "updates the Vm metadata, if a single key/value is specified" do
+      @vm.update_metadata({"Test Key" => "test value"})
+      updated_metadata = Vcloud::Core::Vm.get_metadata(@vm.id)
+      # get_metadata is symbolizing the key names
+      expected_metadata = @initial_vm_metadata.merge({
+        :"Test Key" => "test value"
+      })
+      expect(updated_metadata).to eq(expected_metadata)
+    end
+
+    it "adds to the existing Vm metadata, rather than replacing it" do
+      @vm.update_metadata({"Another Test" => "test value 2"})
+      updated_metadata = Vcloud::Core::Vm.get_metadata(@vm.id)
+      # get_metadata is symbolizing the key names
+      expected_metadata = @initial_vm_metadata.merge({
+        :"Test Key" => "test value",
+        :"Another Test" => "test value 2",
+      })
+      expect(updated_metadata).to eq(expected_metadata)
+    end
+
+    it "has also updated parent vApp with the same metadata" do
+      updated_vapp_metadata = Vcloud::Core::Vapp.get_metadata(@vapp.id)
+      # get_metadata is symbolizing the key names
+      expected_vapp_metadata = @initial_vapp_metadata.merge({
+        :"Test Key" => "test value",
+        :"Another Test" => "test value 2",
+      })
+      expect(updated_vapp_metadata).to eq(expected_vapp_metadata)
+    end
+
+  end
+
+  context "#add_extra_disks" do
+
+    before(:all) do
+      @fog_model_vm = Vcloud::Fog::ModelInterface.new.get_vm_by_href(@vm.href)
+      @initial_vm_disks = get_vm_hard_disks(@fog_model_vm)
+    end
+
+    it "the VM should already have a single disk assigned" do
+      expect(@initial_vm_disks.size).to eq(1)
+    end
+
+    it "can successfully add a second disk" do
+      extra_disks = [ { size: '20480' } ]
+      @vm.add_extra_disks(extra_disks)
+      updated_vm_disks = get_vm_hard_disks(@fog_model_vm)
+      expect(updated_vm_disks.size).to eq(2)
+    end
+
+    it "can successfully add several disks in one call" do
+      extra_disks = [ { size: '20480' }, { size: '10240' } ]
+      disks_before_update = get_vm_hard_disks(@fog_model_vm)
+      @vm.add_extra_disks(extra_disks)
+      disks_after_update = get_vm_hard_disks(@fog_model_vm)
+      expect(disks_after_update.size).to eq(disks_before_update.size + extra_disks.size)
+    end
+
+  end
+
+  context "#configure_network_interfaces" do
+
+    it "can configure a single NIC, default DHCP" do
+      network_config = [
+        { :name => @network_names[0] }
+      ]
+      @vm.configure_network_interfaces(network_config)
+      # if number if nics is 1, API returns a Hash.
+      # This is a bug in Fog -- ensure_list! is needed. See
+      # https://github.com/fog/fog/issues/2927
+      vm_nics = @vm.vcloud_attributes[:NetworkConnectionSection][:NetworkConnection]
+      expect(vm_nics).to be_instance_of(Hash)
+      expect(vm_nics[:network]).to eq(network_config[0][:name])
+      expect(vm_nics[:IpAddressAllocationMode]).to eq('DHCP')
+    end
+
+    it "can configure dual NICs, both defaulting to DHCP" do
+      network_config = [
+        { :name => @network_names[0] },
+        { :name => @network_names[1] }
+      ]
+      @vm.configure_network_interfaces(network_config)
+      # if number if nics is 2+, API returns a Array.
+      # See https://github.com/fog/fog/issues/2927
+      vm_nics = @vm.vcloud_attributes[:NetworkConnectionSection][:NetworkConnection]
+      vm_nics = sort_nics_based_on_network_connection_index(vm_nics)
+      expect(vm_nics).to be_instance_of(Array)
+      expect(vm_nics.size).to eq(network_config.size)
+      expect(vm_nics[0][:network]).to eq(network_config[0][:name])
+      expect(vm_nics[0][:IpAddressAllocationMode]).to eq('DHCP')
+      expect(vm_nics[0][:NetworkConnectionIndex]).to eq('0')
+      expect(vm_nics[1][:network]).to eq(network_config[1][:name])
+      expect(vm_nics[1][:IpAddressAllocationMode]).to eq('DHCP')
+      expect(vm_nics[1][:NetworkConnectionIndex]).to eq('1')
+    end
+
+    it "can configure dual NICs with manually assigned IP addresses" do
+      network_config = [
+        { :name => @network_names[0], :ip_address => @network_ips[@network_names[0]] },
+        { :name => @network_names[1], :ip_address => @network_ips[@network_names[1]] },
+      ]
+      @vm.configure_network_interfaces(network_config)
+      # if number if nics is 2+, API returns a Array.
+      vm_nics = @vm.vcloud_attributes[:NetworkConnectionSection][:NetworkConnection]
+      vm_nics = sort_nics_based_on_network_connection_index(vm_nics)
+      expect(vm_nics).to be_instance_of(Array)
+      expect(vm_nics.size).to eq(network_config.size)
+      expect(vm_nics[0][:network]).to eq(network_config[0][:name])
+      expect(vm_nics[0][:IpAddress]).to eq(network_config[0][:ip_address])
+      expect(vm_nics[0][:IpAddressAllocationMode]).to eq('MANUAL')
+      expect(vm_nics[0][:NetworkConnectionIndex]).to eq('0')
+      expect(vm_nics[1][:network]).to eq(network_config[1][:name])
+      expect(vm_nics[1][:IpAddress]).to eq(network_config[1][:ip_address])
+      expect(vm_nics[1][:IpAddressAllocationMode]).to eq('MANUAL')
+      expect(vm_nics[1][:NetworkConnectionIndex]).to eq('1')
+    end
+
+  end
+
+  context "#update_storage_profile" do
+
+    it "can update the storage profile of a VM" do
+      available_storage_profiles = Vcloud::Core::QueryRunner.new.run(
+        'orgVdcStorageProfile',
+        filter: "vdcName==#{@test_data.vdc_1_name}"
+      )
+      if available_storage_profiles.size == 1
+        pending("There is only one StorageProfile in vDC #{@test_data.vdc_1_name}: cannot test.")
+      end
+      original_storage_profile_name = @vm.vcloud_attributes[:StorageProfile][:name]
+      expect(original_storage_profile_name).to eq(@test_data.default_storage_profile_name)
+      @vm.update_storage_profile(@test_data.storage_profile)
+      expect(@vm.vcloud_attributes[:StorageProfile][:name]).to eq(@test_data.storage_profile)
+    end
+
+  end
+
+  after(:all) do
+    IntegrationHelper.delete_vapps(@test_case_vapps)
+  end
+
+  def get_vm_hard_disks(fog_model_vm)
+    # 'disks' Model VM method returns disks + controllers. Disks always have
+    # the name 'Hard Disk {n}' where (n >= 0).
+    fog_model_vm.disks.select { |disk| disk.name =~ /^Hard disk/ }
+  end
+
+  def sort_nics_based_on_network_connection_index(network_connection_list)
+    # The :NetworkConnection Array is not (necessarily) ordered when it is
+    # retrieved via the API.
+    # Instead, they are indexed by the :NetworkConnectionIndex value, which
+    # is returned by the API as a number-as-a-string (eg "0", "1")
+    network_connection_list.sort_by do |n|
+      Integer(n[:NetworkConnectionIndex])
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -3,7 +3,6 @@ if ENV['COVERAGE']
 
   SimpleCov.profiles.define 'gem' do
     add_filter '/spec/'
-    add_filter '/features/'
     add_filter '/vendor/'
 
     add_group 'Libraries', '/lib/'

data/spec/vcloud/core/query_cli_spec.rb

@@ -0,0 +1,160 @@
+require 'spec_helper'
+
+class CommandRun
+  attr_accessor :stdout, :stderr, :exitstatus
+
+  def initialize(args)
+    out = StringIO.new
+    err = StringIO.new
+
+    $stdout = out
+    $stderr = err
+
+    begin
+      Vcloud::Core::QueryCli.new(args).run
+      @exitstatus = 0
+    rescue SystemExit => e
+      # Capture exit(n) value.
+      @exitstatus = e.status
+    end
+
+    @stdout = out.string.strip
+    @stderr = err.string.strip
+
+    $stdout = STDOUT
+    $stderr = STDERR
+  end
+end
+
+describe Vcloud::Core::QueryCli do
+  subject { CommandRun.new(args) }
+  let(:mock_query) {
+    double(:query, :run => true)
+  }
+
+  describe "normal usage" do
+    context "when given no arguments" do
+      let(:args) { %w{} }
+
+      it "should pass nil type and empty options hash, then exit normally" do
+        expect(Vcloud::Core::Query).to receive(:new).
+          with(nil, {}).and_return(mock_query)
+        expect(mock_query).to receive(:run)
+        expect(subject.exitstatus).to eq(0)
+      end
+    end
+
+    context "when given type" do
+      let(:args) { %w{vApp} }
+
+      it "should pass type and empty options hash, then exit normally" do
+        expect(Vcloud::Core::Query).to receive(:new).
+          with('vApp', {}).and_return(mock_query)
+        expect(mock_query).to receive(:run)
+        expect(subject.exitstatus).to eq(0)
+      end
+    end
+
+    context "when asked to display version" do
+      let(:args) { %w{--version} }
+
+      it "should not call Query" do
+        expect(Vcloud::Core::Query).not_to receive(:new)
+      end
+
+      it "should print version and exit normally" do
+        expect(subject.stdout).to eq(Vcloud::Core::VERSION)
+        expect(subject.exitstatus).to eq(0)
+      end
+    end
+
+    context "when asked to display help" do
+      let(:args) { %w{--help} }
+
+      it "should not call Query" do
+        expect(Vcloud::Core::Query).not_to receive(:new)
+      end
+
+      it "should print usage and exit normally" do
+        expect(subject.stderr).to match(/\AUsage: \S+ \[options\] \[type\]\n/)
+        expect(subject.exitstatus).to eq(0)
+      end
+    end
+  end
+
+  describe "simple arguments with values" do
+    {
+      :sortAsc  => '--sort-asc',
+      :sortDesc => '--sort-desc',
+      :fields   => '--fields',
+      :filter   => '--filter',
+    }.each do |options_key, cli_arg|
+      context "when given #{cli_arg}" do
+        let(:args) { [cli_arg, 'giraffe'] }
+
+        it "should pass :#{options_key} in options hash and exit normally" do
+          expect(Vcloud::Core::Query).to receive(:new).
+            with(nil, { options_key => 'giraffe' }).
+            and_return(mock_query)
+          expect(mock_query).to receive(:run)
+          expect(subject.exitstatus).to eq(0)
+        end
+      end
+    end
+  end
+
+  describe "complex arguments with values" do
+    context "when given --output-format with mixed case value" do
+      let(:args) { %w{--output-format MixedCaseValue} }
+
+      it "should pass downcased value in options hash and exit normally" do
+        expect(Vcloud::Core::Query).to receive(:new).
+          with(nil, { :output_format => 'mixedcasevalue' }).
+          and_return(mock_query)
+        expect(mock_query).to receive(:run)
+        expect(subject.exitstatus).to eq(0)
+      end
+    end
+  end
+
+  describe "incorrect usage" do
+    shared_examples "print usage and exit abnormally" do |error|
+      it "should not call Query" do
+        expect(Vcloud::Core::Query).not_to receive(:new)
+      end
+
+      it "should print error message and usage" do
+        expect(subject.stderr).to match(/\A\S+: #{error}\nUsage: \S+/)
+      end
+
+      it "should exit abnormally for incorrect usage" do
+        expect(subject.exitstatus).to eq(2)
+      end
+    end
+
+    context "when given more than type argument" do
+      let(:args) { %w{type_one type_two} }
+
+      it_behaves_like "print usage and exit abnormally", "too many arguments"
+    end
+
+    context "when given an unrecognised argument" do
+      let(:args) { %w{--this-is-garbage} }
+
+      it_behaves_like "print usage and exit abnormally", "invalid option: --this-is-garbage"
+    end
+  end
+
+  describe "error handling" do
+    context "when underlying code raises an exception" do
+      let(:args) { %w{} }
+
+      it "should print error without backtrace and exit abnormally" do
+        expect(Vcloud::Core::Query).to receive(:new).
+          with(nil, {}).and_raise("something went horribly wrong")
+        expect(subject.stderr).to eq("something went horribly wrong")
+        expect(subject.exitstatus).to eq(1)
+      end
+    end
+  end
+end

data/spec/vcloud/core/vm_spec.rb

@@ -241,6 +241,39 @@ module Vcloud
           @vm.configure_network_interfaces(network_config)
         end
 
+        it "should configure nic from pool" do
+          network_config = [{:name => 'Default', :allocation_mode => 'pool'}]
+          @fog_interface.should_receive(:put_network_connection_system_section_vapp).with(@vm_id, {
+              :PrimaryNetworkConnectionIndex => 0,
+              :NetworkConnection => [
+                  {
+                      :network => 'Default',
+                      :needsCustomization => true,
+                      :NetworkConnectionIndex => 0,
+                      :IsConnected => true,
+                      :IpAddressAllocationMode => "POOL"
+                  }
+              ]})
+          @vm.configure_network_interfaces(network_config)
+        end
+
+        it "should prefer configuring nic with static address" do
+          network_config = [{:name => 'Default', :allocation_mode => 'dhcp', :ip_address => '192.168.1.1'}]
+          @fog_interface.should_receive(:put_network_connection_system_section_vapp).with(@vm_id, {
+              :PrimaryNetworkConnectionIndex => 0,
+              :NetworkConnection => [
+                  {
+                      :network => 'Default',
+                      :needsCustomization => true,
+                      :NetworkConnectionIndex => 0,
+                      :IsConnected => true,
+                      :IpAddress => "192.168.1.1",
+                      :IpAddressAllocationMode => "MANUAL"
+                  }
+              ]})
+          @vm.configure_network_interfaces(network_config)
+        end
+
         it "should configure single nic" do
           network_config = [{:name => 'Default', :ip_address => '192.168.1.1'}]
           @fog_interface.should_receive(:put_network_connection_system_section_vapp).with(@vm_id, {

data/vcloud-core.gemspec

@@ -23,10 +23,8 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9.2'
 
   s.add_runtime_dependency 'fog', '>= 1.22.0'
-  s.add_runtime_dependency 'methadone'
   s.add_runtime_dependency 'mustache'
-  s.add_development_dependency 'aruba', '~> 0.5.3'
-  s.add_development_dependency 'cucumber', '~> 1.3.10'
+  s.add_development_dependency 'pry'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 2.14.1'
   s.add_development_dependency 'rubocop'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcloud-core
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.22.0
 - !ruby/object:Gem::Dependency
-  name: methadone
+  name: mustache
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,14 +44,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mustache
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -59,38 +59,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.3
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.10
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -204,8 +172,6 @@ files:
 - README.md
 - Rakefile
 - bin/vcloud-query
-- features/support/env.rb
-- features/vcloud-query.feature
 - jenkins.sh
 - jenkins_integration_tests.sh
 - lib/vcloud/core.rb
@@ -218,6 +184,7 @@ files:
 - lib/vcloud/core/metadata_helper.rb
 - lib/vcloud/core/org_vdc_network.rb
 - lib/vcloud/core/query.rb
+- lib/vcloud/core/query_cli.rb
 - lib/vcloud/core/query_runner.rb
 - lib/vcloud/core/vapp.rb
 - lib/vcloud/core/vapp_template.rb
@@ -231,6 +198,8 @@ files:
 - lib/vcloud/fog/service_interface.rb
 - spec/integration/README.md
 - spec/integration/core/query_runner_spec.rb
+- spec/integration/core/vdc_spec.rb
+- spec/integration/core/vm_spec.rb
 - spec/integration/edge_gateway/configure_edge_gateway_services_spec.rb
 - spec/integration/edge_gateway/edge_gateway_spec.rb
 - spec/integration/vcloud_tools_testing_config.yaml.template
@@ -251,6 +220,7 @@ files:
 - spec/vcloud/core/edge_gateway_spec.rb
 - spec/vcloud/core/metadata_helper_spec.rb
 - spec/vcloud/core/org_vdc_network_spec.rb
+- spec/vcloud/core/query_cli_spec.rb
 - spec/vcloud/core/query_runner_spec.rb
 - spec/vcloud/core/query_spec.rb
 - spec/vcloud/core/vapp_spec.rb
@@ -282,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2177023225627992680
+      hash: -1029676288451429784
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -290,10 +260,10 @@ signing_key:
 specification_version: 3
 summary: Core tools for interacting with VMware vCloud Director
 test_files:
-- features/support/env.rb
-- features/vcloud-query.feature
 - spec/integration/README.md
 - spec/integration/core/query_runner_spec.rb
+- spec/integration/core/vdc_spec.rb
+- spec/integration/core/vm_spec.rb
 - spec/integration/edge_gateway/configure_edge_gateway_services_spec.rb
 - spec/integration/edge_gateway/edge_gateway_spec.rb
 - spec/integration/vcloud_tools_testing_config.yaml.template
@@ -314,6 +284,7 @@ test_files:
 - spec/vcloud/core/edge_gateway_spec.rb
 - spec/vcloud/core/metadata_helper_spec.rb
 - spec/vcloud/core/org_vdc_network_spec.rb
+- spec/vcloud/core/query_cli_spec.rb
 - spec/vcloud/core/query_runner_spec.rb
 - spec/vcloud/core/query_spec.rb
 - spec/vcloud/core/vapp_spec.rb

data/features/support/env.rb

@@ -1,16 +0,0 @@
-require 'aruba/cucumber'
-require 'methadone/cucumber'
-
-ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
-LIB_DIR = File.join(File.expand_path(File.dirname(__FILE__)),'..','..','lib')
-
-Before do
-  # Using "announce" causes massive warnings on 1.9.2
-  @puts = true
-  @original_rubylib = ENV['RUBYLIB']
-  ENV['RUBYLIB'] = LIB_DIR + File::PATH_SEPARATOR + ENV['RUBYLIB'].to_s
-end
-
-After do
-  ENV['RUBYLIB'] = @original_rubylib
-end

data/features/vcloud-query.feature

@@ -1,14 +0,0 @@
-Feature: "vcloud-query" works as a useful command-line tool
-  In order to use "vcloud-query" from the CLI
-  I want to have it behave like a typical Unix tool
-  So I don't get surpised
-
-  Scenario: Common arguments work
-    When I get help for "vcloud-query"
-    Then the exit status should be 0
-    And the banner should be present
-    And the banner should document that this app takes options
-    And the following options should be documented:
-      |--version|
-    And the banner should document that this app's arguments are:
-      |type|