vcloud-edge_gateway 1.4.1 → 1.5.0

data/CHANGELOG.md

@@ -1,14 +1,23 @@
+## 1.5.0 (2015-03-04)
+
+Features:
+  - Add support for static routes, thanks @geriBatai!
+
+Documentation:
+  - Correct the Copyright notice
+  - Guide for integration tests moved to GDS Operations web site
+
 ## 1.4.1 (2015-01-26)
 
-   - Update vCloud Core to 1.0.0 since the API is now stable.
-   - Update vcloud-tools-tester to 1.0.0 since the API is now stable.
+  - Update vCloud Core to 1.0.0 since the API is now stable.
+  - Update vcloud-tools-tester to 1.0.0 since the API is now stable.
 
 ## 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.
+  - 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)
 

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

@@ -421,12 +421,21 @@ 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
-
-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.
+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 Edge Gateway integration tests are:
+
+````
+default:                # This is the fog credential that refers to your testing environment, e.g. `test_credential`
+  network_1:            # Primary network name
+  network_1_id:         # Primary network ID
+  network_1_ip:         # Primary network IP
+  edge_gateway:         # Edge gateway name
+  provider_network:     # Provider (external-facing) network name
+  provider_network_id:  # Provider network ID
+  provider_network_ip:  # Provider network IP
+````
 
 ### References
 

data/examples/vcloud-configure-edge/static-routing-rules.yaml

@@ -0,0 +1,13 @@
+---
+gateway: "My Gateway Name"
+static_routing_service:
+  :enabled: true
+  :static_routes:
+    - :name: 'Test rule #1'
+      :network: '192.168.192.0/24'
+      :next_hop: '192.168.0.2'
+      :apply_on: 'Network-Name-To-Apply-On'
+    - :name: 'Test rule #2'
+      :network: '192.168.182.0/24'
+      :next_hop: '192.168.0.2'
+      :apply_on: 'Network-Name-To-Apply-On'

data/lib/vcloud/edge_gateway.rb

@@ -5,6 +5,7 @@ require 'vcloud/core'
 require 'vcloud/edge_gateway/schema/nat_service'
 require 'vcloud/edge_gateway/schema/firewall_service'
 require 'vcloud/edge_gateway/schema/load_balancer_service'
+require 'vcloud/edge_gateway/schema/static_routing_service'
 require 'vcloud/edge_gateway/schema/edge_gateway'
 
 require 'vcloud/edge_gateway/cli'
@@ -13,9 +14,10 @@ require 'vcloud/edge_gateway/configuration_generator/id_ranges'
 require 'vcloud/edge_gateway/configuration_generator/firewall_service'
 require 'vcloud/edge_gateway/configuration_generator/nat_service'
 require 'vcloud/edge_gateway/configuration_generator/load_balancer_service'
+require 'vcloud/edge_gateway/configuration_generator/static_routing_service'
 require 'vcloud/edge_gateway/configuration_differ'
 require 'vcloud/edge_gateway/nat_configuration_differ'
 require 'vcloud/edge_gateway/firewall_configuration_differ'
 require 'vcloud/edge_gateway/load_balancer_configuration_differ'
+require 'vcloud/edge_gateway/static_routing_configuration_differ'
 require 'vcloud/edge_gateway/edge_gateway_configuration'
-

data/lib/vcloud/edge_gateway/configuration_generator/static_routing_service.rb

@@ -0,0 +1,58 @@
+module Vcloud
+  module EdgeGateway
+    module ConfigurationGenerator
+
+      class StaticRoutingService
+        def initialize input_config, edge_gateway_interfaces
+          @input_config = input_config
+          @edge_gateway_interfaces = edge_gateway_interfaces
+        end
+
+        def generate_fog_config
+          return nil unless @input_config
+          {
+            IsEnabled:   routing_enabled?,
+            StaticRoute: generate_static_route_section
+          }
+        end
+
+        def generate_static_route_section
+          routes = @input_config[:static_routes]
+          return [] if routes.nil?
+          routes.collect do |route|
+            route[:enabled] ||= 'true'
+            {
+              Name:             route[:name],
+              Network:          route[:network],
+              NextHopIp:        route[:next_hop],
+              IsEnabled:        route[:enabled],
+              GatewayInterface: generate_gateway_interface_section(route[:apply_on])
+
+            }
+          end
+        end
+
+        def generate_gateway_interface_section(network_name)
+          egw_interface = find_egw_interface(network_name)
+          raise "unable to find gateway network interface with id #{network_id}" unless egw_interface
+
+          {
+            type: "application/vnd.vmware.vcloud.orgVdcNetwork+xml",
+            name: egw_interface.network_name,
+            href: egw_interface.network_href
+          }
+        end
+
+        def routing_enabled?
+            return 'false' unless @input_config
+            @input_config.key?(:enabled) ? @input_config[:enabled].to_s : 'true'
+        end
+
+        def find_egw_interface(network_name)
+          @edge_gateway_interfaces.find{|i| i.network_name == network_name}
+        end
+
+      end
+    end
+  end
+end

