vcloud-edge_gateway 1.5.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86f8618c4225d55bb5925210f8e2d61e8871dcdb
-  data.tar.gz: 09347c90c0b67feb8a0ed4caa81a507cd2f7bbca
+  metadata.gz: c61eb82a7ec8f16a423428e939d8f965a6335b28
+  data.tar.gz: 41d62fd0e42432b96c95a6baea18c97d740dd06c
 SHA512:
-  metadata.gz: 97df5193a9687af5e10abff2278cb96870a7940b2f4ad3219244732275eab494fee4eaa7ab135cc3231c2af9d66b50bb47d4fc723a4189e7f7b4814642e772de
-  data.tar.gz: 77ae86c795dd2c8937c38a30d340ac551c09a2db9559359d816b94e8b84be51f4d8a2459be8c1c0c09526ae2952080ca91ff0a75b215654c5df789598659f2ff
+  metadata.gz: 85b79c39f0a9442411db88044e8d34fd0ac275e777efc28b4ced860740a9dcf0ceaf523f25d873160f60cdda02a790236988f84f5a4671738a2c27540f48c25b
+  data.tar.gz: 6529be31ab62c383f9d6822782ff5ad91cbc64e02b8416869de4745aa624b25482f654d335cf25624bba1ec73befef19a7b9371bdb3623d8507b14731c0c621b

data/.travis.yml

@@ -1,8 +1,9 @@
 ---
 language: ruby
+sudo: false
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.2
+  - 2.2.2
+  - 2.3.0
+  - 2.4.0
 notifications:
   email: false

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 2.1.0 (2017-06-22)
+
+  - Upgrade to the latest vCloud Core, and bring the version number into line
+    with the rest of the toolset.
+  - Remove support for Ruby versions older than 2.2.2.
+  - Add support for Ruby 2.3.0 and 2.4.0.
+  - Upgrade Rspec, Rubocop, Simplecov and Rake.
+  - Add documentation regarding deprecation of support
+  - Various bug fixes
+
+## Unreleased
+
+- Remove support for Ruby 1.9.3, which is now end-of-life.
+
 ## 1.5.2 (2015-07-20)
 
 - Update vCloud Core to 1.1.0 to pick up a bugfix.

data/CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing to vCloud Edge Gateway
 
-We really welcome contributions.
+We now consider vCloud Tools feature complete for our purposes. We'd be happy to consider pull requests for new features but please discuss them with us in the issues first so we can let you know if it's something we'd be likely to merge. We will continue to make maintenance and bug fixes.
 
 ## A quick guide on how to contribute
 
@@ -36,11 +36,7 @@ We really welcome contributions.
 
 ## How soon will we respond?
 
