vcloud-launcher 0.0.5 → 0.1.0

data/spec/vcloud/launcher/vm_orchestrator_spec.rb

@@ -1,80 +1,82 @@
 require 'spec_helper'
 
-module Vcloud
-  module Launcher
-    describe VmOrchestrator do
+describe Vcloud::Launcher::VmOrchestrator do
 
-      before(:each) do
-        @vm_id = "vm-12345678-1234-1234-1234-123456712312"
-      end
+  before(:each) do
+    @vm_id = "vm-12345678-1234-1234-1234-123456712312"
+  end
+
+  let(:fog_vm) {
+    { :href => "/#{@vm_id}" }
+  }
+  let(:vapp) {
+    double(:vapp, :name => 'web-app1')
+  }
+  subject {
+    Vcloud::Launcher::VmOrchestrator.new(fog_vm, vapp)
+  }
 
-      it "orchestrate customization" do
-        vm_config = {
-            :hardware_config => {
-                :memory => 4096,
-                :cpu => 2
-            },
-            :metadata => {
-                :shutdown => true
-            },
-            :extra_disks => [
-                {:size => '1024', :name => 'Hard disk 2', :fs_file => 'mysql', :fs_mntops => 'mysql-something'},
-                {:size => '2048', :name => 'Hard disk 3', :fs_file => 'solr', :fs_mntops => 'solr-something'}
-            ],
+  it "orchestrate customization" do
+    vm_config = {
+        :hardware_config => {
+            :memory => 4096,
+            :cpu => 2
+        },
+        :metadata => {
+            :shutdown => true
+        },
+        :extra_disks => [
+            {:size => '1024', :name => 'Hard disk 2', :fs_file => 'mysql', :fs_mntops => 'mysql-something'},
+            {:size => '2048', :name => 'Hard disk 3', :fs_file => 'solr', :fs_mntops => 'solr-something'}
+        ],
 
-            :network_connections => [
-                {:name => "network1", :ip_address => "198.12.1.21"},
-            ],
-            :bootstrap => {
-                :script_path => '/tmp/boostrap.erb',
-                :vars => {
-                    :message => 'hello world'
-                }
-            },
-            :storage_profile => {
-                :name => 'basic-storage',
-                :href => 'https://vcloud.example.net/api/vdcStorageProfile/000aea1e-a5e9-4dd1-a028-40db8c98d237'
+        :network_connections => [
+            {:name => "network1", :ip_address => "198.12.1.21"},
+        ],
+        :bootstrap => {
+            :script_path => '/tmp/boostrap.erb',
+            :vars => {
+                :message => 'hello world'
             }
+        },
+        :storage_profile => {
+            :name => 'basic-storage',
+            :href => 'https://vcloud.example.net/api/vdcStorageProfile/000aea1e-a5e9-4dd1-a028-40db8c98d237'
         }
-        fog_vm = { :href => "/#{@vm_id}" }
-        vapp = double(:vapp, :name => 'web-app1')
-        vm = double(:vm, :id => @vm_id, :vapp_name => 'web-app1', :vapp => vapp, :name => 'test-vm-1')
-        Core::Vm.should_receive(:new).with(@vm_id, vapp).and_return(vm)
+    }
+    vm = double(:vm, :id => @vm_id, :vapp_name => 'web-app1', :vapp => vapp, :name => 'test-vm-1')
+    Vcloud::Core::Vm.should_receive(:new).with(@vm_id, vapp).and_return(vm)
 
-        vm.should_receive(:update_name).with('web-app1')
-        vm.should_receive(:configure_network_interfaces).with(vm_config[:network_connections])
-        vm.should_receive(:update_storage_profile).with(vm_config[:storage_profile])
-        vm.should_receive(:update_cpu_count).with(2)
-        vm.should_receive(:update_memory_size_in_mb).with(4096)
-        vm.should_receive(:add_extra_disks).with(vm_config[:extra_disks])
-        vm.should_receive(:update_metadata).with(vm_config[:metadata])
-        vm.should_receive(:configure_guest_customization_section).with('web-app1', vm_config[:bootstrap], vm_config[:extra_disks])
+    vm.should_receive(:update_name).with('web-app1')
+    vm.should_receive(:configure_network_interfaces).with(vm_config[:network_connections])
+    vm.should_receive(:update_storage_profile).with(vm_config[:storage_profile])
+    vm.should_receive(:update_cpu_count).with(2)
+    vm.should_receive(:update_memory_size_in_mb).with(4096)
+    vm.should_receive(:add_extra_disks).with(vm_config[:extra_disks])
+    vm.should_receive(:update_metadata).with(vm_config[:metadata])
+    vm.should_receive(:configure_guest_customization_section).with('web-app1', vm_config[:bootstrap], vm_config[:extra_disks])
 
-        VmOrchestrator.new(fog_vm, vapp).customize(vm_config)
-      end
+    subject.customize(vm_config)
+  end
 
-      it "if a storage_profile is not specified, customize continues with other customizations" do
-        fog_vm = { :href => "/#{@vm_id}" }
-        vapp = double(:vapp, :name => 'web-app1')
-        vm = double(:vm, :id => @vm_id, :vapp_name => 'web-app1', :vapp => vapp, :name => 'test-vm-1')
-        vm_config = {
-          :metadata => {:shutdown => true},
-          :network_connections => [{:name => "network1", :ip_address => "198.12.1.21"}],
-          :extra_disks => [
-            {:size => '1024', :name => 'Hard disk 2', :fs_file => 'mysql', :fs_mntops => 'mysql-something'},
-            {:size => '2048', :name => 'Hard disk 3', :fs_file => 'solr', :fs_mntops => 'solr-something'}
-          ]
-        }
-        Core::Vm.should_receive(:new).with(@vm_id, vapp).and_return(vm)
-        vm.should_receive(:update_metadata).with(:shutdown => true)
-        vm.should_receive(:update_name).with('web-app1')
-        vm.should_receive(:add_extra_disks).with(vm_config[:extra_disks])
-        vm.should_receive(:configure_network_interfaces).with(vm_config[:network_connections])
-        vm.should_receive(:configure_guest_customization_section).with('web-app1', vm_config[:bootstrap], vm_config[:extra_disks])
+  it "if a storage_profile is not specified, customize continues with other customizations" do
+    vm = double(:vm, :id => @vm_id, :vapp_name => 'web-app1', :vapp => vapp, :name => 'test-vm-1')
+    vm_config = {
+      :metadata => {:shutdown => true},
+      :network_connections => [{:name => "network1", :ip_address => "198.12.1.21"}],
+      :extra_disks => [
+        {:size => '1024', :name => 'Hard disk 2', :fs_file => 'mysql', :fs_mntops => 'mysql-something'},
+        {:size => '2048', :name => 'Hard disk 3', :fs_file => 'solr', :fs_mntops => 'solr-something'}
+      ]
+    }
+    Vcloud::Core::Vm.should_receive(:new).with(@vm_id, vapp).and_return(vm)
+    vm.should_receive(:update_metadata).with(:shutdown => true)
+    vm.should_receive(:update_name).with('web-app1')
+    vm.should_receive(:add_extra_disks).with(vm_config[:extra_disks])
+    vm.should_receive(:configure_network_interfaces).with(vm_config[:network_connections])
+    vm.should_receive(:configure_guest_customization_section).with('web-app1', vm_config[:bootstrap], vm_config[:extra_disks])
 
-        VmOrchestrator.new(fog_vm, vapp).customize(vm_config)
+    subject.customize(vm_config)
 
-      end
-    end
   end
 end

data/vcloud-launcher.gemspec

@@ -21,11 +21,13 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9.2'
 
   s.add_runtime_dependency 'methadone'
-  s.add_runtime_dependency 'vcloud-core', '~> 0.3.0'
+  s.add_runtime_dependency 'vcloud-core', '~> 0.5.0'
   s.add_development_dependency 'aruba', '~> 0.5.3'
   s.add_development_dependency 'cucumber', '~> 1.3.10'
   s.add_development_dependency 'gem_publisher', '1.2.0'
+  s.add_development_dependency 'pry'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 2.14.1'
   s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'vcloud-tools-tester', '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcloud-launcher
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-14 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +91,22 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +155,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcloud-tools-tester
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 description: 
 email:
 - anna.shipman@digital.cabinet-office.gov.uk
@@ -167,17 +199,22 @@ files:
 - jenkins_integration_tests.sh
 - lib/vcloud/launcher.rb
 - lib/vcloud/launcher/launch.rb
+- lib/vcloud/launcher/schema/launcher_vapps.rb
+- lib/vcloud/launcher/schema/vapp.rb
+- lib/vcloud/launcher/schema/vm.rb
 - lib/vcloud/launcher/vapp_orchestrator.rb
 - lib/vcloud/launcher/version.rb
 - lib/vcloud/launcher/vm_orchestrator.rb
 - scripts/basic.erb
 - spec/erb_helper.rb
+- spec/integration/README.md
 - spec/integration/launcher/data/basic_preamble_test.erb
 - spec/integration/launcher/data/happy_path.yaml.erb
 - spec/integration/launcher/data/minimum_data_setup.yaml.erb
 - spec/integration/launcher/data/storage_profile.yaml.erb
 - spec/integration/launcher/storage_profile_integration_spec.rb
 - spec/integration/launcher/vcloud_launcher_spec.rb
+- spec/integration/vcloud_tools_testing_config.yaml.template
 - spec/spec_helper.rb
 - spec/vcloud/launcher/launch_spec.rb
 - spec/vcloud/launcher/vapp_orchestrator_spec.rb
@@ -205,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -774261046686009457
+      hash: 887521271783287653
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -217,12 +254,14 @@ test_files:
 - features/support/env.rb
 - features/vcloud-launch.feature
 - spec/erb_helper.rb
+- spec/integration/README.md
 - spec/integration/launcher/data/basic_preamble_test.erb
 - spec/integration/launcher/data/happy_path.yaml.erb
 - spec/integration/launcher/data/minimum_data_setup.yaml.erb
 - spec/integration/launcher/data/storage_profile.yaml.erb
 - spec/integration/launcher/storage_profile_integration_spec.rb
 - spec/integration/launcher/vcloud_launcher_spec.rb
+- spec/integration/vcloud_tools_testing_config.yaml.template
 - spec/spec_helper.rb
 - spec/vcloud/launcher/launch_spec.rb
 - spec/vcloud/launcher/vapp_orchestrator_spec.rb