vcloud-edge_gateway 0.4.0 → 0.5.0

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

@@ -22,3 +22,7 @@ load_balancer_service:
     service_profiles:
       http:
         port: 8080
+        persistence:
+          method: COOKIE
+          cookie_name: JSESSIONID
+          cookie_mode: APP

data/spec/integration/edge_gateway/edge_gateway_services_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'tempfile'
 
 module Vcloud
-  describe EdgeGatewayServices do
+  describe EdgeGateway::Configure do
 
     before(:all) do
       IntegrationHelper.verify_env_vars
@@ -16,7 +16,7 @@ module Vcloud
       @files_to_delete = []
     end
 
-    context "Test EdgeGatewayServices with multiple services" do
+    context "with multiple services" do
 
       before(:all) do
         reset_edge_gateway
@@ -39,7 +39,7 @@ module Vcloud
         it "should only create one edgeGateway update task when updating the configuration" do
           start_time = Time.now.getutc
           task_list_before_update = get_all_edge_gateway_update_tasks_ordered_by_start_date_since_time(start_time)
-          EdgeGatewayServices.new.update(@initial_config_file, @vars_config_file)
+          EdgeGateway::Configure.new(@initial_config_file, @vars_config_file).update
           task_list_after_update = get_all_edge_gateway_update_tasks_ordered_by_start_date_since_time(start_time)
           expect(task_list_after_update.size - task_list_before_update.size).to be(1)
         end
@@ -55,7 +55,7 @@ module Vcloud
         it "should not update the EdgeGateway again if the config hasn't changed" do
           start_time = Time.now.getutc
           task_list_before_update = get_all_edge_gateway_update_tasks_ordered_by_start_date_since_time(start_time)
-          EdgeGatewayServices.new.update(@initial_config_file, @vars_config_file)
+          EdgeGateway::Configure.new(@initial_config_file, @vars_config_file).update
           task_list_after_update = get_all_edge_gateway_update_tasks_ordered_by_start_date_since_time(start_time)
           expect(task_list_after_update.size - task_list_before_update.size).to be(0)
         end
@@ -63,7 +63,7 @@ module Vcloud
         it "should only create one additional edgeGateway update task when adding the LoadBalancer config" do
           start_time = Time.now.getutc
           task_list_before_update = get_all_edge_gateway_update_tasks_ordered_by_start_date_since_time(start_time)
-          EdgeGatewayServices.new.update(@adding_load_balancer_config_file, @vars_config_file)
+          EdgeGateway::Configure.new(@adding_load_balancer_config_file, @vars_config_file).update
           task_list_after_update = get_all_edge_gateway_update_tasks_ordered_by_start_date_since_time(start_time)
           expect(task_list_after_update.size - task_list_before_update.size).to be(1)
         end
@@ -71,7 +71,7 @@ module Vcloud
         it "should not update the EdgeGateway again if we reapply the 'adding load balancer' config" do
           start_time = Time.now.getutc
           task_list_before_update = get_all_edge_gateway_update_tasks_ordered_by_start_date_since_time(start_time)
-          EdgeGatewayServices.new.update(@adding_load_balancer_config_file, @vars_config_file)
+          EdgeGateway::Configure.new(@adding_load_balancer_config_file, @vars_config_file).update
           task_list_after_update = get_all_edge_gateway_update_tasks_ordered_by_start_date_since_time(start_time)
           expect(task_list_after_update.size - task_list_before_update.size).to be(0)
         end

data/spec/integration/edge_gateway/firewall_service_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'tempfile'
 
 module Vcloud
-  describe EdgeGatewayServices do
+  describe EdgeGateway::Configure do
 
     before(:all) do
       IntegrationHelper.verify_env_vars
@@ -16,7 +16,7 @@ module Vcloud
       @files_to_delete = []
     end
 
-    context "Test FirewallService specifics of EdgeGatewayServices" do
+    context "Test FirewallService specifics" do
 
       before(:all) do
         reset_edge_gateway
