vcloud-net_launcher 0.1.0 → 0.2.0

data/.travis.yml

@@ -0,0 +1,9 @@
+---
+language: ruby
+rvm:
+  - 1.9.3
+branches:
+  except:
+    - master
+notifications:
+  email: false

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.0 (2014-05-14)
+
+Features:
+
+  - Depend on version 0.3.0 of vcloud-core which introduces breaking changes to OrgVdcNetwork
+
 ## 0.1.0 (2014-04-30)
 
 Features:

data/README.md

@@ -104,14 +104,13 @@ If you want to be sure you are pinning to 5.1, or use 5.5, you can set the API v
 
 ## Testing
 
-Default target: `bundle exec rake` runs the cucumber features tests.
+Run the default suite of tests (e.g. lint, unit, features):
 
-`bundle exec rake integration` runs the integration tests.
+    bundle exec rake
 
-`bundle exec rake features` runs the cucumber features tests.
+Run the integration tests (slower and requires a real environment):
 
-There are currently no unit tests here, though the bulk of the logic is
-tested in vcloud-core.
+    bundle exec rake integration
 
 You need access to a suitable vCloud Director organization to run the
 integration tests. It is not necessarily safe to run them against an existing

data/Rakefile

@@ -2,7 +2,7 @@ require 'cucumber/rake/task'
 require 'rspec/core/rake_task'
 require 'gem_publisher'
 
-task :default => [:features]
+task :default => [:rubocop, :spec, :features]
 
 RSpec::Core::RakeTask.new(:spec) do |task|
   # Set a bogus Fog credential, otherwise it's possible for the unit
@@ -21,7 +21,12 @@ RSpec::Core::RakeTask.new(:integration) do |t|
   t.pattern = FileList['spec/integration/**/*_spec.rb']
 end
 
-task :publish_gem do |t|
+task :publish_gem do
   gem = GemPublisher.publish_if_updated("vcloud-net_launcher.gemspec", :rubygems)
   puts "Published #{gem}" if gem
 end
+
+require 'rubocop/rake_task'
+Rubocop::RakeTask.new(:rubocop) do |task|
+  task.options = ['--lint']
+end

data/features/step_definitions/vcloud-launch_steps.rb

@@ -1,3 +1,3 @@
-Then(/^the banner should document that this app takes (\d+) argument$/) do |arg1|
+Then(/^the banner should document that this app takes (\d+) argument$/) do
    pending # express the regexp above with the code you wish you had
 end

data/lib/vcloud/net_launcher/net_launch.rb

@@ -19,7 +19,7 @@ module Vcloud
           net_config[:fence_mode] ||= 'isolated'
           Vcloud::Core.logger.info("Provisioning orgVdcNetwork #{net_config[:name]}.")
           begin
-            net = Vcloud::Core::OrgVdcNetwork.provision(net_config)
+            Vcloud::Core::OrgVdcNetwork.provision(net_config)
           rescue RuntimeError => e
             Vcloud::Core.logger.error("Could not provision orgVdcNetwork: #{e.message}")
             raise

data/lib/vcloud/net_launcher/version.rb

@@ -1,5 +1,5 @@
 module Vcloud
   module NetLauncher
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/spec/integration/net_launcher/org_vdc_network_spec.rb

@@ -36,30 +36,35 @@ describe Vcloud::Core::OrgVdcNetwork do
     end
 
     it 'should have a name' do
-      expect(@net.name) == @config[:name]
+      expect(@net.name).to eq(@config[:name])
     end
 
-    it 'should have a :gateway attribute' do
-      expect(@net.vcloud_attributes[:gateway]) == @config[:gateway]
+    it 'should have a :Gateway attribute' do
+      expect(@net.vcloud_attributes[:Configuration][:IpScopes][:IpScope][:Gateway]).
+        to eq(@config[:gateway])
     end
 
-    it 'should have a :netmask attribute' do
-      expect(@net.vcloud_attributes[:gateway]) == @config[:netmask]
+    it 'should have a :Netmask attribute' do
+      expect(@net.vcloud_attributes[:Configuration][:IpScopes][:IpScope][:Netmask]).
+        to eq(@config[:netmask])
     end
 
-    it 'should have a :dns1 attribute' do
-      expect(@net.vcloud_attributes[:dns1]) == @config[:dns1]
+    it 'should have a :Dns1 attribute' do
+      expect(@net.vcloud_attributes[:Configuration][:IpScopes][:IpScope][:Dns1]).
+        to eq(@config[:dns1])
     end
 
