vcloud-edge_gateway 0.4.0 → 0.5.0

data/spec/vcloud/edge_gateway/configuration_generator/data/load_balancer_mixed_complex-output.yaml

@@ -10,7 +10,7 @@
     :HealthCheckPort: '8081'
     :HealthCheck:
       :Mode: TCP
-      :Uri: '/'
+      :Uri: ''
       :HealthThreshold: '2'
       :UnhealthThreshold: '3'
       :Interval: '5'
@@ -22,7 +22,7 @@
     :HealthCheckPort: '443'
     :HealthCheck:
       :Mode: TCP
-      :Uri: '/'
+      :Uri: ''
       :HealthThreshold: '2'
       :UnhealthThreshold: '3'
       :Interval: '5'
@@ -34,7 +34,7 @@
     :HealthCheckPort: ''
     :HealthCheck:
       :Mode: TCP
-      :Uri: '/'
+      :Uri: ''
       :HealthThreshold: '2'
       :UnhealthThreshold: '3'
       :Interval: '5'

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

@@ -141,7 +141,7 @@ module Vcloud
                   :HealthCheckPort=>"",
                   :HealthCheck=>{
                     :Mode=>"SSL",
-                    :Uri=>"/",
+                    :Uri=>"",
                     :HealthThreshold=>"2",
                     :UnhealthThreshold=>"3",
                     :Interval=>"5",
@@ -156,7 +156,7 @@ module Vcloud
                   :HealthCheckPort=>"",
                   :HealthCheck=>{
                     :Mode=>"TCP",
-                    :Uri=>"/",
+                    :Uri=>"",
                     :HealthThreshold=>"2",
                     :UnhealthThreshold=>"3",
                     :Interval=>"5",
@@ -194,6 +194,44 @@ module Vcloud
             expect(generated_config).to eq(expected_output)
           end
 
+          it "should set the healthcheck URI to '/' by default" do
+            input = read_data_file('load_balancer_http-input.yaml')
+            expect(input[:pools][0][:service][:http][:health_check][:protocol]).to eq('HTTP')
+            expect(input[:pools][0][:service][:http][:health_check].key?(:uri)).to be(false)
+
+            generated_config = LoadBalancerService.new(@edge_gw_interface_list).
+              generate_fog_config input
+
+            http_pool_service_port = generated_config[:Pool][0][:ServicePort][0]
+            expect(http_pool_service_port[:IsEnabled]).to eq('true')
+            expect(http_pool_service_port[:HealthCheck][:Mode]).to eq('HTTP')
+            expect(http_pool_service_port[:HealthCheck][:Uri]).to eq('/')
+          end
+
+          it "should set the healthchech URI to '' by default for a TCP healthcheck" do
+            input = read_data_file('load_balancer_http-tcp-healthcheck-input.yaml')
+            expect(input[:pools][0][:service][:http][:health_check][:protocol]).to eq('TCP')
+            expect(input[:pools][0][:service][:http][:health_check].key?(:uri)).to be(false)
+
+            generated_config = LoadBalancerService.new(@edge_gw_interface_list).
+              generate_fog_config input
+
+            http_pool_service_port = generated_config[:Pool][0][:ServicePort][0]
+            expect(http_pool_service_port[:IsEnabled]).to eq('true')
+            expect(http_pool_service_port[:HealthCheck][:Mode]).to eq('TCP')
+            expect(http_pool_service_port[:HealthCheck][:Uri]).to eq('')
+          end
+
+          it 'should raise an exception if I define a healthcheck URI on a TCP healthcheck' do
+            input = read_data_file('load_balancer_http-tcp-healthcheck-with-uri-input.yaml')
+            expect(input[:pools][0][:service][:http][:health_check][:uri]).to eq('/notsupported')
+            expect(input[:pools][0][:service][:http][:health_check][:protocol]).to eq('TCP')
+
+            expect {
+              LoadBalancerService.new(@edge_gw_interface_list).generate_fog_config input
+            }.to raise_error "vCloud Director does not support healthcheck URI on protocols other than HTTP"
+          end
+
         end
 
         context "When configuring HTTPS load balancer" do
@@ -206,12 +244,35 @@ module Vcloud
             expect(generated_config).to eq(expected_output)
           end
 
+          it "should set the healthcheck URI to '' by default" do
+            input = read_data_file('load_balancer_https-input.yaml')
+            expect(input[:pools][0][:service][:https].key?(:health_check)).to be(false)
+
+            generated_config = LoadBalancerService.new(@edge_gw_interface_list).
+              generate_fog_config input
+
+            https_pool_service_port = generated_config[:Pool][0][:ServicePort][1]
+            expect(https_pool_service_port[:IsEnabled]).to eq('true')
+            expect(https_pool_service_port[:HealthCheck][:Mode]).to eq('SSL')
+            expect(https_pool_service_port[:HealthCheck][:Uri]).to eq('')
+          end
+
+          it 'should raise an exception if I define a healthcheck URI on a HTTPS healthcheck' do
+            input = read_data_file('load_balancer_https-healthcheck-uri-input.yaml')
+            expect(input[:pools][0][:service][:https][:health_check][:uri]).to eq('/notsupported')
+            expect(input[:pools][0][:service][:https][:health_check].key?(:protocol)).to be(false)
+
+            expect {
+              LoadBalancerService.new(@edge_gw_interface_list).generate_fog_config input
+            }.to raise_error "vCloud Director does not support healthcheck URI on protocols other than HTTP"
+          end
+
         end
 
         context "When configuring complex mixed protocol load balancer" do
 
           it 'should expand out input config into Fog expected input' do
-            input            = read_data_file('load_balancer_mixed_complex-input.yaml')
+            input = read_data_file('load_balancer_mixed_complex-input.yaml')
             expected_output  = read_data_file('load_balancer_mixed_complex-output.yaml')
             generated_config = LoadBalancerService.new(@edge_gw_interface_list).
               generate_fog_config input

data/spec/vcloud/edge_gateway/edge_gateway_configuration_spec.rb

@@ -659,7 +659,7 @@ module Vcloud
               :HealthCheckPort=>"",
               :HealthCheck=>{
                 :Mode=>"SSL",
-                :Uri=>"/",
+                :Uri=>"",
                 :HealthThreshold=>"2",
                 :UnhealthThreshold=>"3",
                 :Interval=>"5",
@@ -673,7 +673,7 @@ module Vcloud
               :HealthCheckPort=>"",
               :HealthCheck=>{
                 :Mode=>"TCP",
-                :Uri=>"/",
+                :Uri=>"",
                 :HealthThreshold=>"2",
                 :UnhealthThreshold=>"3",
                 :Interval=>"5",
@@ -844,7 +844,7 @@ module Vcloud
               :HealthCheckPort=>"",
               :HealthCheck=>{
                 :Mode=>"SSL",
-                :Uri=>"/",
+                :Uri=>"",
                 :HealthThreshold=>"2",
                 :UnhealthThreshold=>"3",
                 :Interval=>"5",
@@ -858,7 +858,7 @@ module Vcloud
               :HealthCheckPort=>"",
               :HealthCheck=>{
                 :Mode=>"TCP",
-                :Uri=>"/",
+                :Uri=>"",
                 :HealthThreshold=>"2",
                 :UnhealthThreshold=>"3",
                 :Interval=>"5",
@@ -1030,7 +1030,7 @@ module Vcloud
               :HealthCheckPort=>"",
               :HealthCheck=>{
                 :Mode=>"SSL",
-                :Uri=>"/",
+                :Uri=>"",
                 :HealthThreshold=>"2",
                 :UnhealthThreshold=>"3",
                 :Interval=>"5",
@@ -1044,7 +1044,7 @@ module Vcloud
               :HealthCheckPort=>"",
               :HealthCheck=>{
                 :Mode=>"TCP",
-                :Uri=>"/",
+                :Uri=>"",
                 :HealthThreshold=>"2",
                 :UnhealthThreshold=>"3",
                 :Interval=>"5",

data/spec/vcloud/edge_gateway/firewall_schema_validation_spec.rb

@@ -16,7 +16,7 @@ module Vcloud
           ]
 
         }
-        validator = Vcloud::Core::ConfigValidator.validate(:base, config, Schema::FIREWALL_SERVICE)
+        validator = Vcloud::Core::ConfigValidator.validate(:base, config, Vcloud::EdgeGateway::Schema::FIREWALL_SERVICE)
         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'.",
@@ -37,7 +37,7 @@ module Vcloud
           ]
 
         }
-        validator = Vcloud::Core::ConfigValidator.validate(:base, config, Schema::FIREWALL_SERVICE)
+        validator = Vcloud::Core::ConfigValidator.validate(:base, config, Vcloud::EdgeGateway::Schema::FIREWALL_SERVICE)
         expect(validator.valid?).to be_true
       end
     end

data/spec/vcloud/edge_gateway/load_balancer_schema_validation_spec.rb

@@ -54,7 +54,7 @@ module Vcloud
       valid_tests.each do |test|
         it "#{test[:name]}" do
           validator = Vcloud::Core::ConfigValidator.validate(:base, test[:input],
-              Vcloud::Schema::LOAD_BALANCER_POOL_ENTRY)
+              Vcloud::EdgeGateway::Schema::LOAD_BALANCER_POOL_ENTRY)
           expect(validator.errors).to eq([])
           expect(validator.valid?).to be_true
         end
@@ -94,12 +94,128 @@ module Vcloud
       valid_tests.each do |test|
         it "#{test[:name]}" do
           validator = Vcloud::Core::ConfigValidator.validate(:base, test[:input],
-              Vcloud::Schema::LOAD_BALANCER_VIRTUAL_SERVER_ENTRY)
+              Vcloud::EdgeGateway::Schema::LOAD_BALANCER_VIRTUAL_SERVER_ENTRY)
           expect(validator.errors).to eq([])
           expect(validator.valid?).to be_true
         end
       end
 
+      it "validates a virtual_server entry with a COOKIE http persistence method" do
+        input = {
+          name: 'virtual server with COOKIE persistence',
+          ip_address: "192.2.0.40",
+          network: "TestNetwork",
+          pool: "TestPool",
+          logging: true,
+          service_profiles: {
+             http: {
+               enabled: true,
+               port: 8080,
+               persistence: {
+                 method: 'COOKIE',
+                 cookie_name: 'JSESSIONID',
+                 cookie_mode: 'APP',
+               },
+             },
+          }
+        }
+        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
+      end
+
+      it "does not validate a virtual_server entry with a COOKIE http " +
+           "persistence method, when no cookie_name or cookie_mode is specified" do
+        input = {
+          name: 'virtual server with COOKIE persistence',
+          ip_address: "192.2.0.40",
+          network: "TestNetwork",
+          pool: "TestPool",
+          logging: true,
+          service_profiles: {
+             http: {
+               enabled: true,
+               port: 8080,
+               persistence: {
+                 method: 'COOKIE',
+               },
+             },
+          }
+        }
+        validator = Vcloud::Core::ConfigValidator.validate(:base, input,
+          Vcloud::EdgeGateway::Schema::LOAD_BALANCER_VIRTUAL_SERVER_ENTRY)
+        expect(validator.errors).to eq([
+          "persistence: missing 'cookie_name' parameter",
+          "persistence: missing 'cookie_mode' parameter",
+        ])
+        expect(validator.valid?).to be_false
+      end
+
+      it "validates a virtual_server entry with a SSL_SESSION_ID https persistence method" do
+        input = {
+          name: 'virtual server with SSL_SESSION_ID persistence',
+          ip_address: "192.2.0.40",
+          network: "TestNetwork",
+          pool: "TestPool",
+          logging: true,
+          service_profiles: {
+             https: {
+               enabled: true,
+               port: 8080,
+               persistence: {
+                 method: 'SSL_SESSION_ID',
+               },
+             },
+          }
+        }
+        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
+      end
+
+      it "validates a virtual_server entry with a tcp service_profile" do
+        input = {
+          name: 'virtual server with tcp service_profile',
+          ip_address: "192.2.0.40",
+          network: "TestNetwork",
+          pool: "TestPool",
+          logging: true,
+          service_profiles: {
+             tcp: {
+               enabled: true,
+               port: 7777,
+             },
+          }
+        }
+        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
+      end
+
+      it "does not validate a virtual_server tcp service_profile with a persistence section" do
+        input = {
+          name: 'BOGUS virtual server with tcp service profile persistence section',
+          ip_address: "192.2.0.40",
+          network: "TestNetwork",
+          pool: "TestPool",
+          logging: true,
+          service_profiles: {
+             tcp: {
+               enabled: true,
+               port: 7777,
+               persistence: {},
+             },
+          }
+        }
+        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
+      end
+
     end
 
     context "check complete load balancer sections" do
@@ -124,7 +240,7 @@ module Vcloud
             },
           ],
         }
