vcloud-edge_gateway 0.2.2 → 0.2.3

data/spec/vcloud/edge_gateway/load_balancer_schema_validation_spec.rb

@@ -53,7 +53,7 @@ module Vcloud
 
       valid_tests.each do |test|
         it "#{test[:name]}" do
-          validator = ConfigValidator.validate(:base, test[:input],
+          validator = Vcloud::Core::ConfigValidator.validate(:base, test[:input],
               Vcloud::Schema::LOAD_BALANCER_POOL_ENTRY)
           expect(validator.errors).to eq([])
           expect(validator.valid?).to be_true
@@ -93,7 +93,7 @@ module Vcloud
 
       valid_tests.each do |test|
         it "#{test[:name]}" do
-          validator = ConfigValidator.validate(:base, test[:input],
+          validator = Vcloud::Core::ConfigValidator.validate(:base, test[:input],
               Vcloud::Schema::LOAD_BALANCER_VIRTUAL_SERVER_ENTRY)
           expect(validator.errors).to eq([])
           expect(validator.valid?).to be_true
@@ -124,7 +124,7 @@ module Vcloud
             },
           ],
         }
-        validator = ConfigValidator.validate(:base, input, Vcloud::Schema::LOAD_BALANCER_SERVICE)
+        validator = Vcloud::Core::ConfigValidator.validate(:base, input, Vcloud::Schema::LOAD_BALANCER_SERVICE)
         expect(validator.errors).to eq([])
         expect(validator.valid?).to be_true
       end
@@ -144,7 +144,7 @@ module Vcloud
             },
           ],
         }
-        validator = ConfigValidator.validate(:base, input, Vcloud::Schema::LOAD_BALANCER_SERVICE)
+        validator = Vcloud::Core::ConfigValidator.validate(:base, input, Vcloud::Schema::LOAD_BALANCER_SERVICE)
         expect(validator.errors).to eq([])
         expect(validator.valid?).to be_true
       end
@@ -166,7 +166,7 @@ module Vcloud
             },
           ],
         }
-        validator = ConfigValidator.validate(:base, input, Vcloud::Schema::LOAD_BALANCER_SERVICE)
+        validator = Vcloud::Core::ConfigValidator.validate(:base, input, Vcloud::Schema::LOAD_BALANCER_SERVICE)
         expect(validator.errors).to eq([])
         expect(validator.valid?).to be_true
       end
@@ -175,7 +175,7 @@ module Vcloud
         input = {
           virtual_servers: []
         }
-        validator = ConfigValidator.validate(:base, input, Vcloud::Schema::LOAD_BALANCER_SERVICE)
+        validator = Vcloud::Core::ConfigValidator.validate(:base, input, Vcloud::Schema::LOAD_BALANCER_SERVICE)
         expect(validator.valid?).to be_true
       end
 
@@ -183,7 +183,7 @@ module Vcloud
         input = {
           pools: []
         }
-        validator = ConfigValidator.validate(:base, input, Vcloud::Schema::LOAD_BALANCER_SERVICE)
+        validator = Vcloud::Core::ConfigValidator.validate(:base, input, Vcloud::Schema::LOAD_BALANCER_SERVICE)
         expect(validator.valid?).to be_true
       end
 