data/lib/vcloud/edge_gateway/edge_gateway_configuration.rb

@@ -64,6 +64,21 @@ module Vcloud
           end
         end
 
+        static_routing_service_config = EdgeGateway::ConfigurationGenerator::StaticRoutingService.new(
+          local_config[:static_routing_service],
+          edge_gateway_interfaces
+        ).generate_fog_config
+
+        unless static_routing_service_config.nil?
+          differ = EdgeGateway::StaticRoutingConfigurationDiffer.new(
+            remote_config[:StaticRoutingService],
+            static_routing_service_config
+          )
+          unless differ.diff.empty?
+            diff[:StaticRoutingService] = differ.diff
+            new_config[:StaticRoutingService] = static_routing_service_config
+          end
+        end
         return new_config, diff
       end
 

data/lib/vcloud/edge_gateway/schema/edge_gateway.rb

@@ -10,6 +10,7 @@ module Vcloud
               firewall_service: FIREWALL_SERVICE,
               nat_service: NAT_SERVICE,
               load_balancer_service: LOAD_BALANCER_SERVICE,
+              static_routing_service: STATIC_ROUTING_SERVICE
           }
       }
 

data/lib/vcloud/edge_gateway/schema/static_routing_service.rb

@@ -0,0 +1,33 @@
+module Vcloud
+  module EdgeGateway
+    module Schema
+      STATIC_ROUTE = {
+        type: Hash,
+        internals: {
+          enabled:  { type: 'boolean', required: false },
+          name:     { type: 'string', required: true },
+          network:  { type: 'ip_address_range', required: true },
+          next_hop: { type: 'ip_address', required: true },
+          apply_on: { type: 'string', required: true }
+        }
+      }
+
+
+      STATIC_ROUTING_SERVICE = {
+        type: Hash,
+        allowed_empty: true,
+        required: false,
+        internals: {
+          enabled: { type: 'boolean', required: false },
+          static_routes: {
+            type: Array,
+            required: false,
+            allowed_empty: true,
+            each_element_is: STATIC_ROUTE
+          }
+        }
+      }
+
+    end
+  end
+end

data/lib/vcloud/edge_gateway/static_routing_configuration_differ.rb

@@ -0,0 +1,16 @@
+module Vcloud
+  module EdgeGateway
+    class StaticRoutingConfigurationDiffer < ConfigurationDiffer
+      def strip_fields_for_differ_to_ignore(config)
+        remote_cfg = Marshal.load(Marshal.dump(config))
+        if remote_cfg.key?(:StaticRoute)
+          remote_cfg[:StaticRoute].each do |route_rule|
+            route_rule.delete(:IsEnabled)
+          end
+        end
+        remote_cfg
+      end
+    end
+  end
+
+end

data/lib/vcloud/edge_gateway/version.rb

@@ -1,6 +1,6 @@
 module Vcloud
   module EdgeGateway
-    VERSION = '1.4.1'
+    VERSION = '1.5.0'
   end
 end
 

data/spec/integration/edge_gateway/configure_static_routing_spec.rb