-        validator = Vcloud::Core::ConfigValidator.validate(:base, input, Vcloud::Schema::LOAD_BALANCER_SERVICE)
+        validator = Vcloud::Core::ConfigValidator.validate(:base, input, Vcloud::EdgeGateway::Schema::LOAD_BALANCER_SERVICE)
         expect(validator.errors).to eq([])
         expect(validator.valid?).to be_true
       end
@@ -144,7 +260,7 @@ module Vcloud
             },
           ],
         }
-        validator = Vcloud::Core::ConfigValidator.validate(:base, input, Vcloud::Schema::LOAD_BALANCER_SERVICE)
+        validator = Vcloud::Core::ConfigValidator.validate(:base, input, Vcloud::EdgeGateway::Schema::LOAD_BALANCER_SERVICE)
         expect(validator.errors).to eq([])
         expect(validator.valid?).to be_true
       end
@@ -166,7 +282,7 @@ module Vcloud
             },
           ],
         }
-        validator = Vcloud::Core::ConfigValidator.validate(:base, input, Vcloud::Schema::LOAD_BALANCER_SERVICE)
+        validator = Vcloud::Core::ConfigValidator.validate(:base, input, Vcloud::EdgeGateway::Schema::LOAD_BALANCER_SERVICE)
         expect(validator.errors).to eq([])
         expect(validator.valid?).to be_true
       end