data/spec/vcloud/edge_gateway/nat_configuration_differ_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+require_relative 'configuration_differ_shared_examples.rb'
+
+module Vcloud
+  module EdgeGateway
+    describe NatConfigurationDiffer do
+
+      it_behaves_like "a configuration differ" do
+        let(:config_differ) { NatConfigurationDiffer }
+      end
+
+      it 'should ignore Id parameters in NatRule sections, when showing additions' do
+        local = { NatRule: [
+          { Id: '65539', deeper: [ 1, 2, 3, 4, 5 ] },
+          { Id: '65540', deeper: [ 5, 6, 4, 3, 2 ] },
+        ]}
+        remote = { NatRule: [
+          { Id: '65539', deeper: [ 1, 1, 1, 1, 1 ] },
+          { Id: '65540', deeper: [ 1, 2, 3, 4, 5 ] },
+          { Id: '65541', deeper: [ 5, 6, 4, 3, 2 ] },
+        ]}
+        output = [
+          ["+", "NatRule[0]", {:deeper=>[1, 1, 1, 1, 1]}]
+        ]
+        differ = NatConfigurationDiffer.new(local, remote)
+        expect(differ.diff).to eq(output)
+      end
+
+      it 'should still highlight a reordering despite ignoring Id' do
+        local = { NatRule: [
+          { Id: '65538', deeper: [ 1, 1, 1, 1, 1 ] },
+          { Id: '65539', deeper: [ 1, 2, 3, 4, 5 ] },
+          { Id: '65540', deeper: [ 5, 6, 4, 3, 2 ] },
+        ]}
+        remote = { NatRule: [
+          { Id: '65538', deeper: [ 1, 2, 3, 4, 5 ] },
+          { Id: '65539', deeper: [ 5, 6, 4, 3, 2 ] },
+          { Id: '65540', deeper: [ 1, 1, 1, 1, 1 ] },
+        ]}
+        output = [
+          ["-", "NatRule[0]", {:deeper=>[1, 1, 1, 1, 1]}],
+          ["+", "NatRule[2]", {:deeper=>[1, 1, 1, 1, 1]}],
+        ]
+        differ = NatConfigurationDiffer.new(local, remote)
+        expect(differ.diff).to eq(output)
+      end
+
+      it 'should not ignore Id parameter outside of a NatRule (just in case)' do
+        local = {
+          NatRule: [ { Id: '65538', deeper: [ 1, 1, 1, 1, 1 ] } ],
+          Id: 'outside of NAT rule'
+        }
+        remote = {
+          NatRule: [ { Id: '65538', deeper: [ 1, 1, 1, 1, 1 ] } ],
+        }
+        output =  [
+          ["-", "Id", 'outside of NAT rule']
+        ]
+        differ = NatConfigurationDiffer.new(local, remote)
+        expect(differ.diff).to eq(output)
+      end
+
+    end
+  end
+end

data/spec/vcloud/edge_gateway/nat_schema_validation_spec.rb

@@ -13,7 +13,7 @@ module Vcloud
           translated_ip: "10.10.20.20",
 
         }
-        validator = ConfigValidator.validate(:base, snat_rule, Vcloud::Schema::NAT_RULE)
+        validator = Vcloud::Core::ConfigValidator.validate(:base, snat_rule, Vcloud::Schema::NAT_RULE)
         expect(validator.valid?).to be_true
         expect(validator.errors).to be_empty
 
@@ -33,7 +33,7 @@ module Vcloud
         mandatory_fields.each do |mandatory_field|
           it "should error since mandatory field #{mandatory_field} is missing" do
             @snat_rule.delete(mandatory_field)
-            validator = ConfigValidator.validate(:base, @snat_rule, Vcloud::Schema::NAT_RULE)
+            validator = Vcloud::Core::ConfigValidator.validate(:base, @snat_rule, Vcloud::Schema::NAT_RULE)
             expect(validator.valid?).to be_false
             expect(validator.errors).to eq(["base: missing '#{mandatory_field}' parameter"])
           end
@@ -52,7 +52,7 @@ module Vcloud
           protocol: 'tcp'
 
         }
-        validator = ConfigValidator.validate(:base, snat_rule, Vcloud::Schema::NAT_RULE)
+        validator = Vcloud::Core::ConfigValidator.validate(:base, snat_rule, Vcloud::Schema::NAT_RULE)
         expect(validator.valid?).to be_true
         expect(validator.errors).to be_empty
       end
@@ -84,7 +84,7 @@ module Vcloud
             }
           ]
         }
-        validator = ConfigValidator.validate(:base, nat_service, Vcloud::Schema::NAT_SERVICE)
+        validator = Vcloud::Core::ConfigValidator.validate(:base, nat_service, Vcloud::Schema::NAT_SERVICE)
         expect(validator.valid?).to be_true
         expect(validator.errors).to be_empty
       end