-We will comment on your pull request within two working days. However, we might not be able to review it immediately.
-
-We may come back to you with comments and suggestions, and if we would like you to make changes, we will close the pull request as well as adding details of the changes we'd like you to make.
-
-If you feel your pull request has been outstanding too long, please feel free to bump it by making a comment on it.
+We will comment on your issue as soon as we can. If you feel your issue is important, please feel free to bump it by making a comment on it or raise your issue on the [mailing list](https://groups.google.com/a/digital.cabinet-office.gov.uk/forum/#!forum/vcloud-tools).
 
 ## Guidelines for making a pull request
 

data/Jenkinsfile

@@ -0,0 +1,40 @@
+#!/usr/bin/env groovy
+
+repoName = JOB_NAME.split('/')[0]
+
+node {
+  def govuk = load '/var/lib/jenkins/groovy_scripts/govuk_jenkinslib.groovy'
+
+  try {
+    stage("Checkout") {
+      govuk.checkoutFromGitHubWithSSH(repoName)
+    }
+
+    stage("Clean up workspace") {
+      govuk.cleanupGit()
+    }
+
+    stage("bundle install") {
+      govuk.setEnvar("RBENV_VERSION", "2.2.2")
+      govuk.bundleGem()
+    }
+
+    stage("Run tests") {
+      govuk.runTests()
+    }
+
+    if (env.BRANCH_NAME == "master") {
+      stage("Publish gem") {
+        govuk.publishGem(repoName, env.BRANCH_NAME)
+      }
+    }
+  } catch (e) {
+    currentBuild.result = "FAILED"
+    step([$class: 'Mailer',
+          notifyEveryUnstableBuild: true,
+          recipients: 'govuk-ci-notifications@digital.cabinet-office.gov.uk',
+          sendToIndividuals: true])
+    throw e
+  }
+}
+

data/README.md

@@ -43,6 +43,7 @@ You can configure the following services on an existing edgegateway using
 - nat_service
 - load_balancer_service
 - gateway_ipsec_vpn_service
+- static_routing_service
 
 The `vcloud-edge-configure` tool takes an input YAML file describing one
 or more of these services and updates the edge gateway configuration to match,
@@ -356,6 +357,71 @@ There is no persistence option for 'tcp' service_profiles.
 See [the vCloud Director Admin Guide](http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.admin.doc_51/GUID-EC5EE5F9-1A2C-4609-9347-4C3143727704.html)
 for more details on configuring VirtualServer entries.
 
+### gateway_ipsec_vpn_service
+
+The edge gateway VPN service allows setting up a basic IPSEC VPN peer. Configuration will depend on how the remote peer device is configured. Multiple tunnels can be
+configured, along with multiple local and remote peer subnets in a single tunnel.
+
+The configuration requires several details:
+
+* Peer IP address: the public address of the remote peer
+* Local IP address: the public address of the local peer
+* Peer subnets: A private network address range which determines what traffic will traverse the tunnel
+* Local subnets: A private network address range which determines what traffic will be routed from the remote peer
+* Shared secret: This is the shared secret key which must be the same on both sides of the tunnel for encryption purposes
+* Encryption protocol: This should match on both sides of the tunnel
+* MTU: This sould match on both sides of the tunnel
+
+Here is an example configuration:
+
+```
+---
+gateway: GATEWAY_ID
+gateway_ipsec_vpn_service:
+  enabled: true
+  tunnels:
+  - :name: 'Example_name_without_spaces'
+    :enabled: true
+    :rule_type: 'DNAT'
+    :description: 'Description name with spaces'
+    :ipsec_vpn_local_peer:
+      :id: 'this-is-an-example-edgegatewayid'
+      :name: 'NameOfEdgeGateway'
+    :peer_ip_address: 1.2.3.4
+    :peer_id: '1.2.3.4'
+    :local_ip_address: 4.3.2.1
+    :local_id: '4.3.2.1'
+    :peer_subnets:
+      - :name: '172.16.0.0/24'
+        :gateway: '172.16.0.1'
+        :netmask: '255.255.255.0'
+    :shared_secret: usesomethinglikea32characterpassword
+    :encryption_protocol: 'AES'
+    :mtu: 1500
+    :local_subnets:
+      - :name: '192.168.0.0/24'
+        :gateway: '192.168.0.1'
+        :netmask: '255.255.255.0'
+```
+
+### static_routing_service
+
+You can set up specific static routes using the vEdge Gateway. It allows you to route traffic that is destined to a specific destination IP to go via
+a specific gateway.
+
+```
+---
+gateway: GATEWAY_ID
+static_routing_service:
+  static_routes:
+  - enabled: true
+    name: 'Example Static Route'
+    network: '192.168.0.0/24'
+    next_hop: '172.16.0.1'
+    apply_on: EDGE_GATEWAY_EXT_NETWORK
+```
+
+
 ### Finding external network details from vcloud-walk
 
 You can find the network UUID and external address allocations using [vCloud
@@ -441,6 +507,6 @@ default:                # This is the fog credential that refers to your testing
 
 ## Contributing
 
-Please see the [contributing guidelines](/CONTRIBUTING.md).
+Please see [CONTRIBUTING.md](/CONTRIBUTING.md).
 
 [fog]: http://fog.io/

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

@@ -25,6 +25,7 @@ module Vcloud
             new_rule[:Id] = rule.key?(:id) ? rule[:id] : i.to_s
             new_rule[:IsEnabled] = rule.key?(:enabled) ? rule[:enabled].to_s : 'true'
             new_rule[:RuleType] = rule[:rule_type]
+            new_rule[:Description] = rule[:description] if rule.key?(:description)
             gateway_nat_rule = populate_gateway_nat_rule(rule)
             new_rule[:GatewayNatRule] = gateway_nat_rule
             i += 1

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

@@ -36,7 +36,7 @@ module Vcloud
           enabled: { type: 'boolean', required: false },
           port:    { type: 'string_or_number', required: false },
           algorithm: { type: 'enum', required: false,
-            acceptable_values: [ 'ROUND_ROBIN', 'IP_HASH', 'URI', 'LEAST_CONNECTED' ]},
+            acceptable_values: [ 'ROUND_ROBIN', 'IP_HASH', 'URI', 'LEAST_CONN' ]},
           health_check: {
             type: 'hash',
             required: false,

data/lib/vcloud/edge_gateway/version.rb

@@ -1,6 +1,6 @@
 module Vcloud
   module EdgeGateway
-    VERSION = '1.5.2'
+    VERSION = '2.1.0'
   end
 end
 

data/rbenv_version.sh

@@ -1 +1 @@
-export RBENV_VERSION="2.1.2"
+export RBENV_VERSION="2.2.2"

data/spec/integration/edge_gateway/configure_firewall_spec.rb

@@ -39,7 +39,7 @@ module Vcloud
 
         it "should be starting our tests from an empty firewall" do
           remote_vcloud_config = @edge_gateway.vcloud_attributes[:Configuration][:EdgeGatewayServiceConfiguration][:FirewallService]
-          expect(remote_vcloud_config[:FirewallRule].empty?).to be_true
+          expect(remote_vcloud_config[:FirewallRule].empty?).to be true
         end
 
         it "should only need to make one call to Core::EdgeGateway.update_configuration" do
@@ -52,7 +52,7 @@ module Vcloud
 
         it "should have configured at least one firewall rule" do
           remote_vcloud_config = @edge_gateway.vcloud_attributes[:Configuration][:EdgeGatewayServiceConfiguration][:FirewallService]
-          expect(remote_vcloud_config[:FirewallRule].empty?).to be_false
+          expect(remote_vcloud_config[:FirewallRule].empty?).to be false
         end
 
         it "should have configured the same number of firewall rules as in our configuration" do

data/spec/integration/edge_gateway/configure_load_balancer_spec.rb

@@ -41,8 +41,8 @@ module Vcloud
         it "should be starting our tests from an empty LoadBalancerService" do
           edge_service_config = @edge_gateway.vcloud_attributes[:Configuration][:EdgeGatewayServiceConfiguration]
           remote_vcloud_config = edge_service_config[:LoadBalancerService]
-          expect(remote_vcloud_config[:Pool].empty?).to be_true
-          expect(remote_vcloud_config[:VirtualServer].empty?).to be_true
+          expect(remote_vcloud_config[:Pool].empty?).to be true
+          expect(remote_vcloud_config[:VirtualServer].empty?).to be true
         end
 
         it "should only make one EdgeGateway update task, to minimise EdgeGateway reload events" do
@@ -62,7 +62,7 @@ module Vcloud
 
           edge_service_config = @edge_gateway.vcloud_attributes[:Configuration][:EdgeGatewayServiceConfiguration]
           remote_vcloud_config = edge_service_config[:LoadBalancerService]
-          expect(remote_vcloud_config[:Pool].empty?).to be_false
+          expect(remote_vcloud_config[:Pool].empty?).to be false
         end
 
         it "should have configured at least one LoadBancer VirtualServer entry" do
@@ -70,7 +70,7 @@ module Vcloud
 
           edge_service_config = @edge_gateway.vcloud_attributes[:Configuration][:EdgeGatewayServiceConfiguration]
           remote_vcloud_config = edge_service_config[:LoadBalancerService]
-          expect(remote_vcloud_config[:VirtualServer].empty?).to be_false
+          expect(remote_vcloud_config[:VirtualServer].empty?).to be false
         end
 
         it "should have configured the same number of Pools as in our configuration" do

data/spec/integration/edge_gateway/configure_multiple_services_spec.rb

@@ -30,10 +30,10 @@ module Vcloud
 
         it "should be starting our tests from an empty EdgeGateway" do
           remote_vcloud_config = @edge_gateway.vcloud_attributes[:Configuration][:EdgeGatewayServiceConfiguration]
-          expect(remote_vcloud_config[:FirewallService][:FirewallRule].empty?).to be_true
-          expect(remote_vcloud_config[:NatService][:NatRule].empty?).to be_true
-          expect(remote_vcloud_config[:LoadBalancerService][:Pool].empty?).to be_true
-          expect(remote_vcloud_config[:LoadBalancerService][:VirtualServer].empty?).to be_true
+          expect(remote_vcloud_config[:FirewallService][:FirewallRule].empty?).to be true
+          expect(remote_vcloud_config[:NatService][:NatRule].empty?).to be true
+          expect(remote_vcloud_config[:LoadBalancerService][:Pool].empty?).to be true
+          expect(remote_vcloud_config[:LoadBalancerService][:VirtualServer].empty?).to be true
         end
 
         it "should only create one edgeGateway update task when updating the configuration" do
@@ -53,8 +53,8 @@ module Vcloud
           pending("This test will fail until https://github.com/fog/fog/pull/3695 is merged and released by Fog")
 
           remote_vcloud_config = @edge_gateway.vcloud_attributes[:Configuration][:EdgeGatewayServiceConfiguration]
-          expect(remote_vcloud_config[:FirewallService][:FirewallRule].empty?).to be_false
-          expect(remote_vcloud_config[:NatService][:NatRule].empty?).to be_false
+          expect(remote_vcloud_config[:FirewallService][:FirewallRule].empty?).to be false
+          expect(remote_vcloud_config[:NatService][:NatRule].empty?).to be false
           expect(remote_vcloud_config[:LoadBalancerService][:Pool].empty?).to be(true)
           expect(remote_vcloud_config[:LoadBalancerService][:VirtualServer].empty?).to be(true)
         end

data/spec/integration/edge_gateway/configure_nat_spec.rb

@@ -44,7 +44,7 @@ module Vcloud
 
         it "should be starting our tests from an empty NatService" do
           remote_vcloud_config = @edge_gateway.vcloud_attributes[:Configuration][:EdgeGatewayServiceConfiguration][:NatService]
-          expect(remote_vcloud_config[:NatRule].empty?).to be_true
+          expect(remote_vcloud_config[:NatRule].empty?).to be true
         end
 
         it "should only make one EdgeGateway update task, to minimise EdgeGateway reload events" do
@@ -63,7 +63,7 @@ module Vcloud
           pending("This test will fail until https://github.com/fog/fog/pull/3695 is merged and released by Fog")
 
           remote_vcloud_config = @edge_gateway.vcloud_attributes[:Configuration][:EdgeGatewayServiceConfiguration][:NatService]
-          expect(remote_vcloud_config[:NatRule].empty?).to be_false
+          expect(remote_vcloud_config[:NatRule].empty?).to be false
         end
 
         it "should have configured the same number of nat rules as in our configuration" do
@@ -97,6 +97,7 @@ module Vcloud
           expect(dnat_rule).not_to be_nil
           expect(dnat_rule[:RuleType]).to eq('DNAT')
           expect(dnat_rule[:Id]).to eq('65537')
+          expect(dnat_rule[:Description]).to eq('Example DNAT')
           expect(dnat_rule[:IsEnabled]).to eq('true')
           expect(dnat_rule[:GatewayNatRule][:Interface][:href]).to include(@test_params.provider_network_id)
           expect(dnat_rule[:GatewayNatRule][:OriginalIp]).to eq(@test_params.provider_network_ip)
@@ -113,6 +114,7 @@ module Vcloud
           expect(snat_rule).not_to be_nil
           expect(snat_rule[:RuleType]).to eq('SNAT')
           expect(snat_rule[:Id]).to eq('65538')
+          expect(snat_rule[:Description]).to eq('Example SNAT')
           expect(snat_rule[:IsEnabled]).to eq('true')
           expect(snat_rule[:GatewayNatRule][:Interface][:href]).to include(@test_params.provider_network_id)
           expect(snat_rule[:GatewayNatRule][:OriginalIp]).to eq('10.10.1.2-10.10.1.3')
@@ -144,6 +146,7 @@ module Vcloud
           expect(expected_rule).not_to be_nil
           expect(expected_rule[:RuleType]).to eq('DNAT')
           expect(expected_rule[:Id]).to eq('65537')
+          expect(dnat_rule[:Description]).to eq('Example DNAT')
           expect(expected_rule[:RuleType]).to eq('DNAT')
           expect(expected_rule[:IsEnabled]).to eq('true')
           expect(expected_rule[:GatewayNatRule][:Interface][:name]).to eq(@test_params.network_1)

data/spec/integration/edge_gateway/configure_static_routing_spec.rb

@@ -43,7 +43,7 @@ module Vcloud
           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
+            expect(remote_vcloud_config[:StaticRoute].nil?).to be true
           end
         end
 
@@ -61,7 +61,7 @@ module Vcloud
         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
+          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
@@ -92,7 +92,7 @@ module Vcloud
 
           expect(diff.keys).to eq([:StaticRoutingService])
           expect(diff[:StaticRoutingService]).to have_at_least(1).items
-          expect(remote_vcloud_config[:StaticRoute].nil?).to be_true
+          expect(remote_vcloud_config[:StaticRoute].nil?).to be true
         end
 
       end

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

@@ -5,6 +5,7 @@ nat_service:
   - enabled: true
     network_id: {{ network_id }}
     rule_type: 'DNAT'
+    decription: 'Example DNAT'
     translated_ip: '10.10.1.2-10.10.1.3'
     translated_port: '3412'
     original_ip: {{ original_ip }}
@@ -13,5 +14,6 @@ nat_service:
   - enabled: true
     network_id: {{ network_id }}
     rule_type: 'SNAT'
+    description: 'Example SNAT'
     translated_ip: {{ original_ip }}
     original_ip: '10.10.1.2-10.10.1.3'

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

@@ -111,7 +111,7 @@ module Vcloud
           end
 
           it 'should default to description being not set' do
-            expect(@rule.key?(:Description)).to be_false
+            expect(@rule.key?(:Description)).to be false
           end
 
           it 'should match our expected complete entry' do

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

@@ -26,6 +26,7 @@ module Vcloud
 
           before(:each) do
             input = { nat_rules: [{
+              description: 'Default Outbound',
               rule_type: 'SNAT',
               network_id: '2ad93597-7b54-43dd-9eb1-631dd337e5a7',
               original_ip: "192.0.2.2",
@@ -43,8 +44,12 @@ module Vcloud
             expect(@rule[:RuleType]).to eq('SNAT')
           end
 
+          it 'should have a Description of Default Outbound' do
+            expect(@rule[:Description]).to eq('Default Outbound')
+          end
+
           it 'should not include a Protocol' do
-            expect(@rule[:GatewayNatRule].key?(:Protocol)).to be_false
+            expect(@rule[:GatewayNatRule].key?(:Protocol)).to be false
           end
 
           it 'should completely match our expected default rule' do
@@ -52,6 +57,7 @@ module Vcloud
               :Id=>"#{@base_nat_id}",
               :IsEnabled=>"true",
               :RuleType=>"SNAT",
+              :Description=>"Default Outbound",
               :GatewayNatRule=>{
                 :Interface=>{
                   :type => 'application/vnd.vmware.admin.network+xml',
@@ -70,6 +76,7 @@ module Vcloud
           before(:each) do
             input = { nat_rules: [{
               rule_type: 'DNAT',
+              description: 'Default Inbound',
               network_id: '2ad93597-7b54-43dd-9eb1-631dd337e5a7',
               original_ip: "192.0.2.2",
               original_port: '22',
@@ -89,6 +96,10 @@ module Vcloud
             expect(@rule[:RuleType]).to eq('DNAT')
           end
 
+          it 'should have a Decription of Default Inbound' do
+            expect(@rule[:Description]).to eq('Default Inbound')
+          end
+
           it 'should include a default Protocol of tcp' do
             expect(@rule[:GatewayNatRule][:Protocol]).to eq('tcp')
           end
@@ -98,6 +109,7 @@ module Vcloud
               :Id=>"#{@base_nat_id}",
               :IsEnabled=>"true",
               :RuleType=>"DNAT",
+              :Description=>"Default Inbound",
               :GatewayNatRule=>{
                 :Interface=>{
                   :type => 'application/vnd.vmware.admin.network+xml',

data/spec/vcloud/edge_gateway/edge_gateway_configuration_spec.rb

@@ -42,7 +42,7 @@ module Vcloud
 
         it "if `config` is called before `update_required` then config is not empty when it shouldn't be" do
           config = @proposed_config.config
-          expect(config.empty?).to be_false
+          expect(config.empty?).to be false
         end
 
       end
@@ -97,10 +97,10 @@ module Vcloud
         it "proposed diff contains changes for all services" do
           diff = @proposed_config.diff
           expect(diff.keys).to eq([:FirewallService, :NatService, :GatewayIpsecVpnService, :LoadBalancerService])
-          expect(diff[:FirewallService]).to        have_at_least(1).items
-          expect(diff[:NatService]).to             have_at_least(1).items
-          expect(diff[:GatewayIpsecVpnService]).to have_at_least(1).items
-          expect(diff[:LoadBalancerService]).to    have_at_least(1).items
+          expect(diff[:FirewallService].size).to        be >= 1
+          expect(diff[:NatService].size).to             be >= 1
+          expect(diff[:GatewayIpsecVpnService].size).to be >= 1
+          expect(diff[:LoadBalancerService].size).to    be >= 1
         end
 
       end
@@ -144,7 +144,7 @@ module Vcloud
         it "proposed diff contains changes for firewall service" do
           diff = @proposed_config.diff
           expect(diff.keys).to eq([:FirewallService])
-          expect(diff[:FirewallService]).to have_at_least(1).items
+          expect(diff[:FirewallService].size).to be >= 1
         end
 
       end
@@ -195,7 +195,7 @@ module Vcloud
         it "proposed diff contains changes for firewall and VPN service" do
           diff = @proposed_config.diff
           expect(diff.keys).to eq([:FirewallService, :GatewayIpsecVpnService])
-          expect(diff[:FirewallService]).to have_at_least(1).items
+          expect(diff[:FirewallService].size).to be >= 1
         end
 
       end
@@ -241,7 +241,7 @@ module Vcloud
         it "proposed diff contains changes for load balancer service" do
           diff = @proposed_config.diff
           expect(diff.keys).to eq([:LoadBalancerService])
-          expect(diff[:LoadBalancerService]).to have_at_least(1).items
+          expect(diff[:LoadBalancerService].size).to be >= 1
         end
 
       end
@@ -288,8 +288,8 @@ module Vcloud
         it "proposed diff contains changes for firewall and load balancer services" do
           diff = @proposed_config.diff
           expect(diff.keys).to eq([:FirewallService, :LoadBalancerService])
-          expect(diff[:FirewallService]).to     have_at_least(1).items
-          expect(diff[:LoadBalancerService]).to have_at_least(1).items
+          expect(diff[:FirewallService].size).to     be >= 1
+          expect(diff[:LoadBalancerService].size).to be >= 1
         end
 
       end
@@ -334,7 +334,7 @@ module Vcloud
         it "proposed diff contains changes for load balancer service" do
           diff = @proposed_config.diff
           expect(diff.keys).to eq([:LoadBalancerService])
-          expect(diff[:LoadBalancerService]).to have_at_least(1).items
+          expect(diff[:LoadBalancerService].size).to be >= 1
         end
 
       end
@@ -479,7 +479,7 @@ module Vcloud
         it "proposed diff contains changes for nat service" do
           diff = @proposed_config.diff
           expect(diff.keys).to eq([:NatService])
-          expect(diff[:NatService]).to have_at_least(1).items
+          expect(diff[:NatService].size).to be >= 1
         end
 
       end
@@ -522,7 +522,7 @@ module Vcloud
         it "proposed diff contains changes for firewall service" do
           diff = @proposed_config.diff
           expect(diff.keys).to eq([:FirewallService])
-          expect(diff[:FirewallService]).to have_at_least(1).items
+          expect(diff[:FirewallService].size).to be >= 1
         end
 
       end
@@ -565,7 +565,7 @@ module Vcloud
         it "proposed diff contains changes for nat service" do
           diff = @proposed_config.diff
           expect(diff.keys).to eq([:NatService])
-          expect(diff[:NatService]).to have_at_least(1).items
+          expect(diff[:NatService].size).to be >= 1
         end
 
       end
@@ -612,7 +612,7 @@ module Vcloud
         it "proposed diff contains changes for load balancer service" do
           diff = @proposed_config.diff
           expect(diff.keys).to eq([:LoadBalancerService])
-          expect(diff[:LoadBalancerService]).to have_at_least(1).items
+          expect(diff[:LoadBalancerService].size).to be >= 1
         end
 
       end
@@ -655,7 +655,7 @@ module Vcloud
         it "proposed diff contains changes for VPN service" do
           diff = @proposed_config.diff
           expect(diff.keys).to eq([:GatewayIpsecVpnService])
-          expect(diff[:GatewayIpsecVpnService]).to have_at_least(1).items
+          expect(diff[:GatewayIpsecVpnService].size).to be >= 1
         end
 
       end

data/spec/vcloud/edge_gateway/firewall_schema_validation_spec.rb

@@ -17,7 +17,7 @@ module Vcloud
 
         }
         validator = Vcloud::Core::ConfigValidator.validate(:base, config, Vcloud::EdgeGateway::Schema::FIREWALL_SERVICE)
-        expect(validator.valid?).to be_false
+        expect(validator.valid?).to be false
         expect(validator.errors).to eq([
                                          "source_ip: 192.0 is not a valid IP address range. Valid values can be IP address, CIDR, IP range, 'Any','internal' and 'external'.",
                                          "destination_ip: 10.10 is not a valid IP address range. Valid values can be IP address, CIDR, IP range, 'Any','internal' and 'external'."
@@ -38,7 +38,7 @@ module Vcloud
 
         }
         validator = Vcloud::Core::ConfigValidator.validate(:base, config, Vcloud::EdgeGateway::Schema::FIREWALL_SERVICE)
-        expect(validator.valid?).to be_true
+        expect(validator.valid?).to be true
       end
     end
   end

data/spec/vcloud/edge_gateway/load_balancer_schema_validation_spec.rb

@@ -56,7 +56,7 @@ module Vcloud
           validator = Vcloud::Core::ConfigValidator.validate(:base, test[:input],
               Vcloud::EdgeGateway::Schema::LOAD_BALANCER_POOL_ENTRY)
           expect(validator.errors).to eq([])
-          expect(validator.valid?).to be_true
+          expect(validator.valid?).to be true
         end
       end
 
@@ -96,7 +96,7 @@ module Vcloud
           validator = Vcloud::Core::ConfigValidator.validate(:base, test[:input],
               Vcloud::EdgeGateway::Schema::LOAD_BALANCER_VIRTUAL_SERVER_ENTRY)
           expect(validator.errors).to eq([])
-          expect(validator.valid?).to be_true
+          expect(validator.valid?).to be true
         end
       end
 
@@ -122,7 +122,7 @@ module Vcloud
         validator = Vcloud::Core::ConfigValidator.validate(:base, input,
           Vcloud::EdgeGateway::Schema::LOAD_BALANCER_VIRTUAL_SERVER_ENTRY)
         expect(validator.errors).to eq([])
-        expect(validator.valid?).to be_true
+        expect(validator.valid?).to be true
       end
 
       it "does not validate a virtual_server entry with a COOKIE http " +
@@ -149,7 +149,7 @@ module Vcloud
           "persistence: missing 'cookie_name' parameter",
           "persistence: missing 'cookie_mode' parameter",
         ])
-        expect(validator.valid?).to be_false
+        expect(validator.valid?).to be false
       end
 
       it "validates a virtual_server entry with a SSL_SESSION_ID https persistence method" do
@@ -172,7 +172,7 @@ module Vcloud
         validator = Vcloud::Core::ConfigValidator.validate(:base, input,
           Vcloud::EdgeGateway::Schema::LOAD_BALANCER_VIRTUAL_SERVER_ENTRY)
         expect(validator.errors).to eq([])
-        expect(validator.valid?).to be_true
+        expect(validator.valid?).to be true
       end
 
       it "validates a virtual_server entry with a tcp service_profile" do
@@ -192,7 +192,7 @@ module Vcloud
         validator = Vcloud::Core::ConfigValidator.validate(:base, input,
           Vcloud::EdgeGateway::Schema::LOAD_BALANCER_VIRTUAL_SERVER_ENTRY)
         expect(validator.errors).to eq([])
-        expect(validator.valid?).to be_true
+        expect(validator.valid?).to be true
       end
 
       it "does not validate a virtual_server tcp service_profile with a persistence section" do
@@ -213,7 +213,7 @@ module Vcloud
         validator = Vcloud::Core::ConfigValidator.validate(:base, input,
           Vcloud::EdgeGateway::Schema::LOAD_BALANCER_VIRTUAL_SERVER_ENTRY)
         expect(validator.errors).to eq(["tcp: parameter 'persistence' is invalid"])
-        expect(validator.valid?).to be_false
+        expect(validator.valid?).to be false
       end
 
     end
@@ -242,7 +242,7 @@ module Vcloud
         }
         validator = Vcloud::Core::ConfigValidator.validate(:base, input, Vcloud::EdgeGateway::Schema::LOAD_BALANCER_SERVICE)
         expect(validator.errors).to eq([])
-        expect(validator.valid?).to be_true
+        expect(validator.valid?).to be true
       end
 
       it "should validate ok if an empty pool service section is provided" do
@@ -262,7 +262,7 @@ module Vcloud
         }
         validator = Vcloud::Core::ConfigValidator.validate(:base, input, Vcloud::EdgeGateway::Schema::LOAD_BALANCER_SERVICE)
         expect(validator.errors).to eq([])
-        expect(validator.valid?).to be_true
+        expect(validator.valid?).to be true
       end
 
       it "should validate ok if an empty virtual_server service_profile section is provided" do
@@ -284,7 +284,7 @@ module Vcloud
         }
         validator = Vcloud::Core::ConfigValidator.validate(:base, input, Vcloud::EdgeGateway::Schema::LOAD_BALANCER_SERVICE)
         expect(validator.errors).to eq([])
-        expect(validator.valid?).to be_true
+        expect(validator.valid?).to be true
       end
 
       it "should be ok if no pools are specified" do
@@ -292,7 +292,7 @@ module Vcloud
           virtual_servers: []
         }
         validator = Vcloud::Core::ConfigValidator.validate(:base, input, Vcloud::EdgeGateway::Schema::LOAD_BALANCER_SERVICE)
-        expect(validator.valid?).to be_true
+        expect(validator.valid?).to be true
       end
 
       it "should be ok if no virtual_servers are specified" do
@@ -300,7 +300,7 @@ module Vcloud
           pools: []
         }
         validator = Vcloud::Core::ConfigValidator.validate(:base, input, Vcloud::EdgeGateway::Schema::LOAD_BALANCER_SERVICE)
-        expect(validator.valid?).to be_true
+        expect(validator.valid?).to be true
       end
 
     end

data/spec/vcloud/edge_gateway/nat_schema_validation_spec.rb

@@ -14,7 +14,7 @@ module Vcloud
 
         }
         validator = Vcloud::Core::ConfigValidator.validate(:base, snat_rule, Vcloud::EdgeGateway::Schema::NAT_RULE)
-        expect(validator.valid?).to be_true
+        expect(validator.valid?).to be true
         expect(validator.errors).to be_empty
 
       end
@@ -34,7 +34,7 @@ module Vcloud
           it "should error since mandatory field #{mandatory_field} is missing" do
             @snat_rule.delete(mandatory_field)
             validator = Vcloud::Core::ConfigValidator.validate(:base, @snat_rule, Vcloud::EdgeGateway::Schema::NAT_RULE)
-            expect(validator.valid?).to be_false
+            expect(validator.valid?).to be false
             expect(validator.errors).to eq(["base: missing '#{mandatory_field}' parameter"])
           end
         end
@@ -53,7 +53,7 @@ module Vcloud
 
         }
         validator = Vcloud::Core::ConfigValidator.validate(:base, snat_rule, Vcloud::EdgeGateway::Schema::NAT_RULE)
-        expect(validator.valid?).to be_true
+        expect(validator.valid?).to be true
         expect(validator.errors).to be_empty
       end
     end
@@ -85,7 +85,7 @@ module Vcloud
           ]
         }
         validator = Vcloud::Core::ConfigValidator.validate(:base, nat_service, Vcloud::EdgeGateway::Schema::NAT_SERVICE)
-        expect(validator.valid?).to be_true
+        expect(validator.valid?).to be true
         expect(validator.errors).to be_empty
       end
     end

data/spec/vcloud/edge_gateway/static_routing_schema_validation_spec.rb

@@ -15,7 +15,7 @@ module Vcloud
           ]
         }
         validator = Vcloud::Core::ConfigValidator.validate(:base, config, Vcloud::EdgeGateway::Schema::STATIC_ROUTING_SERVICE)
