vcloud-launcher 0.0.5 → 0.1.0

data/spec/integration/README.md

@@ -0,0 +1,40 @@
+# Running vCloud Launcher Integration Tests
+
+## Prerequisites
+
+- Access to a suitable vCloud Director organisation.
+
+  **NB** It is not safe to run them against an environment that is in use (e.g. production, preview) as
+  many of the tests clear down all config at the beginning and/or end to ensure the environment is as
+  the tests expect.
+
+- A config file with the settings configured.
+
+  There is a [template file](/spec/integration/vcloud_tools_testing_config.yaml.template) to help with this. Copy the template file to `/spec/integration` (i.e. next to the template file) and remove the `.template`. This file will now be ignored by Git and you can safely add the parameters relevant to your environment.
+
+- You need to include the set-up for your testing environment in your [fog file](https://github.com/alphagov/vcloud-launcher#credentials).
+
+- The tests use the [vCloud Tools Tester](http://rubygems.org/gems/vcloud-tools-tester) gem. You do not need to install this, `bundler` will do this for you.
+
+## Parameters
+
+````
+default: # This is the fog credential that refers to your testing environment, e.g. `test_credential`
+  vdc_1_name: # The name of a VDC
+  vdc_2_name: # The name of another VDC - you need two in your organisation to run these tests
+  catalog: # A catalog
+  vapp_template: # A vApp Template within that catalog
+  network_1: # The name of the primary network
+  network_1_ip: # The IP address of the primary network
+  network_2: # The name of a secondary network
+  network_2_ip: # The IP address of the secondary network
+  storage_profile: # The name of a storage profile (not the default)
+  default_storage_profile_name: # The name of the default storage profile
+  default_storage_profile_href: # The href of the default storage profile
+  vdc_1_storage_profile_href: # The href of `storage_profile` in `vdc_1`
+  vdc_2_storage_profile_href: # The href of `storage_profile` in `vdc_2`
+````
+
+## To run the tests
+
+  `FOG_CREDENTIAL=test_credential bundle exec integration`

data/spec/integration/launcher/data/happy_path.yaml.erb

@@ -2,8 +2,8 @@
 vapps:
   - name: <%= vapp_name %>
     vdc_name: <%= vdc_name %>
-    catalog: <%= catalog %>
-    catalog_item: <%= vapp_template %>
+    catalog_name: <%= catalog %>
+    vapp_template_name: <%= vapp_template %>
     vm:
       hardware_config:
         memory: 8192
@@ -21,10 +21,10 @@ vapps:
       - size: '2048'
         name: Hard disk 3
       network_connections:
-      - name: <%= network1 %>
-        ip_address: <%= network1_ip %>
-      - name: <%= network2 %>
-        ip_address: <%= network2_ip %>
+      - name: <%= network_1 %>
+        ip_address: <%= network_1_ip %>
+      - name: <%= network_2 %>
+        ip_address: <%= network_2_ip %>
       bootstrap:
         script_path: <%= bootstrap_script %>
         vars:

data/spec/integration/launcher/data/minimum_data_setup.yaml.erb

@@ -2,5 +2,5 @@
 vapps:
   - name: <%= vapp_name %>
     vdc_name: <%= vdc_name %>
-    catalog: <%= catalog %>
-    catalog_item: <%= vapp_template %>
+    catalog_name: <%= catalog %>
+    vapp_template_name: <%= vapp_template %>

data/spec/integration/launcher/data/storage_profile.yaml.erb

@@ -1,9 +1,9 @@
 ---
 vapps:
   - name: <%= vapp_name_1 %>
-    vdc_name: <%= vdc_name_1 %>
-    catalog: <%= catalog %>
-    catalog_item: <%= vapp_template %>
+    vdc_name: <%= vdc_1_name %>
+    catalog_name: <%= catalog %>
+    vapp_template_name: <%= vapp_template %>
     vm:
       hardware_config: &hardware_config
         memory: 4096
@@ -14,9 +14,9 @@ vapps:
           message: hello world
       storage_profile: <%= storage_profile %>
   - name: <%= vapp_name_2 %>
-    vdc_name: <%= vdc_name_2 %>
-    catalog: <%= catalog %>
-    catalog_item: <%= vapp_template %>
+    vdc_name: <%= vdc_2_name %>
+    catalog_name: <%= catalog %>
+    vapp_template_name: <%= vapp_template %>
     vm:
       hardware_config:
         <<: *hardware_config
@@ -24,9 +24,9 @@ vapps:
         <<: *bootstrap
       storage_profile: <%= storage_profile %>
   - name: <%= vapp_name_3 %>
-    vdc_name: <%= vdc_name_1 %>
-    catalog: <%= catalog %>
-    catalog_item: <%= vapp_template %>
+    vdc_name: <%= vdc_1_name %>
+    catalog_name: <%= catalog %>
+    vapp_template_name: <%= vapp_template %>
     vm:
       hardware_config:
         <<: *hardware_config
@@ -35,9 +35,9 @@ vapps:
       bootstrap:
         <<: *bootstrap
   - name: <%= vapp_name_4 %>
-    vdc_name: <%= vdc_name_1 %>
-    catalog: <%= catalog %>
-    catalog_item: <%= vapp_template %>
+    vdc_name: <%= vdc_1_name %>
+    catalog_name: <%= catalog %>
+    vapp_template_name: <%= vapp_template %>
     vm:
       hardware_config:
         <<: *hardware_config

data/spec/integration/launcher/storage_profile_integration_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'vcloud/tools/tester'
 
 describe Vcloud::Launcher::Launch do
   context "storage profile", :take_too_long => true do
@@ -8,22 +9,22 @@ describe Vcloud::Launcher::Launch do
       @fog_interface = Vcloud::Fog::ServiceInterface.new
       Vcloud::Launcher::Launch.new.run(@config_yaml, {'dont-power-on' => true})
 
-      @vapp_query_result_1 = @fog_interface.get_vapp_by_name_and_vdc_name(@test_data[:vapp_name_1], @test_data[:vdc_name_1])
+      @vapp_query_result_1 = @fog_interface.get_vapp_by_name_and_vdc_name(@test_data[:vapp_name_1], @test_data[:vdc_1_name])
       @vapp_id_1 = @vapp_query_result_1[:href].split('/').last
       @vapp_1 = @fog_interface.get_vapp @vapp_id_1
       @vm_1 = @vapp_1[:Children][:Vm].first
 
-      @vapp_query_result_2 = @fog_interface.get_vapp_by_name_and_vdc_name(@test_data[:vapp_name_2], @test_data[:vdc_name_2])
+      @vapp_query_result_2 = @fog_interface.get_vapp_by_name_and_vdc_name(@test_data[:vapp_name_2], @test_data[:vdc_2_name])
       @vapp_id_2 = @vapp_query_result_2[:href].split('/').last
       @vapp_2 = @fog_interface.get_vapp @vapp_id_2
       @vm_2 = @vapp_2[:Children][:Vm].first
 
-      @vapp_query_result_3 = @fog_interface.get_vapp_by_name_and_vdc_name(@test_data[:vapp_name_3], @test_data[:vdc_name_1])
+      @vapp_query_result_3 = @fog_interface.get_vapp_by_name_and_vdc_name(@test_data[:vapp_name_3], @test_data[:vdc_1_name])
       @vapp_id_3 = @vapp_query_result_3[:href].split('/').last
       @vapp_3 = @fog_interface.get_vapp @vapp_id_3
       @vm_3 = @vapp_3[:Children][:Vm].first
 
-      @vapp_query_result_4 = @fog_interface.get_vapp_by_name_and_vdc_name(@test_data[:vapp_name_4], @test_data[:vdc_name_1])
+      @vapp_query_result_4 = @fog_interface.get_vapp_by_name_and_vdc_name(@test_data[:vapp_name_4], @test_data[:vdc_1_name])
       @vapp_id_4 = @vapp_query_result_4[:href].split('/').last
       @vapp_4 = @fog_interface.get_vapp @vapp_id_4
       @vm_4 = @vapp_4[:Children][:Vm].first
@@ -83,21 +84,24 @@ describe Vcloud::Launcher::Launch do
 end
 
 def define_test_data
+  config_file = File.join(File.dirname(__FILE__),
+    "../vcloud_tools_testing_config.yaml")
+  parameters = Vcloud::Tools::Tester::TestParameters.new(config_file)
   {
-      vapp_name_1: "vdc-1-sp-#{Time.now.strftime('%s')}",
-      vapp_name_2: "vdc-2-sp-#{Time.now.strftime('%s')}",
-      vapp_name_3: "vdc-3-sp-#{Time.now.strftime('%s')}",
-      vapp_name_4: "vdc-4-sp-#{Time.now.strftime('%s')}",
-      vdc_name_1: ENV['VDC_NAME_1'],
-      vdc_name_2: ENV['VDC_NAME_2'],
-      catalog: ENV['VCLOUD_CATALOG_NAME'],
-      vapp_template: ENV['VCLOUD_TEMPLATE_NAME'],
-      storage_profile: ENV['VCLOUD_STORAGE_PROFILE_NAME'],
-      vdc_1_sp_href: ENV['VDC_1_STORAGE_PROFILE_HREF'],
-      vdc_2_sp_href: ENV['VDC_2_STORAGE_PROFILE_HREF'],
-      default_storage_profile_name: ENV['DEFAULT_STORAGE_PROFILE_NAME'],
-      default_storage_profile_href: ENV['DEFAULT_STORAGE_PROFILE_HREF'],
-      nonsense_storage_profile: "nonsense-storage-profile-name",
-      bootstrap_script: File.join(File.dirname(__FILE__), "data/basic_preamble_test.erb"),
+    vapp_name_1: "vdc-1-sp-#{Time.now.strftime('%s')}",
+    vapp_name_2: "vdc-2-sp-#{Time.now.strftime('%s')}",
+    vapp_name_3: "vdc-3-sp-#{Time.now.strftime('%s')}",
+    vapp_name_4: "vdc-4-sp-#{Time.now.strftime('%s')}",
+    vdc_1_name: parameters.vdc_1_name,
+    vdc_2_name: parameters.vdc_2_name,
+    catalog: parameters.catalog,
+    vapp_template: parameters.vapp_template,
+    storage_profile: parameters.storage_profile,
+    vdc_1_sp_href: parameters.vdc_1_storage_profile_href,
+    vdc_2_sp_href: parameters.vdc_2_storage_profile_href,
+    default_storage_profile_name: parameters.default_storage_profile_name,
+    default_storage_profile_href: parameters.default_storage_profile_href,
+    nonsense_storage_profile: "nonsense-storage-profile-name",
+    bootstrap_script: File.join(File.dirname(__FILE__), "data/basic_preamble_test.erb"),
   }
 end

data/spec/integration/launcher/vcloud_launcher_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 require 'pp'
 require 'erb'
 require 'ostruct'
+require 'vcloud/tools/tester'
 
 describe Vcloud::Launcher::Launch do
   context "with minimum input setup" do
@@ -52,7 +53,7 @@ describe Vcloud::Launcher::Launch do
         @vapp[:name].should eq(@test_data[:vapp_name])
         @vapp[:'ovf:NetworkSection'][:'ovf:Network'].count.should eq(2)
         vapp_networks = @vapp[:'ovf:NetworkSection'][:'ovf:Network'].collect { |connection| connection[:ovf_name] }
-        vapp_networks.should =~ [@test_data[:network1], @test_data[:network2]]
+        vapp_networks.should =~ [@test_data[:network_1], @test_data[:network_2]]
       end
 
       it "should create vm within vapp" do
@@ -91,16 +92,16 @@ describe Vcloud::Launcher::Launch do
         vm_network_connection.count.should eq(2)
 
 
-        primary_nic = vm_network_connection.detect { |connection| connection[:network] == @test_data[:network1] }
-        primary_nic[:network].should eq(@test_data[:network1])
+        primary_nic = vm_network_connection.detect { |connection| connection[:network] == @test_data[:network_1] }
+        primary_nic[:network].should eq(@test_data[:network_1])
         primary_nic[:NetworkConnectionIndex].should eq(@vm[:NetworkConnectionSection][:PrimaryNetworkConnectionIndex])
-        primary_nic[:IpAddress].should eq(@test_data[:network1_ip])
+        primary_nic[:IpAddress].should eq(@test_data[:network_1_ip])
         primary_nic[:IpAddressAllocationMode].should eq('MANUAL')
 
-        second_nic = vm_network_connection.detect { |connection| connection[:network] == @test_data[:network2] }
-        second_nic[:network].should eq(@test_data[:network2])
+        second_nic = vm_network_connection.detect { |connection| connection[:network] == @test_data[:network_2] }
+        second_nic[:network].should eq(@test_data[:network_2])
         second_nic[:NetworkConnectionIndex].should eq('1')
-        second_nic[:IpAddress].should eq(@test_data[:network2_ip])
+        second_nic[:IpAddress].should eq(@test_data[:network_2_ip])
         second_nic[:IpAddressAllocationMode].should eq('MANUAL')
 
       end
@@ -140,18 +141,21 @@ describe Vcloud::Launcher::Launch do
   end
 
   def define_test_data
+    config_file = File.join(File.dirname(__FILE__),
+      "../vcloud_tools_testing_config.yaml")
+    parameters = Vcloud::Tools::Tester::TestParameters.new(config_file)
     {
-        vapp_name: "vapp-vcloud-tools-tests-#{Time.now.strftime('%s')}",
-        vdc_name: ENV['VCLOUD_VDC_NAME'],
-        catalog: ENV['VCLOUD_CATALOG_NAME'],
-        vapp_template: ENV['VCLOUD_TEMPLATE_NAME'],
-        network1: ENV['VCLOUD_NETWORK1_NAME'],
-        network2: ENV['VCLOUD_NETWORK2_NAME'],
-        network1_ip: ENV['VCLOUD_NETWORK1_IP'],
-        network2_ip: ENV['VCLOUD_NETWORK2_IP'],
-        storage_profile: ENV['VCLOUD_STORAGE_PROFILE_NAME'],
-        bootstrap_script: File.join(File.dirname(__FILE__), "data/basic_preamble_test.erb"),
-        date_metadata: DateTime.parse('2013-10-23 15:34:00 +0000')
+      vapp_name: "vapp-vcloud-tools-tests-#{Time.now.strftime('%s')}",
+      vdc_name: parameters.vdc_1_name,
+      catalog: parameters.catalog,
+      vapp_template: parameters.vapp_template,
+      storage_profile: parameters.storage_profile,
+      network_1: parameters.network_1,
+      network_2: parameters.network_2,
+      network_1_ip: parameters.network_1_ip,
+      network_2_ip: parameters.network_2_ip,
+      bootstrap_script: File.join(File.dirname(__FILE__), "data/basic_preamble_test.erb"),
+      date_metadata: DateTime.parse('2013-10-23 15:34:00 +0000')
     }
   end
 end

data/spec/integration/vcloud_tools_testing_config.yaml.template

@@ -0,0 +1,14 @@
+default:
+  vdc_1_name:
+  vdc_2_name:
+  catalog:
+  vapp_template:
+  network_1:
+  network_1_ip:
+  network_2:
+  network_2_ip:
+  storage_profile:
+  default_storage_profile_name:
+  default_storage_profile_href:
+  vdc_1_storage_profile_href:
+  vdc_2_storage_profile_href:

data/spec/vcloud/launcher/launch_spec.rb

@@ -1,76 +1,74 @@
 require 'spec_helper'
 
-module Vcloud
-  describe Launcher::Launch do
-    context "#run" do
-      before(:each) do
-        config_loader = double(:config_loader)
-        expect(Vcloud::Core::ConfigLoader).to receive(:new).and_return(config_loader)
-        @successful_app_1 = {
-            :name => "successful app 1",
-            :vdc_name => "Test Vdc",
-            :catalog => "default",
-            :catalog_item => "ubuntu-precise"
-        }
-        @fake_failing_app = {
-            :name => "fake failing app",
-            :vdc_name => "wrong vdc",
-            :catalog => "default",
-            :catalog_item => "ubuntu-precise"
-        }
-        @successful_app_2 = {
-            :name => "successful app 2",
-            :vdc_name => "Test Vdc",
-            :catalog => "default",
-            :catalog_item => "ubuntu-precise"
-        }
-        expect(config_loader).to receive(:load_config).
-          and_return({:vapps => [@successful_app_1, @fake_failing_app, @successful_app_2]})
-      end
-
-      it "should stop on failure by default" do
-        expect(Vcloud::Launcher::VappOrchestrator).to receive(:provision).with(@successful_app_1).and_return(double(:vapp, :power_on => true))
-        expect(Vcloud::Launcher::VappOrchestrator).to receive(:provision).with(@fake_failing_app).and_raise(RuntimeError.new('failed to find vdc'))
-        expect(Vcloud::Launcher::VappOrchestrator).not_to receive(:provision).with(@successful_app_2)
+describe Vcloud::Launcher::Launch do
+  context "#run" do
+    before(:each) do
+      config_loader = double(:config_loader)
+      expect(Vcloud::Core::ConfigLoader).to receive(:new).and_return(config_loader)
+      @successful_app_1 = {
+          :name => "successful app 1",
+          :vdc_name => "Test Vdc",
+          :catalog_name => "default",
+          :vapp_template_name => "ubuntu-precise"
+      }
+      @fake_failing_app = {
+          :name => "fake failing app",
+          :vdc_name => "wrong vdc",
+          :catalog_name => "default",
+          :vapp_template_name => "ubuntu-precise"
+      }
+      @successful_app_2 = {
+          :name => "successful app 2",
+          :vdc_name => "Test Vdc",
+          :catalog_name => "default",
+          :vapp_template_name => "ubuntu-precise"
+      }
+      expect(config_loader).to receive(:load_config).
+        and_return({:vapps => [@successful_app_1, @fake_failing_app, @successful_app_2]})
+    end
 
-        cli_options = {}
-        Vcloud::Launcher::Launch.new.run('input_config_yaml', cli_options)
-      end
+    it "should stop on failure by default" do
+      expect(Vcloud::Launcher::VappOrchestrator).to receive(:provision).with(@successful_app_1).and_return(double(:vapp, :power_on => true))
+      expect(Vcloud::Launcher::VappOrchestrator).to receive(:provision).with(@fake_failing_app).and_raise(RuntimeError.new('failed to find vdc'))
+      expect(Vcloud::Launcher::VappOrchestrator).not_to receive(:provision).with(@successful_app_2)
 
-      it "should continue on error if cli option continue-on-error is set" do
-        expect(Vcloud::Launcher::VappOrchestrator).to receive(:provision).with(@successful_app_1).and_return(double(:vapp, :power_on => true))
-        expect(Vcloud::Launcher::VappOrchestrator).to receive(:provision).with(@fake_failing_app).and_raise(RuntimeError.new('failed to find vdc'))
-        expect(Vcloud::Launcher::VappOrchestrator).to receive(:provision).with(@successful_app_2).and_return(double(:vapp, :power_on => true))
+      cli_options = {}
+      subject.run('input_config_yaml', cli_options)
+    end
 
-        cli_options = {"continue-on-error" => true}
-        Vcloud::Launcher::Launch.new.run('input_config_yaml', cli_options)
-      end
+    it "should continue on error if cli option continue-on-error is set" do
+      expect(Vcloud::Launcher::VappOrchestrator).to receive(:provision).with(@successful_app_1).and_return(double(:vapp, :power_on => true))
+      expect(Vcloud::Launcher::VappOrchestrator).to receive(:provision).with(@fake_failing_app).and_raise(RuntimeError.new('failed to find vdc'))
+      expect(Vcloud::Launcher::VappOrchestrator).to receive(:provision).with(@successful_app_2).and_return(double(:vapp, :power_on => true))
 
+      cli_options = {"continue-on-error" => true}
+      subject.run('input_config_yaml', cli_options)
     end
 
-    context "#set_logging_level" do
+  end
 
-      it "sets the logging level to DEBUG when :verbose is specified" do
-        expect(Vcloud::Core.logger).to receive(:level=).with(Logger::DEBUG)
-        Vcloud::Launcher::Launch.new.set_logging_level(:verbose => true)
-      end
+  context "#set_logging_level" do
 
-      it "sets the logging level to ERROR when :quiet is specified" do
-        expect(Vcloud::Core.logger).to receive(:level=).with(Logger::ERROR)
-        Vcloud::Launcher::Launch.new.set_logging_level(:quiet => true)
-      end
+    it "sets the logging level to DEBUG when :verbose is specified" do
+      expect(Vcloud::Core.logger).to receive(:level=).with(Logger::DEBUG)
+      subject.set_logging_level(:verbose => true)
+    end
 
-      it "sets the logging level to DEBUG when :quiet and :verbose are specified" do
-        expect(Vcloud::Core.logger).to receive(:level=).with(Logger::DEBUG)
-        Vcloud::Launcher::Launch.new.set_logging_level(:quiet => true, :verbose => true)
-      end
+    it "sets the logging level to ERROR when :quiet is specified" do
+      expect(Vcloud::Core.logger).to receive(:level=).with(Logger::ERROR)
+      subject.set_logging_level(:quiet => true)
+    end
 
-      it "sets the logging level to INFO by default" do
-        expect(Vcloud::Core.logger).to receive(:level=).with(Logger::INFO)
-        Vcloud::Launcher::Launch.new.set_logging_level({})
-      end
+    it "sets the logging level to DEBUG when :quiet and :verbose are specified" do
+      expect(Vcloud::Core.logger).to receive(:level=).with(Logger::DEBUG)
+      subject.set_logging_level(:quiet => true, :verbose => true)
+    end
 
+    it "sets the logging level to INFO by default" do
+      expect(Vcloud::Core.logger).to receive(:level=).with(Logger::INFO)
+      subject.set_logging_level({})
     end
 
   end
+
 end

data/spec/vcloud/launcher/vapp_orchestrator_spec.rb

@@ -1,52 +1,85 @@
 require 'spec_helper'
 
-module Vcloud
-  module Launcher
-    describe VappOrchestrator do
-
-      context "provision a vapp" do
-
-        before(:each) do
-          @config = {
-              :name => 'test-vapp-1',
-              :vdc_name => 'test-vdc-1',
-              :catalog => 'org-1-catalog',
-              :catalog_item => 'org-1-template',
-              :vm => {
-                  :network_connections => [{:name => 'org-vdc-1-net-1'}]
-              }
+describe Vcloud::Launcher::VappOrchestrator do
+  # Testing class methods rather than instance methods.
+  let(:subject) { Vcloud::Launcher::VappOrchestrator }
+
+  context "provision a vapp" do
+
+    let(:mock_fog_vm) {
+      double(:vm)
+    }
+    let(:mock_vapp) {
+      double(:vapp, :fog_vms => [mock_fog_vm], :reload => self)
+    }
+    let(:mock_vm_orchestrator) {
+      double(:vm_orchestrator, :customize => true)
+    }
+
+    before(:each) do
+      @config = {
+          :name => 'test-vapp-1',
+          :vdc_name => 'test-vdc-1',
+          :catalog_name => 'org-1-catalog',
+          :vapp_template_name => 'org-1-template',
+          :vm => {
+              :network_connections => [{:name => 'org-vdc-1-net-1'}]
           }
-        end
+      }
+    end
 
-        it "should return a vapp if it already exists" do
-          existing_vapp = double(:vapp, :name => 'existing-vapp-1')
+    it "should return a vapp if it already exists" do
+      existing_vapp = double(:vapp, :name => 'existing-vapp-1')
 
-          Core::Vapp.should_receive(:get_by_name_and_vdc_name).with('test-vapp-1', 'test-vdc-1').and_return(existing_vapp)
-          Vcloud::Core.logger.should_receive(:info).with('Found existing vApp test-vapp-1 in vDC \'test-vdc-1\'. Skipping.')
-          actual_vapp = VappOrchestrator.provision @config
-          actual_vapp.should_not be_nil
-          actual_vapp.should == existing_vapp
-        end
+      Vcloud::Core::Vapp.should_receive(:get_by_name_and_vdc_name).with('test-vapp-1', 'test-vdc-1').and_return(existing_vapp)
+      Vcloud::Core.logger.should_receive(:info).with('Found existing vApp test-vapp-1 in vDC \'test-vdc-1\'. Skipping.')
+      actual_vapp = subject.provision @config
+      actual_vapp.should_not be_nil
+      actual_vapp.should == existing_vapp
+    end
 
-        it "should create a vapp if it does not exist" do
-          #this test highlights the problems in vapp
-          mock_fog_vm = double(:vm)
-          mock_vapp = double(:vapp, :fog_vms => [mock_fog_vm], :reload => self)
-          mock_vm_orchestrator = double(:vm_orchestrator, :customize => true)
+    it "should create a vapp if it does not exist" do
+      #this test highlights the problems in vapp
 
+      Vcloud::Core::Vapp.should_receive(:get_by_name_and_vdc_name).with('test-vapp-1', 'test-vdc-1').and_return(nil)
+      Vcloud::Core::VappTemplate.should_receive(:get).with('org-1-template', 'org-1-catalog').and_return(double(:vapp_template, :id => 1))
 
-          Core::Vapp.should_receive(:get_by_name_and_vdc_name).with('test-vapp-1', 'test-vdc-1').and_return(nil)
-          Core::VappTemplate.should_receive(:get).with('org-1-catalog', 'org-1-template').and_return(double(:vapp_template, :id => 1))
+      Vcloud::Core::Vapp.should_receive(:instantiate).with('test-vapp-1', ['org-vdc-1-net-1'], 1, 'test-vdc-1')
+      .and_return(mock_vapp)
+      Vcloud::Launcher::VmOrchestrator.should_receive(:new).with(mock_fog_vm, mock_vapp).and_return(mock_vm_orchestrator)
 
-          Core::Vapp.should_receive(:instantiate).with('test-vapp-1', ['org-vdc-1-net-1'], 1, 'test-vdc-1')
-          .and_return(mock_vapp)
-          VmOrchestrator.should_receive(:new).with(mock_fog_vm, mock_vapp).and_return(mock_vm_orchestrator)
+      new_vapp = subject.provision @config
+      new_vapp.should == mock_vapp
+    end
 
-          new_vapp = VappOrchestrator.provision @config
-          new_vapp.should == mock_vapp
-        end
+    context "deprecated config items" do
+      let(:mock_vapp_template) {
+        double(:vapp_template, :id => 2)
+      }
+      before(:each) {
+        Vcloud::Core::Vapp.stub(:get_by_name_and_vdc_name)
+        Vcloud::Core::Vapp.stub(:instantiate).and_return(mock_vapp)
+        Vcloud::Launcher::VmOrchestrator.stub(:new).and_return(mock_vm_orchestrator)
+      }
 
+      it "should use catalog_item when vapp_template_name is not present" do
+        config = @config.clone
+        config.delete(:vapp_template_name)
+        config[:catalog_item] = 'deprecated-template'
+
+        Vcloud::Core::VappTemplate.should_receive(:get).with('deprecated-template', 'org-1-catalog').and_return(mock_vapp_template)
+        Vcloud::Launcher::VappOrchestrator.provision(config)
+      end
+
+      it "should use catalog when catalog_name is not present" do
+        config = @config.clone
+        config.delete(:catalog_name)
+        config[:catalog] = 'deprecated-catalog'
+
+        Vcloud::Core::VappTemplate.should_receive(:get).with('org-1-template', 'deprecated-catalog').and_return(mock_vapp_template)
+        Vcloud::Launcher::VappOrchestrator.provision(config)
       end
     end
+
   end
 end