@@ -31,7 +31,7 @@ module Vcloud
         before(:all) do
           local_config = Core::ConfigLoader.new.load_config(
             @initial_firewall_config_file,
-            Vcloud::Schema::EDGE_GATEWAY_SERVICES,
+            Vcloud::EdgeGateway::Schema::EDGE_GATEWAY_SERVICES,
             @vars_config_file
           )
           @local_vcloud_config  = EdgeGateway::ConfigurationGenerator::FirewallService.new.generate_fog_config(local_config[:firewall_service])
@@ -44,7 +44,7 @@ module Vcloud
 
         it "should only need to make one call to Core::EdgeGateway.update_configuration" do
           expect_any_instance_of(Core::EdgeGateway).to receive(:update_configuration).exactly(1).times.and_call_original
-          EdgeGatewayServices.new.update(@initial_firewall_config_file, @vars_config_file)
+          EdgeGateway::Configure.new(@initial_firewall_config_file, @vars_config_file).update
         end
 
         it "should have configured at least one firewall rule" do
@@ -59,8 +59,8 @@ module Vcloud
         end
 
         it "and then should not configure the firewall service if updated again with the same configuration (idempotency)" do
-          expect(Vcloud::Core.logger).to receive(:info).with('EdgeGatewayServices.update: Configuration is already up to date. Skipping.')
-          EdgeGatewayServices.new.update(@initial_firewall_config_file, @vars_config_file)
+          expect(Vcloud::Core.logger).to receive(:info).with('EdgeGateway::Configure.update: Configuration is already up to date. Skipping.')
+          EdgeGateway::Configure.new(@initial_firewall_config_file, @vars_config_file).update
         end
 
         it "ConfigurationDiffer should return empty if local and remote firewall configs match" do
@@ -73,7 +73,7 @@ module Vcloud
         it "should highlight a difference if local firewall config has been updated" do
           local_config = Core::ConfigLoader.new.load_config(
             IntegrationHelper.fixture_file('firewall_config_updated_rule.yaml.mustache'),
-            Vcloud::Schema::EDGE_GATEWAY_SERVICES,
+            Vcloud::EdgeGateway::Schema::EDGE_GATEWAY_SERVICES,
             @vars_config_file
           )
           local_firewall_config = EdgeGateway::ConfigurationGenerator::FirewallService.new.generate_fog_config(local_config[:firewall_service])
@@ -132,10 +132,10 @@ module Vcloud
       context "Specific FirewallService update tests" do
 
         it "should have the same rule order as the input rule order" do
-          EdgeGatewayServices.new.update(
+          EdgeGateway::Configure.new(
             IntegrationHelper.fixture_file('firewall_rule_order_test.yaml.mustache'),
             @vars_config_file
-          )
+          ).update
           remote_rules = @edge_gateway.vcloud_attributes[:Configuration][:EdgeGatewayServiceConfiguration][:FirewallService][:FirewallRule]
           remote_descriptions_list = remote_rules.map {|rule| rule[:Description]}
           expect(remote_descriptions_list).

data/spec/integration/edge_gateway/load_balancer_service_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'tempfile'
 
 module Vcloud
-  describe EdgeGatewayServices do
+  describe EdgeGateway::Configure do
 
     before(:all) do
       IntegrationHelper.verify_env_vars
@@ -16,7 +16,7 @@ module Vcloud
       @files_to_delete = []
     end
 
-    context "Test LoadBalancerService specifics of EdgeGatewayServices" do
+    context "Test LoadBalancerService specifics" do
 
       before(:all) do
         reset_edge_gateway
@@ -30,7 +30,7 @@ module Vcloud
         before(:all) do
           local_config = Core::ConfigLoader.new.load_config(
             @initial_load_balancer_config_file,
-            Vcloud::Schema::EDGE_GATEWAY_SERVICES,
+            Vcloud::EdgeGateway::Schema::EDGE_GATEWAY_SERVICES,
             @vars_config_file
           )
           @local_vcloud_config  = EdgeGateway::ConfigurationGenerator::LoadBalancerService.new(
@@ -48,7 +48,7 @@ module Vcloud
         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)