@@ -0,0 +1,144 @@
+require 'spec_helper'
+require 'tempfile'
+
+module Vcloud
+  describe EdgeGateway::Configure do
+
+    before(:all) do
+      config_file = File.join(File.dirname(__FILE__), "../vcloud_tools_testing_config.yaml")
+      required_user_params = [
+        "edge_gateway",
+        "provider_network",
+        "provider_network_default_gateway"
+      ]
+
+      @test_params = Vcloud::Tools::Tester::TestSetup.new(config_file, required_user_params).test_params
+      @files_to_delete = []
+    end
+
+    context "Test StaticRoutingService specifics" do
+
+      before(:all) do
+        reset_edge_gateway
+        @vars_config_file = generate_vars_file(edge_gateway_vars_hash)
+        @initial_static_routing_config_file = IntegrationHelper.fixture_file('static_routing_config.yaml.mustache')
+        @edge_gateway = Vcloud::Core::EdgeGateway.get_by_name(@test_params.edge_gateway)
+      end
+
+      context "Check update is functional" do
+
+        before(:all) do
+          local_config = Core::ConfigLoader.new.load_config(
+            @initial_static_routing_config_file,
+            Vcloud::EdgeGateway::Schema::EDGE_GATEWAY_SERVICES,
+            @vars_config_file
+          )
+          @local_vcloud_config  = EdgeGateway::ConfigurationGenerator::StaticRoutingService.new(
+            local_config[:static_routing_service],
+            @edge_gateway.interfaces
+          ).generate_fog_config
+        end
+
+        it "should be starting our tests from an empty StaticRoutingService" do
+          edge_service_config = @edge_gateway.vcloud_attributes[:Configuration][:EdgeGatewayServiceConfiguration]
+          remote_vcloud_config = edge_service_config[:StaticRoutingService]
+          if remote_vcloud_config
+            expect(remote_vcloud_config[:StaticRoute].nil?).to be_true
+          end
+        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)
+          diff = EdgeGateway::Configure.new(@initial_static_routing_config_file, @vars_config_file).update
+          task_list_after_update = get_all_edge_gateway_update_tasks_ordered_by_start_date_since_time(start_time)
+
+          expect(diff.keys).to eq([:StaticRoutingService])
+          expect(diff[:StaticRoutingService]).to have_at_least(1).items
+          expect(task_list_after_update.size - task_list_before_update.size).to be(1)
+        end
+
+        it "should have configured at least one static route" do
+          edge_service_config = @edge_gateway.vcloud_attributes[:Configuration][:EdgeGatewayServiceConfiguration]
+          remote_vcloud_config = edge_service_config[:StaticRoutingService]
+          expect(remote_vcloud_config[:StaticRoute].empty?).to be_false
+        end
+
+        it "should have configured the same number of static routes as in our configuration" do
+          edge_service_config = @edge_gateway.vcloud_attributes[:Configuration][:EdgeGatewayServiceConfiguration]
+          remote_vcloud_config = edge_service_config[:StaticRoutingService]
+          expect(remote_vcloud_config[:StaticRoute].size).
+            to eq(@local_vcloud_config[:StaticRoute].size)
+        end
+
+
+        it "should not then configure the StaticRoutingService if updated again with the same configuration" do
+          expect(Vcloud::Core.logger).to receive(:info).
+            with('EdgeGateway::Configure.update: Configuration is already up to date. Skipping.')
+          diff = EdgeGateway::Configure.new(@initial_static_routing_config_file, @vars_config_file).update
+
+          expect(diff).to eq({})
+        end
+
+      end
+
+      context "Check specific StaticRoutingService update cases" do
+
+        it "should be able to configure with no static routes" do
+          config_file = IntegrationHelper.fixture_file('static_routing_empty.yaml.mustache')
+          diff = EdgeGateway::Configure.new(config_file, @vars_config_file).update
+          edge_config = @edge_gateway.vcloud_attributes[:Configuration]
+          remote_vcloud_config = edge_config[:EdgeGatewayServiceConfiguration][:StaticRoutingService]
+
+          expect(diff.keys).to eq([:StaticRoutingService])
+          expect(diff[:StaticRoutingService]).to have_at_least(1).items
+          expect(remote_vcloud_config[:StaticRoute].nil?).to be_true
+        end
+
+      end
+
+      after(:all) do
+        IntegrationHelper.remove_temp_config_files(@files_to_delete)
+      end
+
+      def reset_edge_gateway
+        edge_gateway = Core::EdgeGateway.get_by_name @test_params.edge_gateway
+        edge_gateway.update_configuration({
+          StaticRoutingService: {
+            IsEnabled: "false",
+            StaticRoute: []
+          }
+        })
+      end
+
+      def generate_vars_file(vars_hash)
+        file = Tempfile.new('vars_file')
+        file.write(vars_hash.to_yaml)
+        file.close
+        @files_to_delete << file
+
+        file.path
+      end
+
+      def edge_gateway_vars_hash
+        {
+          :edge_gateway_name => @test_params.edge_gateway,
+          :edge_gateway_ext_network_name => @test_params.provider_network,
+          :edge_gateway_ext_default_gateway => @test_params.provider_network_default_gateway
+        }
+      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
+end