-    it 'should have a :dns2 attribute' do
-      expect(@net.vcloud_attributes[:dns2]) == @config[:dns2]
+    it 'should have a :Dns2 attribute' do
+      expect(@net.vcloud_attributes[:Configuration][:IpScopes][:IpScope][:Dns2]).
+        to eq(@config[:dns2])
     end
 
-    it 'should have an :ip_ranges attribute' do
-      expect(@net.vcloud_attributes[:ip_ranges]) == [
-        {:start_address=>"10.88.11.200", :end_address=>"10.88.11.250"},
-        {:start_address=>"10.88.11.100", :end_address=>"10.88.11.150"}
-      ]
+    it 'should have an :IpRange list with each of our ranges' do
+      expect(@net.vcloud_attributes[:Configuration][:IpScopes][:IpScope][:IpRanges][:IpRange]).
+        to match_array([
+          { :StartAddress => '10.88.11.100', :EndAddress => '10.88.11.150' },
+          { :StartAddress => '10.88.11.200', :EndAddress => '10.88.11.250' },
+        ])
     end
 
     after(:all) do
@@ -102,30 +107,35 @@ describe Vcloud::Core::OrgVdcNetwork do
     end
 
     it 'should have a name' do
-      expect(@net.name) == @config[:name]
+      expect(@net.name).to eq(@config[:name])
     end
 
     it 'should have a :gateway attribute' do
-      expect(@net.vcloud_attributes[:gateway]) == @config[:gateway]
+      expect(@net.vcloud_attributes[:Configuration][:IpScopes][:IpScope][:Gateway]).
+        to eq(@config[:gateway])
     end
 
     it 'should have a :netmask attribute' do
-      expect(@net.vcloud_attributes[:gateway]) == @config[:netmask]
+      expect(@net.vcloud_attributes[:Configuration][:IpScopes][:IpScope][:Netmask]).
+        to eq(@config[:netmask])
     end
 
     it 'should have a :dns1 attribute' do
-      expect(@net.vcloud_attributes[:dns1]) == @config[:dns1]
+      expect(@net.vcloud_attributes[:Configuration][:IpScopes][:IpScope][:Dns1]).
+        to eq(@config[:dns1])
     end
 
     it 'should have a :dns2 attribute' do
-      expect(@net.vcloud_attributes[:dns2]) == @config[:dns2]
+      expect(@net.vcloud_attributes[:Configuration][:IpScopes][:IpScope][:Dns2]).
+        to eq(@config[:dns2])
     end
 
-    it 'should have an :ip_ranges attribute' do
-      expect(@net.vcloud_attributes[:ip_ranges]) == [
-        {:start_address=>"10.88.11.200", :end_address=>"10.88.11.250"},
-        {:start_address=>"10.88.11.100", :end_address=>"10.88.11.150"}
-      ]
+    it 'should have an :ip_ranges list with each of our ranges' do
+      expect(@net.vcloud_attributes[:Configuration][:IpScopes][:IpScope][:IpRanges][:IpRange]).
+        to match_array([
+          { :StartAddress => '10.88.11.100', :EndAddress => '10.88.11.150' },
+          { :StartAddress => '10.88.11.200', :EndAddress => '10.88.11.250' },
+        ])
     end
 
     after(:all) do

data/spec/integration/net_launcher/vcloud_net_launcher_spec.rb

@@ -15,11 +15,11 @@ module Vcloud
           Vcloud::NetLauncher::NetLaunch.new.run(@minimum_data_yaml)
 
           @found_networks = find_network(test_data[:network_name])
-          @found_networks.length.should == 1
+          @found_networks.length.should eq(1)
           provisioned_network = @found_networks[0]
-          provisioned_network[:gateway].should == test_data[:gateway]
-          provisioned_network[:netmask].should == test_data[:netmask]
-          provisioned_network[:isLinked].should == 'false'
+          provisioned_network[:gateway].should eq(test_data[:gateway])
+          provisioned_network[:netmask].should eq(test_data[:netmask])
+          provisioned_network[:isLinked].should eq('false')
         end
 
         it 'should create an nat routed network' do
@@ -31,11 +31,11 @@ module Vcloud
 
           @found_networks = find_network(test_data[:network_name])
 
-          @found_networks.length.should == 1
+          @found_networks.length.should eq(1)
           provisioned_network = @found_networks[0]
-          provisioned_network[:gateway].should == test_data[:gateway]
-          provisioned_network[:netmask].should == test_data[:netmask]
-          provisioned_network[:isLinked].should == 'true'
+          provisioned_network[:gateway].should eq(test_data[:gateway])
+          provisioned_network[:netmask].should eq(test_data[:netmask])
+          provisioned_network[:isLinked].should eq('true')
         end
 
         after(:each) do