data/vcloud-edge_gateway.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9.2'
 
-  s.add_runtime_dependency 'fog', '>= 1.19.0'
-  s.add_runtime_dependency 'vcloud-core', '>= 0.0.6'
+  s.add_runtime_dependency 'fog', '>= 1.21.0'
+  s.add_runtime_dependency 'vcloud-core', '>= 0.0.12'
   s.add_runtime_dependency 'hashdiff'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 2.14.1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcloud-edge_gateway
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.21.0
 - !ruby/object:Gem::Dependency
   name: vcloud-core
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.12
 - !ruby/object:Gem::Dependency
   name: hashdiff
   requirement: !ruby/object:Gem::Requirement
@@ -138,10 +138,11 @@ files:
 - README.md
 - Rakefile
 - bin/vcloud-configure-edge
+- examples/firewall-rules.yaml
+- examples/loadbalancer-rules.yaml
+- examples/nat-rules.yaml
 - jenkins.sh
 - jenkins_integration_tests.sh
-- lib/vcloud/config_loader.rb
-- lib/vcloud/config_validator.rb
 - lib/vcloud/edge_gateway.rb
 - lib/vcloud/edge_gateway/configuration_differ.rb
 - lib/vcloud/edge_gateway/configuration_generator/firewall_service.rb
@@ -149,7 +150,9 @@ files:
 - lib/vcloud/edge_gateway/configuration_generator/load_balancer_service.rb
 - lib/vcloud/edge_gateway/configuration_generator/nat_service.rb
 - lib/vcloud/edge_gateway/edge_gateway_configuration.rb
+- lib/vcloud/edge_gateway/firewall_configuration_differ.rb
 - lib/vcloud/edge_gateway/load_balancer_configuration_differ.rb
+- lib/vcloud/edge_gateway/nat_configuration_differ.rb
 - lib/vcloud/edge_gateway/version.rb
 - lib/vcloud/edge_gateway_services.rb
 - lib/vcloud/schema/edge_gateway.rb
@@ -176,13 +179,12 @@ files:
 - spec/integration/edge_gateway/load_balancer_service_spec.rb
 - spec/integration/edge_gateway/nat_service_spec.rb
 - spec/spec_helper.rb
-- spec/vcloud/config_loader_spec.rb
-- spec/vcloud/config_validator_spec.rb
 - spec/vcloud/data/basic_preamble_test.erb
 - spec/vcloud/data/basic_preamble_test.erb.OUT
 - spec/vcloud/data/working.json
 - spec/vcloud/data/working.yaml
 - spec/vcloud/data/working_with_defaults.yaml
+- spec/vcloud/edge_gateway/configuration_differ_shared_examples.rb
 - spec/vcloud/edge_gateway/configuration_differ_spec.rb
 - spec/vcloud/edge_gateway/configuration_generator/data/load_balancer_http-input.yaml
 - spec/vcloud/edge_gateway/configuration_generator/data/load_balancer_http-output.yaml
@@ -194,9 +196,11 @@ files:
 - 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/edge_gateway_configuration_spec.rb
+- spec/vcloud/edge_gateway/firewall_configuration_differ_spec.rb
 - spec/vcloud/edge_gateway/firewall_schema_validation_spec.rb
 - spec/vcloud/edge_gateway/load_balancer_configuration_differ_spec.rb
 - 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
 - vcloud-edge_gateway.gemspec
 homepage: http://github.com/alphagov/vcloud-edge_gateway
@@ -220,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4166614673467124064
+      hash: -981764383968782471
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -247,13 +251,12 @@ test_files:
 - spec/integration/edge_gateway/load_balancer_service_spec.rb
 - spec/integration/edge_gateway/nat_service_spec.rb
 - spec/spec_helper.rb
-- spec/vcloud/config_loader_spec.rb
-- spec/vcloud/config_validator_spec.rb
 - spec/vcloud/data/basic_preamble_test.erb
 - spec/vcloud/data/basic_preamble_test.erb.OUT
 - spec/vcloud/data/working.json
 - spec/vcloud/data/working.yaml
 - spec/vcloud/data/working_with_defaults.yaml