-          EdgeGatewayServices.new.update(@initial_load_balancer_config_file, @vars_config_file)
+          EdgeGateway::Configure.new(@initial_load_balancer_config_file, @vars_config_file).update
           task_list_after_update = get_all_edge_gateway_update_tasks_ordered_by_start_date_since_time(start_time)
           expect(task_list_after_update.size - task_list_before_update.size).to be(1)
         end
@@ -89,8 +89,8 @@ module Vcloud
 
         it "should not then configure the LoadBalancerService if updated again with the same configuration" do
           expect(Vcloud::Core.logger).
-            to receive(:info).with('EdgeGatewayServices.update: Configuration is already up to date. Skipping.')
-          EdgeGatewayServices.new.update(@initial_load_balancer_config_file, @vars_config_file)
+            to receive(:info).with('EdgeGateway::Configure.update: Configuration is already up to date. Skipping.')
+          EdgeGateway::Configure.new(@initial_load_balancer_config_file, @vars_config_file).update
         end
 
       end
@@ -99,7 +99,7 @@ module Vcloud
 
         it "should be able to configure with no pools and virtual_servers" do
           config_file = IntegrationHelper.fixture_file('load_balancer_empty.yaml.mustache')
-          EdgeGatewayServices.new.update(config_file, @vars_config_file)
+          EdgeGateway::Configure.new(config_file, @vars_config_file).update
           edge_config = @edge_gateway.vcloud_attributes[:Configuration]
           remote_vcloud_config = edge_config[:EdgeGatewayServiceConfiguration][:LoadBalancerService]
           expect(remote_vcloud_config[:Pool].size).to be == 0
@@ -108,7 +108,7 @@ module Vcloud
 
         it "should be able to configure with a single Pool and no VirtualServers" do
           config_file = IntegrationHelper.fixture_file('load_balancer_single_pool.yaml.mustache')
-          EdgeGatewayServices.new.update(config_file, @vars_config_file)
+          EdgeGateway::Configure.new(config_file, @vars_config_file).update
           edge_config = @edge_gateway.vcloud_attributes[:Configuration]
           remote_vcloud_config = edge_config[:EdgeGatewayServiceConfiguration][:LoadBalancerService]
           expect(remote_vcloud_config[:Pool].size).to be == 1
@@ -116,13 +116,13 @@ module Vcloud
 
         it "should raise an error when trying configure with a single VirtualServer, and no pool mentioned" do
           config_file = IntegrationHelper.fixture_file('load_balancer_single_virtual_server_missing_pool.yaml.mustache')
-          expect { EdgeGatewayServices.new.update(config_file, @vars_config_file) }.
+          expect { EdgeGateway::Configure.new(config_file, @vars_config_file).update }.
             to raise_error('Supplied configuration does not match supplied schema')
         end
 
         it "should raise an error when trying configure with a single VirtualServer, with an unconfigured pool" do
           config_file = IntegrationHelper.fixture_file('load_balancer_single_virtual_server_invalid_pool.yaml.mustache')
-          expect { EdgeGatewayServices.new.update(config_file, @vars_config_file) }.
+          expect { EdgeGateway::Configure.new(config_file, @vars_config_file).update }.
             to raise_error(
               'Load balancer virtual server integration-test-vs-1 does not have a valid backing pool.'
             )

data/spec/integration/edge_gateway/nat_service_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'tempfile'
 
 module Vcloud
-  describe EdgeGatewayServices do
+  describe EdgeGateway::Configure do
 
     before(:all) do
       IntegrationHelper.verify_env_vars
@@ -16,7 +16,7 @@ module Vcloud
       @files_to_delete = []
     end
 
-    context "Test NatService specifics of EdgeGatewayServices" do
+    context "Test NatService specifics" do
 
       before(:all) do
         reset_edge_gateway
@@ -30,7 +30,7 @@ module Vcloud
         before(:all) do
           local_config = Core::ConfigLoader.new.load_config(
             @initial_nat_config_file,
-            Vcloud::Schema::EDGE_GATEWAY_SERVICES,
+            Vcloud::EdgeGateway::Schema::EDGE_GATEWAY_SERVICES,
             @vars_config_file
           )
           @local_vcloud_config  = EdgeGateway::ConfigurationGenerator::NatService.new(
@@ -47,7 +47,7 @@ module Vcloud
         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)