@@ -43,7 +43,7 @@ module Vcloud
             File.delete @minimum_data_yaml
             fog_interface = Vcloud::Fog::ServiceInterface.new
             provisioned_network_id = @found_networks[0][:href].split('/').last
-            fog_interface.delete_network(provisioned_network_id).should == true
+            fog_interface.delete_network(provisioned_network_id).should be(true)
           end
         end
 

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
 require 'erb_helper'
 require 'bundler/setup'
 require 'vcloud/net_launcher'
-require 'support/stub_fog_interface.rb'

data/spec/vcloud/net_launcher/net_launch_spec.rb

@@ -0,0 +1,116 @@
+require 'spec_helper'
+
+describe Vcloud::NetLauncher::NetLaunch do
+  context "ConfigLoader returns three different networks" do
+    let!(:network1) {
+      {
+        :name         => 'Network 1',
+        :vdc_name     => 'TestVDC',
+        :fence_mode   => 'isolated',
+        :netmask      => '255.255.255.0',
+        :gateway      => '10.0.1.1',
+        :edge_gateway => 'TestVSE',
+      }
+    }
+    let!(:network2) {
+      {
+        :name         => 'Network 2',
+        :vdc_name     => 'TestVDC',
+        :fence_mode   => 'natRouted',
+        :netmask      => '255.255.0.0',
+        :gateway      => '10.0.2.1',
+        :edge_gateway => 'TestVSE',
+      }
+    }
+    let!(:network3) {
+      {
+        :name         => 'Network 3',
+        :vdc_name     => 'TestVDC',
+        :fence_mode   => 'natRouted',
+        :netmask      => '355.255.0.0',
+        :gateway      => '10.0.3.1',
+        :edge_gateway => 'TestVSE',
+      }
+    }
+
+    before(:each) do
+      config_loader = double(:config_loader)
+      expect(Vcloud::Core::ConfigLoader).to receive(:new).and_return(config_loader)
+      expect(config_loader).to receive(:load_config).and_return({
+        :org_vdc_networks => [network1, network2, network3],
+      })
+    end
+
+    it "should call provision once for each network" do
+      expect(Vcloud::Core::OrgVdcNetwork).to receive(:provision).with(network1)
+      expect(Vcloud::Core::OrgVdcNetwork).to receive(:provision).with(network2)
+      expect(Vcloud::Core::OrgVdcNetwork).to receive(:provision).with(network3)
+
+      cli_options = {}
+      subject.run('input_config_yaml', cli_options)
+    end
+
+    it "should abort on errors from Vcloud::Core" do
+      expect(Vcloud::Core::OrgVdcNetwork).to receive(:provision).with(network1)
+      expect(Vcloud::Core::OrgVdcNetwork).to receive(:provision).with(network2).
+        and_raise(RuntimeError.new('Did not successfully create orgVdcNetwork'))
+      expect(Vcloud::Core::OrgVdcNetwork).not_to receive(:provision).with(network3)
+
+      cli_options = {}
+      expect {
+        Vcloud::NetLauncher::NetLaunch.new.run('input_config_yaml', cli_options)
+      }.to raise_error(RuntimeError, 'Did not successfully create orgVdcNetwork')
+    end
+
+    describe "fog mocking" do
+      it "should not mock fog by default" do
+        expect(Fog).to_not receive(:mock!)
+        expect(Vcloud::Core::OrgVdcNetwork).to receive(:provision).exactly(3).times
+
+        cli_options = {}
+        subject.run('input_config_yaml', cli_options)
+      end
+
+      it "should mock fog when passed option" do
+        expect(Fog).to receive(:mock!)
+        expect(Vcloud::Core::OrgVdcNetwork).to receive(:provision).exactly(3).times
+
+        cli_options = { :mock => true }
+        subject.run('input_config_yaml', cli_options)
+      end
+    end
+
+  end
+
+  context "ConfigLoader returns one network without :fence_mode set" do
+    let!(:network_without_fence_mode) {
+      {
+        :name         => 'Network w/o fence_mode',
+        :vdc_name     => 'TestVDC',
+        :netmask      => '255.255.255.0',
+        :gateway      => '10.0.1.1',
+        :edge_gateway => 'TestVSE',
+      }
+    }
+
+    before(:each) do
+      config_loader = double(:config_loader)
+      expect(Vcloud::Core::ConfigLoader).to receive(:new).and_return(config_loader)
+      expect(config_loader).to receive(:load_config).and_return({
+        :org_vdc_networks => [network_without_fence_mode],
+      })
+    end
+
+    it "should default :fence_mode to isolated" do
+      network_with_fence_mode = network_without_fence_mode.merge({
+        :fence_mode => 'isolated',
+      })
+
+      network_without_fence_mode.should_not have_key(:fence_mode)
+      expect(Vcloud::Core::OrgVdcNetwork).to receive(:provision).with(network_with_fence_mode)
+
+      cli_options = {}
+      subject.run('input_config_yaml', cli_options)
+    end
+  end
+end