data/spec/integration/edge_gateway/data/static_routing_config.yaml.mustache

@@ -0,0 +1,14 @@
+---
+gateway: {{ edge_gateway_name }}
+static_routing_service:
+  static_routes:
+  - enabled: true
+    name: 'A rule #1'
+    network: '192.168.192.0/24'
+    next_hop: {{ edge_gateway_ext_default_gateway }}
+    apply_on: {{ edge_gateway_ext_network_name }}
+  - enabled: true
+    name: 'A rule #2'
+    network: '192.168.193.0/24'
+    next_hop: {{ edge_gateway_ext_default_gateway }}
+    apply_on: {{ edge_gateway_ext_network_name }}

data/spec/integration/edge_gateway/data/static_routing_empty.yaml.mustache

@@ -0,0 +1,4 @@
+---
+gateway: {{ edge_gateway_name }}
+static_routing_service:
+  enabled: true

data/spec/vcloud/edge_gateway/configuration_generator/static_routing_service_spec.rb

@@ -0,0 +1,98 @@
+require 'spec_helper'
+
+module Vcloud
+  module EdgeGateway
+    module ConfigurationGenerator
+      describe StaticRoutingService do
+        before(:each) do
+          mock_uplink_interface = double(
+              :mock_uplink,
+              :network_name => "ane012345",
+              :network_id   => "2ad93597-7b54-43dd-9eb1-631dd337e5a7",
+              :network_href   => "https://vmware.api.net/api/admin/network/2ad93597-7b54-43dd-9eb1-631dd337e5a7",
+          )
+          mock_internal_interface = double(
+             :mock_uplink,
+             :network_name => "internal_interface",
+             :network_id   => "12346788-1234-1234-1234-123456789000",
+             :network_href => "https://vmware.api.net/api/admin/network/12346788-1234-1234-1234-123456789000",
+           )
+          @edge_gw_interface_list = [ mock_internal_interface, mock_uplink_interface ]
+        end
+
+        context "top level static routing configuration defaults" do
+
+          it 'should default to StaticRoutingService enabled' do
+            @output = StaticRoutingService.new({}, @edge_gw_interface_list).generate_fog_config
+            expect(@output[:IsEnabled]).to eq('true')
+          end
+        end
+
+        context "static routing defaults" do
+
+          before(:each) do
+            routes = { static_routes: [{
+              name: "Test Route",
+              network: "192.2.0.0/24",
+              next_hop: "192.168.1.1",
+              apply_on: "ane012345"
+            }]}
+            output = StaticRoutingService.new(routes,@edge_gw_interface_list).generate_fog_config
+            @route = output[:StaticRoute].first
+          end
+
+          it 'should default to route being enabled' do
+            expect(@route[:IsEnabled]).to eq('true')
+          end
+
+          it 'should have name set' do
+            expect(@route[:Name]).to eq('Test Route')
+          end
+
+          it 'should have next hop set' do
+            expect(@route[:NextHopIp]).to eq('192.168.1.1')
+          end
+
+          it 'should have correct gateway interface set' do
+            interface = @route[:GatewayInterface]
+            expect(interface[:name]).to eq('ane012345')
+          end
+        end
+
+        context "static route config generation" do
+
+          it 'should have disabled firewall with a disabled rule' do
+            input = {
+              static_routes: [{ 
+                name: 'Disabled route',
+                enabled: 'false',
+                network: '192.192.192.0/24',
+                next_hop: '192.192.182.1',
+                apply_on: 'ane012345'
+              }]
+            }
+            output = {
+                IsEnabled: 'true',
+                StaticRoute: [
+                  {
+                    Name: 'Disabled route',
+                    Network: '192.192.192.0/24',
+                    NextHopIp: '192.192.182.1',
+                    IsEnabled: 'false',
+                    GatewayInterface: {
+                      type: 'application/vnd.vmware.vcloud.orgVdcNetwork+xml',
+                      name: 'ane012345',
+                      href: 'https://vmware.api.net/api/admin/network/2ad93597-7b54-43dd-9eb1-631dd337e5a7'
+                    }
+                  }
+                ]
+            }
+            generated_config = StaticRoutingService.new(input, @edge_gw_interface_list).generate_fog_config
+            expect(generated_config).to eq(output)
+          end
+
+        end
+      end
+    end
+  end
+end