@@ -175,7 +291,7 @@ module Vcloud
         input = {
           virtual_servers: []
         }
-        validator = Vcloud::Core::ConfigValidator.validate(:base, input, Vcloud::Schema::LOAD_BALANCER_SERVICE)
+        validator = Vcloud::Core::ConfigValidator.validate(:base, input, Vcloud::EdgeGateway::Schema::LOAD_BALANCER_SERVICE)
         expect(validator.valid?).to be_true
       end
 
@@ -183,7 +299,7 @@ module Vcloud
         input = {
           pools: []
         }
-        validator = Vcloud::Core::ConfigValidator.validate(:base, input, Vcloud::Schema::LOAD_BALANCER_SERVICE)
+        validator = Vcloud::Core::ConfigValidator.validate(:base, input, Vcloud::EdgeGateway::Schema::LOAD_BALANCER_SERVICE)
         expect(validator.valid?).to be_true
       end
 

data/spec/vcloud/edge_gateway/nat_schema_validation_spec.rb

@@ -13,7 +13,7 @@ module Vcloud
           translated_ip: "10.10.20.20",
 
         }
-        validator = Vcloud::Core::ConfigValidator.validate(:base, snat_rule, Vcloud::Schema::NAT_RULE)
+        validator = Vcloud::Core::ConfigValidator.validate(:base, snat_rule, Vcloud::EdgeGateway::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 = Vcloud::Core::ConfigValidator.validate(:base, @snat_rule, Vcloud::Schema::NAT_RULE)
+            validator = Vcloud::Core::ConfigValidator.validate(:base, @snat_rule, Vcloud::EdgeGateway::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 = Vcloud::Core::ConfigValidator.validate(:base, snat_rule, Vcloud::Schema::NAT_RULE)
+        validator = Vcloud::Core::ConfigValidator.validate(:base, snat_rule, Vcloud::EdgeGateway::Schema::NAT_RULE)
         expect(validator.valid?).to be_true
         expect(validator.errors).to be_empty
       end
@@ -84,7 +84,7 @@ module Vcloud
             }
           ]
         }
