vcloud-edge_gateway 1.3.0 → 1.4.0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.4.0 (2014-12-03)
+
+Features:
+
+ - Update vCloud Core to 0.14.0 to improve speed of integration tests.
+ - Update vCloud Core to 0.16.0 for `vcloud-logout` utility.
+
 ## 1.3.0 (2014-10-14)
 
 Features:
@@ -10,13 +17,17 @@ Features:
 
 ## 1.2.0 (2014-09-11)
 
+Features:
+
   - Upgrade dependency on vCloud Core to 0.11.0 which prevents plaintext
     passwords in FOG_RC. Please use tokens via vcloud-login as per
     the documentation: http://gds-operations.github.io/vcloud-tools/usage/
 
 ## 1.1.0 (2014-08-11)
 
-Update to vCloud Core 0.10.0 for the following:
+Features:
+
+  Update to vCloud Core 0.10.0 for the following:
 
   - New vcloud-login tool for fetching session tokens without the need to
     store your password in a plaintext FOG_RC file.
@@ -26,7 +37,9 @@ Update to vCloud Core 0.10.0 for the following:
 
 ## 1.0.2 (2014-07-14)
 
-Update the dependency on vCloud Core to version 0.6.0 to avoid dependency issues._
+Bugfix:
+
+  - Update the dependency on vCloud Core to version 0.6.0 to avoid dependency issues.
 
 ## 1.0.1 (2014-06-13)
 

data/examples/vcloud-configure-edge/loadbalancer-rules.yaml

@@ -12,7 +12,7 @@ gateway: "My gateway name"
 load_balancer_service:
   pools:
     - name: 'pool-001'
-      description: 'pool for balancing http(s)"
+      description: 'pool for balancing http(s)'
       service:
         http:
           port: 80
@@ -43,7 +43,7 @@ load_balancer_service:
 
   virtual_servers:
     - name: 'vs-website'
-      description: 'virtual server for my website"
+      description: 'virtual server for my website'
       ip_address: 20.20.20.20
       network: '00000000-1111-2222-3333-444444444444'
       pool: 'pool-001'

data/jenkins_tests.sh

@@ -28,5 +28,6 @@ rm -rf vcloud-tools-testing-config
 # Never log token to STDOUT.
 set +x
 eval $(printenv API_PASSWORD | bundle exec vcloud-login)
+trap "bundle exec vcloud-logout" EXIT
 
 bundle exec rake integration

data/lib/vcloud/edge_gateway/version.rb

@@ -1,6 +1,6 @@
 module Vcloud
   module EdgeGateway
-    VERSION = '1.3.0'
+    VERSION = '1.4.0'
   end
 end
 

data/spec/integration/edge_gateway/configure_load_balancer_spec.rb

@@ -46,14 +46,13 @@ module Vcloud
         end
 
         it "should only make one EdgeGateway update task, to minimise EdgeGateway reload events" do
-          start_time = Time.now.getutc
-          task_list_before_update = get_all_edge_gateway_update_tasks_ordered_by_start_date_since_time(start_time)
+          last_task = IntegrationHelper.get_last_task(@test_params.edge_gateway)
           diff = EdgeGateway::Configure.new(@initial_load_balancer_config_file, @vars_config_file).update
-          task_list_after_update = get_all_edge_gateway_update_tasks_ordered_by_start_date_since_time(start_time)
+          tasks_elapsed = IntegrationHelper.get_tasks_since(@test_params.edge_gateway, last_task)
 
           expect(diff.keys).to eq([:LoadBalancerService])
           expect(diff[:LoadBalancerService]).to have_at_least(1).items
-          expect(task_list_after_update.size - task_list_before_update.size).to be(1)
+          expect(tasks_elapsed).to have(1).items
         end
 
         it "should have configured at least one LoadBancer Pool entry" do
@@ -164,17 +163,6 @@ module Vcloud
           :edge_gateway_ext_network_ip => @test_params.provider_network_ip,
         }
       end
-
-      def get_all_edge_gateway_update_tasks_ordered_by_start_date_since_time(timestamp)
-        vcloud_time = timestamp.strftime('%FT%T.000Z')
-        q = Vcloud::Core::QueryRunner.new
-        q.run('task',
-          :filter =>
-            "name==networkConfigureEdgeGatewayServices;objectName==#{@test_params.edge_gateway};startDate=ge=#{vcloud_time}",
-          :sortDesc => 'startDate',
-        )
-      end
-
     end
 
   end

data/spec/integration/edge_gateway/configure_multiple_services_spec.rb

@@ -37,15 +37,14 @@ module Vcloud
         end
 
         it "should only create one edgeGateway update task when updating the configuration" do