data/vcloud-net_launcher.gemspec

@@ -23,11 +23,12 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.9.2'
 
   s.add_runtime_dependency 'methadone'
-  s.add_runtime_dependency 'vcloud-core', '~> 0.2.0'
+  s.add_runtime_dependency 'vcloud-core', '~> 0.3.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 'rake'
   s.add_development_dependency 'rspec', '~> 2.14.1'
+  s.add_development_dependency 'rubocop'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcloud-net_launcher
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: methadone
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +123,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.1
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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'
 description: Tool to launch and configure vCloud networks. Uses vcloud-core.
 email:
 - anna.shipman@digital.cabinet-office.gov.uk
@@ -132,13 +148,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/vcloud-net-launch
-- examples/.fog-example.fog
 - examples/vcloud-net-launch/example-config.yaml
 - features/step_definitions/vcloud-launch_steps.rb
 - features/support/env.rb
@@ -154,7 +170,7 @@ files:
 - spec/integration/net_launcher/org_vdc_network_spec.rb
 - spec/integration/net_launcher/vcloud_net_launcher_spec.rb
 - spec/spec_helper.rb
-- spec/support/stub_fog_interface.rb
+- spec/vcloud/net_launcher/net_launch_spec.rb
 - tools/fog_credentials.rb
 - vcloud-net_launcher.gemspec
 homepage: http://github.com/alphagov/vcloud-net_launcher
@@ -178,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4125401217608110122
+      hash: -3237069924497883805
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -194,4 +210,4 @@ test_files:
 - spec/integration/net_launcher/org_vdc_network_spec.rb
 - spec/integration/net_launcher/vcloud_net_launcher_spec.rb
 - spec/spec_helper.rb
-- spec/support/stub_fog_interface.rb
+- spec/vcloud/net_launcher/net_launch_spec.rb

data/examples/.fog-example.fog

@@ -1,15 +0,0 @@
-p1-production:
-  vcloud_director_username: '<username_from_top_right_of_skyscape_flash_ui>@<org_id_from_url_in_skyscape_flash_ui>'
-  vcloud_director_password: '<your_skyscape_password>'
-  vcloud_director_host: 'vcd.portal.skyscapecloud.com'
-
-# You can extract this information by logging into skyscape portal
-performance-platform-production:
-  vcloud_director_username: '<xxx.x.xxxxxx>@<x-x-xx-xxxxxx>'
-  vcloud_director_password: '<your_skyscape_password>'
-  vcloud_director_host: 'vcd.portal.skyscapecloud.com'
-
-carrenza-preview:
-  vcloud_director_username: '<email>@<org_id>'
-  vcloud_director_password: ''
-  vcloud_director_host: 'myvdc.carrenza.net'

data/spec/support/stub_fog_interface.rb

@@ -1,59 +0,0 @@
-require 'ostruct'
-
-class StubFogInterface
-
-  def name
-    'Test vDC 1'
-  end
-
-  def vdc_object_by_name(vdc_name)
-    vdc = OpenStruct.new
-    vdc.name = 'test-vdc-1'
-    vdc
-  end
-
-  def template
-    { :href => '/vappTemplate-12345678-90ab-cdef-0123-4567890abcde' }
-  end
-
-  def find_networks(network_names, vdc_name)
-    [{
-      :name => 'org-vdc-1-net-1',
-      :href => '/org-vdc-1-net-1-id',
-    }]
-  end
-
-  def get_vapp(id)
-    { :name => 'test-vapp-1' }
-  end
-
-  def get_edge_gateway(id)
-    { 
-      :name => 'test-edgegw-1',
-      :href => "/#{id}",
-    }
-  end
-
-  def vdc(name)
-    { }
-  end
-
-  def post_instantiate_vapp_template(vdc, template, name, params)
-    {
-      :href => '/test-vapp-1-id',
-      :Children => {
-        :Vm => ['bogus vm data']
-      }
-    }
-  end
-
-  def get_vapp_by_vdc_and_name
-    { }
-  end
-
-  def template(catalog_name, name)
-    { :href => '/vappTemplate-12345678-90ab-cdef-0123-4567890abcde' }
-  end
-
-
-end