-          EdgeGatewayServices.new.update(@initial_nat_config_file, @vars_config_file)
+          EdgeGateway::Configure.new(@initial_nat_config_file, @vars_config_file).update
           task_list_after_update = get_all_edge_gateway_update_tasks_ordered_by_start_date_since_time(start_time)
           expect(task_list_after_update.size - task_list_before_update.size).to be(1)
         end
@@ -71,8 +71,8 @@ module Vcloud
         end
 
         it "and then should not configure the firewall service if updated again with the same configuration (idempotency)" do
-          expect(Vcloud::Core.logger).to receive(:info).with('EdgeGatewayServices.update: Configuration is already up to date. Skipping.')
-          EdgeGatewayServices.new.update(@initial_nat_config_file, @vars_config_file)
+          expect(Vcloud::Core.logger).to receive(:info).with('EdgeGateway::Configure.update: Configuration is already up to date. Skipping.')
+          EdgeGateway::Configure.new(@initial_nat_config_file, @vars_config_file).update
         end
 
       end
@@ -118,10 +118,10 @@ module Vcloud
             original_ip: @int_net_ip,
           })
 
-          EdgeGatewayServices.new.update(
+          EdgeGateway::Configure.new(
             IntegrationHelper.fixture_file('hairpin_nat_config.yaml.mustache'),
             vars_file
-          )
+          ).update
 
           edge_gateway = Vcloud::Core::EdgeGateway.get_by_name(@edge_name)
           nat_service = edge_gateway.vcloud_attributes[:Configuration][:EdgeGatewayServiceConfiguration][:NatService]
@@ -148,10 +148,10 @@ module Vcloud
           })
 
           expect {
-            EdgeGatewayServices.new.update(
+            EdgeGateway::Configure.new(
               IntegrationHelper.fixture_file('nat_config.yaml.mustache'),
               vars_file
-            )
+            ).update
           }.to raise_error("unable to find gateway network interface with id #{random_network_id}")
         end
       end

data/spec/vcloud/edge_gateway/configuration_generator/data/load_balancer_http-input.yaml

@@ -11,7 +11,7 @@
           port: 80, #req
           protocol: 'HTTP', #req
           health_check: {
-            port: '80' ,   #req
+            port: '80' ,   #opt, default is ''
             protocol: 'HTTP', #opt, default same as service port protocol, HTTPS => SSL
             health_threshold: '1',  #opt default = 2
             unhealth_threshold: '6', #opt default = 3

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

@@ -24,7 +24,7 @@
           HealthCheckPort: '',
           HealthCheck:
             {
-              Mode: "SSL", Uri: '/', HealthThreshold: '2', UnhealthThreshold: '3', Interval: '5', Timeout: '15'
+              Mode: "SSL", Uri: '', HealthThreshold: '2', UnhealthThreshold: '3', Interval: '5', Timeout: '15'
             }
         },
         {
@@ -35,7 +35,7 @@
           HealthCheckPort: '',
           HealthCheck:
             {
-              Mode: "TCP", Uri: '/', HealthThreshold: '2', UnhealthThreshold: '3', Interval: '5', Timeout: '15'
+              Mode: "TCP", Uri: '', HealthThreshold: '2', UnhealthThreshold: '3', Interval: '5', Timeout: '15'
             }
         }
       ],

data/spec/vcloud/edge_gateway/configuration_generator/data/load_balancer_http-tcp-healthcheck-input.yaml