+- spec/vcloud/edge_gateway/configuration_differ_shared_examples.rb
 - spec/vcloud/edge_gateway/configuration_differ_spec.rb
 - spec/vcloud/edge_gateway/configuration_generator/data/load_balancer_http-input.yaml
 - spec/vcloud/edge_gateway/configuration_generator/data/load_balancer_http-output.yaml
@@ -265,7 +268,9 @@ test_files:
 - 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/edge_gateway_configuration_spec.rb
+- spec/vcloud/edge_gateway/firewall_configuration_differ_spec.rb
 - spec/vcloud/edge_gateway/firewall_schema_validation_spec.rb
 - spec/vcloud/edge_gateway/load_balancer_configuration_differ_spec.rb
 - 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

data/lib/vcloud/config_loader.rb

@@ -1,27 +0,0 @@
-require 'yaml'
-require 'json'
-
-module Vcloud
-  class ConfigLoader
-
-    def load_config(config_file, schema = nil)
-      input_config = YAML::load(File.open(config_file))
-
-      # There is no way in YAML or Ruby to symbolize keys in a hash
-      json_string = JSON.generate(input_config)
-      config = JSON.parse(json_string, :symbolize_names => true)
-
-      if schema
-        validation = ConfigValidator.validate(:base, config, schema)
-        unless validation.valid?
-          validation.errors.each do |error|
-            Vcloud::EdgeGateway.logger.fatal(error)
-          end
-          raise("Supplied configuration does not match supplied schema")
-        end
-      end
-      config
-    end
-
-  end 
-end

data/lib/vcloud/config_validator.rb