-        expect(validator.valid?).to be_false
+        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",
@@ -34,7 +34,7 @@ module Vcloud
           ]
         }
         validator = Vcloud::Core::ConfigValidator.validate(:base, config, Vcloud::EdgeGateway::Schema::STATIC_ROUTING_SERVICE)
-        expect(validator.valid?).to be_true
+        expect(validator.valid?).to be true
       end
     end
   end

data/spec/vcloud/edge_gateway/vpn_schema_validation_spec.rb

@@ -29,7 +29,7 @@ module Vcloud
           }]
         }
         validator = Vcloud::Core::ConfigValidator.validate(:base, vpn_tunnel, Vcloud::EdgeGateway::Schema::VPN_RULE)
-        expect(validator.valid?).to be_true
+        expect(validator.valid?).to be true
         expect(validator.errors).to be_empty
 
       end
@@ -68,7 +68,7 @@ module Vcloud
           it "should error since mandatory field #{mandatory_field} is missing" do
             @vpn_tunnel.delete(mandatory_field)
             validator = Vcloud::Core::ConfigValidator.validate(:base, @vpn_tunnel, Vcloud::EdgeGateway::Schema::VPN_RULE)
-            expect(validator.valid?).to be_false
+            expect(validator.valid?).to be false
             expect(validator.errors).to eq(["base: missing '#{mandatory_field}' parameter"])
           end
         end