data/spec/vcloud/edge_gateway/edge_gateway_configuration_spec.rb

@@ -23,11 +23,13 @@ module Vcloud
             :nat_service => test_nat_config,
             :firewall_service => test_firewall_config,
             :load_balancer_service => test_load_balancer_config,
+            :static_routing_service => test_static_routing_config
           }
           @remote_config = {
             :FirewallService => different_firewall_config,
             :NatService => different_nat_config,
             :LoadBalancerService => different_load_balancer_config,
+            :StaticRoutingService => different_static_routing_config
           }
           @proposed_config = EdgeGateway::EdgeGatewayConfiguration.new(
             @test_config,
@@ -628,6 +630,18 @@ module Vcloud
         }
       end
 
+
+      def test_static_routing_config
+        {
+          :static_routes  => [{
+            name: 'Test route',
+            network: '192.192.192.0/24',
+            next_hop: '192.192.182.1',
+            apply_on: 'ane012345'
+          }]
+        }
+      end
+
       def test_load_balancer_config
         {
           enabled: 'true',
@@ -706,6 +720,22 @@ module Vcloud
         }
       end
 
+      def different_static_routing_config
+        {
+          :StaticRoutingService  => [{
+            Name: 'Different rule',
+            IsEnabled: 'false',
+            Network: '192.192.193.0/24',
+            NextHopIp: '192.192.182.1',
+            GatewayInterface: {
+              type: 'application/vnd.vmware.vcloud.orgVdcNetwork+xml',
+              name: 'ane012345',
+              href: 'https://vmware.api.net/api/admin/network/2ad93597-7b54-43dd-9eb1-631dd337e5a7'
+            }
+          }]
+        }
+      end
+
       def different_load_balancer_config
         {
           :IsEnabled=>"true",

data/spec/vcloud/edge_gateway/static_routing_schema_validation_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+module Vcloud
+  describe 'static_routing_service_schema_validations' do
+    context 'source and destination ips' do
+      it 'should error if network or next_hop IPs are invalid' do
+        config = {
+          static_routes: [
+            {
+              name: 'Some Name',
+              network: '10.10.10.10/256',
+              next_hop: '192.1',
+              apply_on: 'interface'
+            }
+          ]
+        }
+        validator = Vcloud::Core::ConfigValidator.validate(:base, config, Vcloud::EdgeGateway::Schema::STATIC_ROUTING_SERVICE)
+        expect(validator.valid?).to be_false
+        expect(validator.errors).to eq([
+                                        "network: 10.10.10.10/256 is not a valid IP address range. Valid values can be IP address, CIDR, IP range, 'Any','internal' and 'external'.",
+                                        "next_hop: 192.1 is not a valid ip_address",
+                                       ])
+      end
+
+      it 'should validate OK if source_ip/destination_ip are valid IPs' do
+        config = {
+          static_routes: [
+            {
+              name: 'Some Name',
+              network: '10.10.10.0/24',
+              next_hop: '192.168.0.1',
+              apply_on: 'interface'
+            }
+          ]
+        }
+        validator = Vcloud::Core::ConfigValidator.validate(:base, config, Vcloud::EdgeGateway::Schema::STATIC_ROUTING_SERVICE)
+        expect(validator.valid?).to be_true
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcloud-edge_gateway
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vcloud-core
-  requirement: &11463440 !ruby/object:Gem::Requirement
+  requirement: &19376300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *11463440
+  version_requirements: *19376300
 - !ruby/object:Gem::Dependency
   name: hashdiff
-  requirement: &11460280 !ruby/object:Gem::Requirement
+  requirement: &19375620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11460280
+  version_requirements: *19375620
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &11458280 !ruby/object:Gem::Requirement
+  requirement: &19374700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11458280
+  version_requirements: *19374700
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &11483760 !ruby/object:Gem::Requirement
+  requirement: &19373680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11483760
+  version_requirements: *19373680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &11477980 !ruby/object:Gem::Requirement
+  requirement: &19370360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.14.1
   type: :development
   prerelease: false
-  version_requirements: *11477980
+  version_requirements: *19370360
 - !ruby/object:Gem::Dependency
   name: rubocop
-  requirement: &11489860 !ruby/object:Gem::Requirement
+  requirement: &19383420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.23.0
   type: :development
   prerelease: false
-  version_requirements: *11489860
+  version_requirements: *19383420
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &11487000 !ruby/object:Gem::Requirement
+  requirement: &19382600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.7.1
   type: :development
   prerelease: false
-  version_requirements: *11487000
+  version_requirements: *19382600
 - !ruby/object:Gem::Dependency
   name: gem_publisher
-  requirement: &11518080 !ruby/object:Gem::Requirement
+  requirement: &19380820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -98,10 +98,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *11518080
+  version_requirements: *19380820
 - !ruby/object:Gem::Dependency
   name: vcloud-tools-tester
-  requirement: &11515480 !ruby/object:Gem::Requirement
+  requirement: &19379340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *11515480
+  version_requirements: *19379340
 description: Tool to configure a VMware vCloud Edge Gateway. Uses vcloud-core.
 email:
 - anna.shipman@digital.cabinet-office.gov.uk
@@ -132,6 +132,7 @@ files:
 - examples/vcloud-configure-edge/firewall-rules.yaml
 - examples/vcloud-configure-edge/loadbalancer-rules.yaml
 - examples/vcloud-configure-edge/nat-rules.yaml
+- examples/vcloud-configure-edge/static-routing-rules.yaml
 - examples/vcloud-configure-edge/template-nat-rules.yaml.mustache
 - examples/vcloud-configure-edge/template-vars-env1.yaml
 - examples/vcloud-configure-edge/template-vars-env2.yaml
@@ -144,6 +145,7 @@ files:
 - lib/vcloud/edge_gateway/configuration_generator/id_ranges.rb
 - lib/vcloud/edge_gateway/configuration_generator/load_balancer_service.rb
 - lib/vcloud/edge_gateway/configuration_generator/nat_service.rb
+- lib/vcloud/edge_gateway/configuration_generator/static_routing_service.rb
 - lib/vcloud/edge_gateway/configure.rb
 - lib/vcloud/edge_gateway/edge_gateway_configuration.rb
 - lib/vcloud/edge_gateway/firewall_configuration_differ.rb
@@ -153,12 +155,14 @@ files:
 - lib/vcloud/edge_gateway/schema/firewall_service.rb
 - lib/vcloud/edge_gateway/schema/load_balancer_service.rb
 - lib/vcloud/edge_gateway/schema/nat_service.rb
+- lib/vcloud/edge_gateway/schema/static_routing_service.rb
+- lib/vcloud/edge_gateway/static_routing_configuration_differ.rb
 - lib/vcloud/edge_gateway/version.rb
-- spec/integration/README.md
 - spec/integration/edge_gateway/configure_firewall_spec.rb
 - spec/integration/edge_gateway/configure_load_balancer_spec.rb
 - spec/integration/edge_gateway/configure_multiple_services_spec.rb
 - spec/integration/edge_gateway/configure_nat_spec.rb
+- spec/integration/edge_gateway/configure_static_routing_spec.rb
 - spec/integration/edge_gateway/data/firewall_config.yaml.mustache
 - spec/integration/edge_gateway/data/firewall_config_updated_rule.yaml.mustache
 - spec/integration/edge_gateway/data/firewall_rule_order_test.yaml.mustache
@@ -172,6 +176,8 @@ files:
 - spec/integration/edge_gateway/data/nat_and_firewall_config.yaml.mustache
 - spec/integration/edge_gateway/data/nat_and_firewall_plus_load_balancer_config.yaml.mustache
 - spec/integration/edge_gateway/data/nat_config.yaml.mustache
+- spec/integration/edge_gateway/data/static_routing_config.yaml.mustache
+- spec/integration/edge_gateway/data/static_routing_empty.yaml.mustache
 - spec/integration/vcloud_tools_testing_config.yaml.template
 - spec/spec_helper.rb
 - spec/support/integration_helper.rb
@@ -190,6 +196,7 @@ files:
 - spec/vcloud/edge_gateway/configuration_generator/firewall_service_spec.rb
 - spec/vcloud/edge_gateway/configuration_generator/load_balancer_service_spec.rb
 - spec/vcloud/edge_gateway/configuration_generator/nat_service_spec.rb
+- spec/vcloud/edge_gateway/configuration_generator/static_routing_service_spec.rb
 - spec/vcloud/edge_gateway/configure_spec.rb
 - spec/vcloud/edge_gateway/edge_gateway_configuration_spec.rb
 - spec/vcloud/edge_gateway/firewall_configuration_differ_spec.rb
@@ -198,6 +205,7 @@ files:
 - spec/vcloud/edge_gateway/load_balancer_schema_validation_spec.rb
 - spec/vcloud/edge_gateway/nat_configuration_differ_spec.rb
 - spec/vcloud/edge_gateway/nat_schema_validation_spec.rb
+- spec/vcloud/edge_gateway/static_routing_schema_validation_spec.rb
 - vcloud-edge_gateway.gemspec
 homepage: http://github.com/gds-operations/vcloud-edge_gateway
 licenses:
@@ -220,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -709393838839136568
+      hash: 3095233766048741
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11
@@ -228,11 +236,11 @@ signing_key:
 specification_version: 3
 summary: Tool to configure a VMware vCloud Edge Gateway
 test_files:
-- spec/integration/README.md
 - spec/integration/edge_gateway/configure_firewall_spec.rb
 - spec/integration/edge_gateway/configure_load_balancer_spec.rb
 - spec/integration/edge_gateway/configure_multiple_services_spec.rb
 - spec/integration/edge_gateway/configure_nat_spec.rb
+- spec/integration/edge_gateway/configure_static_routing_spec.rb
 - spec/integration/edge_gateway/data/firewall_config.yaml.mustache
 - spec/integration/edge_gateway/data/firewall_config_updated_rule.yaml.mustache
 - spec/integration/edge_gateway/data/firewall_rule_order_test.yaml.mustache
@@ -246,6 +254,8 @@ test_files:
 - spec/integration/edge_gateway/data/nat_and_firewall_config.yaml.mustache
 - spec/integration/edge_gateway/data/nat_and_firewall_plus_load_balancer_config.yaml.mustache
 - spec/integration/edge_gateway/data/nat_config.yaml.mustache
+- spec/integration/edge_gateway/data/static_routing_config.yaml.mustache
+- spec/integration/edge_gateway/data/static_routing_empty.yaml.mustache
 - spec/integration/vcloud_tools_testing_config.yaml.template
 - spec/spec_helper.rb
 - spec/support/integration_helper.rb
@@ -264,6 +274,7 @@ test_files:
 - spec/vcloud/edge_gateway/configuration_generator/firewall_service_spec.rb
 - spec/vcloud/edge_gateway/configuration_generator/load_balancer_service_spec.rb
 - spec/vcloud/edge_gateway/configuration_generator/nat_service_spec.rb
+- spec/vcloud/edge_gateway/configuration_generator/static_routing_service_spec.rb
 - spec/vcloud/edge_gateway/configure_spec.rb
 - spec/vcloud/edge_gateway/edge_gateway_configuration_spec.rb
 - spec/vcloud/edge_gateway/firewall_configuration_differ_spec.rb
@@ -272,3 +283,4 @@ test_files:
 - spec/vcloud/edge_gateway/load_balancer_schema_validation_spec.rb
 - spec/vcloud/edge_gateway/nat_configuration_differ_spec.rb
 - spec/vcloud/edge_gateway/nat_schema_validation_spec.rb
+- spec/vcloud/edge_gateway/static_routing_schema_validation_spec.rb

data/spec/integration/README.md

@@ -1,38 +0,0 @@
-# Running vCloud Edge Gateway 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/vcloud_tools_testing_config.yaml`
-  and update with parameters suitable for your environment.
-
-- You need to include the set-up for your testing environment in your
-  [fog file](https://github.com/gds-operations/vcloud-core#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`
-  network_1:            # Primary network name
-  network_1_id:         # Primary network ID
-  network_1_ip:         # Primary network IP
-  edge_gateway:         # Edge gateway name
-  provider_network:     # Provider (external-facing) network name
-  provider_network_id:  # Provider network ID
-  provider_network_ip:  # Provider network IP
-````
-
-## To run the tests
-
-  `FOG_CREDENTIAL=test_credential bundle exec integration`