-          start_time = Time.now.getutc
-          task_list_before_update = get_all_edge_gateway_update_tasks_ordered_by_start_date_since_time(start_time)
+          last_task = IntegrationHelper.get_last_task(@test_params.edge_gateway)
           diff = EdgeGateway::Configure.new(@initial_config_file, @vars_config_file).update
-          task_list_after_update = get_all_edge_gateway_update_tasks_ordered_by_start_date_since_time(start_time)
+          tasks_elapsed = IntegrationHelper.get_tasks_since(@test_params.edge_gateway, last_task)
 
           expect(diff.keys).to eq([:FirewallService, :NatService])
           expect(diff[:FirewallService]).to have_at_least(1).items
-          expect(diff[:NatService]).to      have_at_least(1).items
-          expect(task_list_after_update.size - task_list_before_update.size).to be(1)
+          expect(diff[:NatService]).to have_at_least(1).items
+          expect(tasks_elapsed).to have(1).items
         end
 
         it "should now have nat and firewall rules configured, no load balancer yet" do
@@ -57,34 +56,31 @@ module Vcloud
         end
 
         it "should not update the EdgeGateway again if the config hasn't changed" do
-          start_time = Time.now.getutc
-          task_list_before_update = get_all_edge_gateway_update_tasks_ordered_by_start_date_since_time(start_time)
+          last_task = IntegrationHelper.get_last_task(@test_params.edge_gateway)
           diff = EdgeGateway::Configure.new(@initial_config_file, @vars_config_file).update
-          task_list_after_update = get_all_edge_gateway_update_tasks_ordered_by_start_date_since_time(start_time)
+          tasks_elapsed = IntegrationHelper.get_tasks_since(@test_params.edge_gateway, last_task)
 
           expect(diff).to eq({})
-          expect(task_list_after_update.size - task_list_before_update.size).to be(0)
+          expect(tasks_elapsed).to have(0).items
         end
 
         it "should only create one additional edgeGateway update task when adding the LoadBalancer config" do
-          start_time = Time.now.getutc
-          task_list_before_update = get_all_edge_gateway_update_tasks_ordered_by_start_date_since_time(start_time)
+          last_task = IntegrationHelper.get_last_task(@test_params.edge_gateway)
           diff = EdgeGateway::Configure.new(@adding_load_balancer_config_file, @vars_config_file).update
-          task_list_after_update = get_all_edge_gateway_update_tasks_ordered_by_start_date_since_time(start_time)
+          tasks_elapsed = IntegrationHelper.get_tasks_since(@test_params.edge_gateway, last_task)
 
           expect(diff.keys).to eq([:LoadBalancerService])
           expect(diff[:LoadBalancerService]).to have_at_least(1).items
-          expect(task_list_after_update.size - task_list_before_update.size).to be(1)
+          expect(tasks_elapsed).to have(1).items
         end
 
         it "should not update the EdgeGateway again if we reapply the 'adding load balancer' config" do
-          start_time = Time.now.getutc
-          task_list_before_update = get_all_edge_gateway_update_tasks_ordered_by_start_date_since_time(start_time)
+          last_task = IntegrationHelper.get_last_task(@test_params.edge_gateway)
           diff = EdgeGateway::Configure.new(@adding_load_balancer_config_file, @vars_config_file).update
-          task_list_after_update = get_all_edge_gateway_update_tasks_ordered_by_start_date_since_time(start_time)
+          tasks_elapsed = IntegrationHelper.get_tasks_since(@test_params.edge_gateway, last_task)
 
           expect(diff).to eq({})
-          expect(task_list_after_update.size - task_list_before_update.size).to be(0)
+          expect(tasks_elapsed).to have(0).items
         end
 
       end
@@ -124,18 +120,6 @@ module Vcloud
           edge_gateway_ext_network_ip: @test_params.provider_network_ip,
         }
       end
-
-      def get_all_edge_gateway_update_tasks_ordered_by_start_date_since_time(timestamp)
-        vcloud_time = timestamp.strftime('%FT%T.000Z')
-        q = Vcloud::Core::QueryRunner.new
-
-        q.run('task',
-          :filter =>
-            "name==networkConfigureEdgeGatewayServices;objectName==#{@test_params.edge_gateway};startDate=ge=#{vcloud_time}",
-          :sortDesc => 'startDate',
-        )
-      end
-
     end
 
   end

data/spec/integration/edge_gateway/configure_nat_spec.rb

@@ -48,14 +48,13 @@ module Vcloud
         end
 
         it "should only make one EdgeGateway update task, to minimise EdgeGateway reload events" do
-          start_time = Time.now.getutc
-          task_list_before_update = get_all_edge_gateway_update_tasks_ordered_by_start_date_since_time(start_time)
+          last_task = IntegrationHelper.get_last_task(@test_params.edge_gateway)
           diff = EdgeGateway::Configure.new(@initial_nat_config_file, @vars_config_file).update
