vcloud-launcher 1.0.0 → 1.1.0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.1.0 (2015-07-09)
+
+  - Add optional MAC address to the schema for a VM
+  - Only run guest customization when there is something to customise
+  - Fix bug where OpenStruct must be explicity required
+  - Bump dependency on vcloud-core from 1.0.0 to 1.1.0
+
 ## 1.0.0 (2015-01-22)
 
   - Release 1.0.0 since the public API is now stable.

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 HM Government (Government Digital Service)
+Copyright (c) 2014 Crown Copyright (Government Digital Service)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/README.md

@@ -79,22 +79,34 @@ If you want to be sure you are pinning to 5.1, or use 5.5, you can set the API v
 
 `export EXCON_DEBUG=true` - this will print out the API requests and responses.
 
-`export DEBUG=true` - this will show you the stack trace when there is an exception instead of just the message.
-
 ## Testing
 
 Run the default suite of tests (e.g. lint, unit, features):
 
     bundle exec rake
 
-Run the integration tests (slower and requires a real environment):
-
-    bundle exec rake integration
-
-Run the integration tests minus some that are very slow:
+There are also integration tests. These are slower and require a real environment.
+See the [vCloud Tools website](http://gds-operations.github.io/vcloud-tools/testing/) for details of how to set up and run the integration tests.
+
+The parameters required to run the vCloud Launcher integration tests are:
+
+````
+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`
+````
+
+There is an additional rake task on vCloud Launcher that runs the integration tests minus some that are very slow:
 
     bundle exec rake integration:quick
-
-You need access to a suitable vCloud Director organization to run the
-integration tests. See the [integration tests README](/spec/integration/README.md) for
-further details.

data/lib/vcloud/launcher/preamble.rb

@@ -1,3 +1,5 @@
+require 'ostruct'
+
 module Vcloud
   module Launcher
     class Preamble

data/lib/vcloud/launcher/schema/vm.rb

@@ -16,6 +16,7 @@ module Vcloud
                 name: { type: 'string', required: true },
                 ip_address: { type: 'ip_address', required: false },
                 allocation_mode: { type: 'string', required: false },
+                mac_address: { type: 'string', required: false },
               },
             },
           },

data/lib/vcloud/launcher/version.rb

@@ -1,5 +1,5 @@
 module Vcloud
   module Launcher
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
   end
 end

data/lib/vcloud/launcher/vm_orchestrator.rb

@@ -23,7 +23,7 @@ module Vcloud
 
         preamble = vm_config[:bootstrap] ? generate_preamble(vm_config) : ''
 
-        @vm.configure_guest_customization_section(preamble)
+        @vm.configure_guest_customization_section(preamble) unless preamble.nil? || preamble.empty?
       end
 
       private

data/spec/vcloud/launcher/vm_orchestrator_spec.rb

@@ -136,8 +136,8 @@ describe Vcloud::Launcher::VmOrchestrator do
         subject.customize(vm_config_without_bootstrap)
       end
 
-      it "uses an empty string as the host preamble" do
-        expect(vm).to receive(:configure_guest_customization_section).with('')
+      it "skips customization if nothing to customize" do
+        expect(vm).not_to receive(:configure_guest_customization_section)
         subject.customize(vm_config_without_bootstrap)
       end
     end

data/vcloud-launcher.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9.3'
 
-  s.add_runtime_dependency 'vcloud-core', '~> 1.0.0'
+  s.add_runtime_dependency 'vcloud-core', '~> 1.1.0'
   s.add_development_dependency 'gem_publisher', '1.2.0'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rake'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcloud-launcher
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,43 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vcloud-core
-  requirement: &18470560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *18470560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: gem_publisher
-  requirement: &18466940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *18466940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &18482720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18482720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &18480680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18480680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &18509740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +85,15 @@ dependencies:
         version: 2.14.1
   type: :development
   prerelease: false
-  version_requirements: *18509740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: rubocop
-  requirement: &18506760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +101,15 @@ dependencies:
         version: 0.23.0
   type: :development
   prerelease: false
-  version_requirements: *18506760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &18505720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +117,15 @@ dependencies:
         version: 0.7.1
   type: :development
   prerelease: false
-  version_requirements: *18505720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: vcloud-tools-tester
-  requirement: &18504180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +133,12 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *18504180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: 
 email:
 - anna.shipman@digital.cabinet-office.gov.uk
@@ -136,7 +176,6 @@ files:
 - 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/false_cmd
 - spec/integration/launcher/data/happy_path.yaml.erb
@@ -177,16 +216,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2975590167556430507
+      hash: 3247835755938666789
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Tool to launch and configure vCloud vApps
 test_files:
 - spec/erb_helper.rb
-- spec/integration/README.md
 - spec/integration/launcher/data/basic_preamble_test.erb
 - spec/integration/launcher/data/false_cmd
 - spec/integration/launcher/data/happy_path.yaml.erb

data/spec/integration/README.md

@@ -1,40 +0,0 @@
-# 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/gds-operations/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`