@@ -101,7 +101,7 @@ module Vcloud
           description: 'foobarbaz'
          }
         validator = Vcloud::Core::ConfigValidator.validate(:base, vpn_tunnel, Vcloud::EdgeGateway::Schema::VPN_RULE)
-        expect(validator.valid?).to be_true
+        expect(validator.valid?).to be true
         expect(validator.errors).to be_empty
       end
     end

data/vcloud-edge_gateway.gemspec

@@ -19,16 +19,17 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ['lib']
 
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.2.2'
 
-  s.add_runtime_dependency 'vcloud-core', '~> 1.1.0'
+  s.add_runtime_dependency 'vcloud-core', '~> 2.1.0'
   s.add_runtime_dependency 'hashdiff'
   s.add_development_dependency 'pry'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec', '~> 2.14.1'
-  s.add_development_dependency 'rubocop', '~> 0.23.0'
-  s.add_development_dependency 'simplecov', '~> 0.7.1'
+  s.add_development_dependency 'rake', '>= 12'
+  s.add_development_dependency 'rspec', '>= 3.6 '
+  s.add_development_dependency 'rubocop', '~> 0.49.1'
+  s.add_development_dependency 'simplecov', '~> 0.14.1'
   s.add_development_dependency 'gem_publisher', '1.2.0'
-  s.add_development_dependency 'vcloud-tools-tester', '~> 1.0.0'
+  s.add_development_dependency 'nokogiri', '~> 1.6.8.1'
+  s.add_development_dependency 'vcloud-tools-tester', '~> 2.1.0'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vcloud-edge_gateway
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Anna Shipman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-21 00:00:00.000000000 Z
+date: 2017-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vcloud-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: hashdiff
   requirement: !ruby/object:Gem::Requirement
@@ -58,56 +58,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.49.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.49.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.14.1
 - !ruby/object:Gem::Dependency
   name: gem_publisher
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +122,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.8.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.8.1
 - !ruby/object:Gem::Dependency
   name: vcloud-tools-tester
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.1.0
 description: Tool to configure a VMware vCloud Edge Gateway. Uses vcloud-core.
 email:
 - anna.shipman@digital.cabinet-office.gov.uk
@@ -150,6 +164,7 @@ files:
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
+- Jenkinsfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -251,7 +266,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -259,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Tool to configure a VMware vCloud Edge Gateway