-        validator = Vcloud::Core::ConfigValidator.validate(:base, nat_service, Vcloud::Schema::NAT_SERVICE)
+        validator = Vcloud::Core::ConfigValidator.validate(:base, nat_service, Vcloud::EdgeGateway::Schema::NAT_SERVICE)
         expect(validator.valid?).to be_true
         expect(validator.errors).to be_empty
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcloud-edge_gateway
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -169,16 +169,16 @@ 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/configure.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/schema/edge_gateway.rb
+- 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/version.rb
-- lib/vcloud/edge_gateway_services.rb
-- lib/vcloud/schema/edge_gateway.rb
-- lib/vcloud/schema/firewall_service.rb
-- lib/vcloud/schema/load_balancer_service.rb
-- lib/vcloud/schema/nat_service.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
@@ -198,15 +198,13 @@ files:
 - spec/integration/edge_gateway/nat_service_spec.rb
 - spec/spec_helper.rb
 - spec/support/integration_helper.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
+- spec/vcloud/edge_gateway/configuration_generator/data/load_balancer_http-tcp-healthcheck-input.yaml
+- spec/vcloud/edge_gateway/configuration_generator/data/load_balancer_http-tcp-healthcheck-with-uri-input.yaml
+- spec/vcloud/edge_gateway/configuration_generator/data/load_balancer_https-healthcheck-uri-input.yaml
 - spec/vcloud/edge_gateway/configuration_generator/data/load_balancer_https-input.yaml
 - spec/vcloud/edge_gateway/configuration_generator/data/load_balancer_https-output.yaml
 - spec/vcloud/edge_gateway/configuration_generator/data/load_balancer_mixed_complex-input.yaml
@@ -244,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2640084330965865907
+      hash: -1385962529695170701
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -271,15 +269,13 @@ test_files:
 - spec/integration/edge_gateway/nat_service_spec.rb
 - spec/spec_helper.rb
 - spec/support/integration_helper.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
+- spec/vcloud/edge_gateway/configuration_generator/data/load_balancer_http-tcp-healthcheck-input.yaml
+- spec/vcloud/edge_gateway/configuration_generator/data/load_balancer_http-tcp-healthcheck-with-uri-input.yaml
+- spec/vcloud/edge_gateway/configuration_generator/data/load_balancer_https-healthcheck-uri-input.yaml
 - spec/vcloud/edge_gateway/configuration_generator/data/load_balancer_https-input.yaml
 - spec/vcloud/edge_gateway/configuration_generator/data/load_balancer_https-output.yaml
 - spec/vcloud/edge_gateway/configuration_generator/data/load_balancer_mixed_complex-input.yaml