@@ -0,0 +1,41 @@
+{
+  enabled: 'true', #opt
+  pools: [
+    {
+      name: 'web-app',
+      description: 'web-app',#opt
+      service: {
+        http: {
+          enabled: 'true', #opt, default true
+          algorithm: 'ROUND_ROBIN', #opt default RRB
+          port: 80, #req
+          protocol: 'HTTP', #req
+          health_check: {
+            port: '80' ,   #opt, default is ''
+            protocol: 'TCP', #opt, default same as service port protocol, HTTPS => SSL
+            health_threshold: '1',  #opt default = 2
+            unhealth_threshold: '6', #opt default = 3
+            interval: '20',  #opt default 5 sec
+            timeout: '25' } #optional default 15sec
+        }
+      },
+      members: [{ ip_address: '192.168.254.100', #req
+                  weight: '1', #opt default = 1, NB: 0 == 'disabled',
+                }],
+
+    }
+  ],
+  virtual_servers: [
+    {
+      name: 'router', #req
+      description: 'describe it', #opt
+      ip_address: '192.2.0.55', #req
+      network: '12345678-1234-1234-1234-123456789012', #req
+      pool: 'web-app', #req
+      logging: 'false', #opt, default false
+      service_profiles: {
+        http: { enabled: true, port: '80' }
+      },
+    }
+  ]
+}

data/spec/vcloud/edge_gateway/configuration_generator/data/load_balancer_http-tcp-healthcheck-with-uri-input.yaml

@@ -0,0 +1,42 @@
+{
+  enabled: 'true', #opt
+  pools: [
+    {
+      name: 'web-app',
+      description: 'web-app',#opt
+      service: {
+        http: {
+          enabled: 'true', #opt, default true
+          algorithm: 'ROUND_ROBIN', #opt default RRB
+          port: 80, #req
+          protocol: 'HTTP', #req
+          health_check: {
+            port: '80' ,   #opt, default is ''
+            protocol: 'TCP', #opt, default same as service port protocol, HTTPS => SSL
+            uri: '/notsupported', #opt
+            health_threshold: '1',  #opt default = 2
+            unhealth_threshold: '6', #opt default = 3
+            interval: '20',  #opt default 5 sec
+            timeout: '25' } #optional default 15sec
+        }
+      },
+      members: [{ ip_address: '192.168.254.100', #req
+                  weight: '1', #opt default = 1, NB: 0 == 'disabled',
+                }],
+
+    }
+  ],
+  virtual_servers: [
+    {
+      name: 'router', #req
+      description: 'describe it', #opt
+      ip_address: '192.2.0.55', #req
+      network: '12345678-1234-1234-1234-123456789012', #req
+      pool: 'web-app', #req
+      logging: 'false', #opt, default false
+      service_profiles: {
+        http: { enabled: true, port: '80' }
+      },
+    }
+  ]
+}

data/spec/vcloud/edge_gateway/configuration_generator/data/load_balancer_https-healthcheck-uri-input.yaml

@@ -0,0 +1,42 @@
+{
+  enabled: 'true', #opt
+  pools: [
+    {
+      name: 'test-pool-1',
+      description: 'Our Pool description',
+      service: {
+        https: {
+          algorithm: 'IP_HASH',
+          port: 443,
+          protocol: 'HTTPS',
+          health_check: {
+            uri: '/notsupported',
+          }
+        }
+      },
+      members: [
+        { ip_address: '10.10.10.10', },
+        { ip_address: '10.10.10.11', },
+      ],
+
+    }
+  ],
+  virtual_servers: [
+    {
+      name: 'test-vs-1',
+      description: 'Our VirtualServer description',
+      ip_address: '192.2.0.88',
+      network: '12345678-1234-1234-1234-123456789012',
+      pool: 'test-pool-1',
+      service_profiles: {
+        https: {
+          enabled: true,
+          port: '443',
+          persistence: {
+            method: 'SSL_SESSION_ID'
+          }
+        },
+      },
+    }
+  ]
+}

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

@@ -23,7 +23,7 @@
     :HealthCheckPort: ''
     :HealthCheck:
       :Mode: SSL
-      :Uri: '/'
+      :Uri: ''
       :HealthThreshold: '2'
       :UnhealthThreshold: '3'
       :Interval: '5'
@@ -35,7 +35,7 @@
     :HealthCheckPort: ''
     :HealthCheck:
       :Mode: TCP
-      :Uri: '/'
+      :Uri: ''
       :HealthThreshold: '2'
       :UnhealthThreshold: '3'
       :Interval: '5'