@@ -1,207 +0,0 @@
-require 'ipaddr'
-
-module Vcloud
-  class ConfigValidator
-
-    attr_reader :key, :data, :schema, :type, :errors
-
-    VALID_ALPHABETICAL_VALUES_FOR_IP_RANGE = %w(Any external internal)
-
-    def initialize(key, data, schema)
-      raise "Nil schema" unless schema
-      raise "Invalid schema" unless schema.key?(:type)
-      @type = schema[:type].to_s.downcase
-      @errors = []
-      @data   = data
-      @schema = schema
-      @key    = key
-      validate
-    end
-
-    def valid?
-      @errors.empty?
-    end
-
-    def self.validate(key, data, schema)
-      new(key, data, schema)
-    end
-
-    private
-
-    def validate
-      self.send("validate_#{type}".to_sym)
-    end
-
-    def validate_string
-      unless @data.is_a? String
-        errors << "#{key}: #{@data} is not a string"
-        return
-      end
-      return unless check_emptyness_ok
-      return unless check_matcher_matches
-    end
-
-    def validate_string_or_number
-      unless data.is_a?(String) || data.is_a?(Numeric)
-        @errors << "#{key}: #{@data} is not a string_or_number"
-        return
-      end
-    end
-
-    def validate_ip_address
-      unless data.is_a?(String)
-        @errors << "#{key}: #{@data} is not a valid ip_address"
-        return
-      end
-      @errors << "#{key}: #{@data} is not a valid ip_address" unless valid_ip_address?(data)
-    end
-
-    def validate_ip_address_range
-      unless data.is_a?(String)
-        @errors << "#{key}: #{@data} is not a valid IP address range. Valid values can be IP address, CIDR, IP range, 'Any','internal' and 'external'."
-        return
-      end
-      valid = valid_cidr_or_ip_address? || valid_alphabetical_ip_range? || valid_ip_range?
-      @errors << "#{key}: #{@data} is not a valid IP address range. Valid values can be IP address, CIDR, IP range, 'Any','internal' and 'external'." unless valid
-    end
-
-    def valid_cidr_or_ip_address?
-      begin
-        ip = IPAddr.new(data)
-        ip.ipv4?
-      rescue ArgumentError
-        false
-      end
-    end
-
-    def valid_alphabetical_ip_range?
-      VALID_ALPHABETICAL_VALUES_FOR_IP_RANGE.include?(data)
-    end
-
-    def valid_ip_address? ip_address
-      begin
-        #valid formats recognized by IPAddr are : “address”, “address/prefixlen” and “address/mask”.
-        # Attribute like member_ip in case of load-balancer is an "address"
-        # and we should not accept “address/prefixlen” and “address/mask” for such fields.
-        ip = IPAddr.new(ip_address)
-        ip.ipv4? && !ip_address.include?('/')
-      rescue ArgumentError
-        false
-      end
-    end
-
-    def valid_ip_range?
-      range_parts = data.split('-')
-      return false if range_parts.size != 2
-      start_address = range_parts.first
-      end_address = range_parts.last
-      valid_ip_address?(start_address) &&  valid_ip_address?(end_address) &&
-        valid_start_and_end_address_combination?(end_address, start_address)
-    end
-
-    def valid_start_and_end_address_combination?(end_address, start_address)
-      IPAddr.new(start_address) < IPAddr.new(end_address)
-    end
-
-    def validate_hash
-      unless data.is_a? Hash
-        @errors << "#{key}: is not a hash"
-        return
-      end
-      return unless check_emptyness_ok
-      check_for_unknown_parameters
-      if schema.key?(:internals)
-        internals = schema[:internals]
-        internals.each do |param_key,param_schema|
-          check_hash_parameter(param_key, param_schema)
-        end
-      end
-    end
-
-    def validate_array
-      unless data.is_a? Array
-        @errors << "#{key} is not an array"
-        return
-      end
-      return unless check_emptyness_ok
-      if schema.key?(:each_element_is)
-        element_schema = schema[:each_element_is]
-        data.each do |element|
-          sub_validator = ConfigValidator.validate(key, element, element_schema)
-          unless sub_validator.valid?
-            @errors = errors + sub_validator.errors
-          end
-        end
-      end
-    end
-
-    def validate_enum
-      unless (acceptable_values = schema[:acceptable_values]) && acceptable_values.is_a?(Array)
-        raise "Must set :acceptable_values for type 'enum'"
-      end
-      unless acceptable_values.include?(data)
-        acceptable_values_string = acceptable_values.collect {|v| "'#{v}'" }.join(', ')
-        @errors << "#{key}: #{@data} is not a valid value. Acceptable values are #{acceptable_values_string}."
-      end
-    end
-
-    def validate_boolean
-      unless [true, false].include?(data)
-        @errors << "#{key}: #{data} is not a valid boolean value."
-      end
-    end
-
-    def check_emptyness_ok
-      unless schema.key?(:allowed_empty) && schema[:allowed_empty]
-        if data.empty?
-          @errors << "#{key}: cannot be empty #{type}"
-          return false
-        end
-      end
-      true
-    end
-
-    def check_matcher_matches
-      return unless regex = schema[:matcher]
-      raise "#{key}: #{regex} is not a Regexp" unless regex.is_a? Regexp
-      unless data =~ regex
-        @errors << "#{key}: #{data} does not match"
-        return false
-      end
-      true
-    end
-
-    def check_hash_parameter(sub_key, sub_schema)
-      if sub_schema.key?(:required) && sub_schema[:required] == false
-        # short circuit out if we do not have the key, but it's not required.
-        return true unless data.key?(sub_key)
-      end
-      unless data.key?(sub_key)
-        @errors << "#{key}: missing '#{sub_key}' parameter"
-        return false
-      end
-      sub_validator = ConfigValidator.validate(
-        sub_key,
-        data[sub_key],
-        sub_schema
-      )
-      unless sub_validator.valid?
-        @errors = errors + sub_validator.errors
-      end
-    end
-
-    def check_for_unknown_parameters
-      unless internals = schema[:internals]
-        # if there are no parameters specified, then assume all are ok.
-        return true
-      end
-      if schema[:permit_unknown_parameters]
-        return true
-      end
-      data.keys.each do |k|
-        @errors << "#{key}: parameter '#{k}' is invalid" unless internals[k]
-      end
-    end
-
-  end
-end