-          task_list_after_update = get_all_edge_gateway_update_tasks_ordered_by_start_date_since_time(start_time)
+          tasks_elapsed = IntegrationHelper.get_tasks_since(@test_params.edge_gateway, last_task)
 
           expect(diff.keys).to eq([:NatService])
           expect(diff[:NatService]).to have_at_least(1).items
-          expect(task_list_after_update.size - task_list_before_update.size).to be(1)
+          expect(tasks_elapsed).to have(1).items
         end
 
         it "should have configured at least one NAT rule" do
@@ -187,16 +186,6 @@ module Vcloud
           :original_ip => @test_params.provider_network_ip,
         }
       end
-
-      def get_all_edge_gateway_update_tasks_ordered_by_start_date_since_time(timestamp)
-        vcloud_time = timestamp.strftime('%FT%T.000Z')
-        q = Vcloud::Core::QueryRunner.new
-        q.run('task',
-          :filter => "name==networkConfigureEdgeGatewayServices;objectName==#{@test_params.edge_gateway};startDate=ge=#{vcloud_time}",
-          :sortDesc => 'startDate',
-        )
-      end
-
     end
 
   end

data/spec/support/integration_helper.rb

@@ -13,5 +13,27 @@ module IntegrationHelper
     }
   end
 
+  def self.get_last_task(gateway_name)
+    tasks = Vcloud::Core::QueryRunner.new.run('task',
+      :filter   => "name==networkConfigureEdgeGatewayServices;" + \
+                   "objectName==#{gateway_name}",
+      :sortDesc => 'startDate',
+      :pageSize => 1,
+    )
 
+    raise "Unable to find last vCloud task" if tasks.empty?
+    tasks.first
+  end
+
+  def self.get_tasks_since(gateway_name, task)
+    tasks = Vcloud::Core::QueryRunner.new.run('task',
+      :filter   => "name==networkConfigureEdgeGatewayServices;" + \
+                   "objectName==#{gateway_name};" + \
+                   "startDate=ge=#{task.fetch(:startDate)}",
+      :sortDesc => 'startDate',
+    )
+
+    tasks.reject! { |t| t.fetch(:href) == task.fetch(:href) }
+    tasks
+  end
 end

data/vcloud-edge_gateway.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9.3'
 
-  s.add_runtime_dependency 'vcloud-core', '~> 0.13.0'
+  s.add_runtime_dependency 'vcloud-core', '~> 0.16.0'
   s.add_runtime_dependency 'hashdiff'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rake'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcloud-edge_gateway
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vcloud-core
-  requirement: &18676320 !ruby/object:Gem::Requirement
+  requirement: &5059140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.16.0
   type: :runtime
   prerelease: false
-  version_requirements: *18676320
+  version_requirements: *5059140
 - !ruby/object:Gem::Dependency
   name: hashdiff
-  requirement: &18674160 !ruby/object:Gem::Requirement
+  requirement: &5057080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18674160
+  version_requirements: *5057080
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &18670380 !ruby/object:Gem::Requirement
+  requirement: &5067820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18670380
+  version_requirements: *5067820
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &18686460 !ruby/object:Gem::Requirement
+  requirement: &5065480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18686460
+  version_requirements: *5065480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &18683520 !ruby/object:Gem::Requirement
+  requirement: &5917940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.14.1
   type: :development
   prerelease: false
-  version_requirements: *18683520
+  version_requirements: *5917940
 - !ruby/object:Gem::Dependency
   name: rubocop
-  requirement: &18696860 !ruby/object:Gem::Requirement
+  requirement: &5913460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.23.0
   type: :development
   prerelease: false
-  version_requirements: *18696860
+  version_requirements: *5913460
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &18695360 !ruby/object:Gem::Requirement
+  requirement: &5926620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.7.1
   type: :development
   prerelease: false
-  version_requirements: *18695360
+  version_requirements: *5926620
 - !ruby/object:Gem::Dependency
   name: gem_publisher
-  requirement: &18692800 !ruby/object:Gem::Requirement
+  requirement: &5925020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -98,10 +98,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *18692800
+  version_requirements: *5925020
 - !ruby/object:Gem::Dependency
   name: vcloud-tools-tester
-  requirement: &18721100 !ruby/object:Gem::Requirement
+  requirement: &5921500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: 0.2.0
   type: :development
   prerelease: false
-  version_requirements: *18721100
+  version_requirements: *5921500
 description: Tool to configure a VMware vCloud Edge Gateway. Uses vcloud-core.
 email:
 - anna.shipman@digital.cabinet-office.gov.uk
@@ -220,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4151502617445342539
+      hash: -2969149712000054635
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11