vcloud-edge_gateway 0.2.1 → 0.2.2

data/CHANGELOG.md

@@ -1,8 +1,14 @@
+## 0.2.2 (2014-03-05)
+
+Bugfixes:
+
+  - Default healthcheck URI is now '/'. Previous default caused incorrect 'OPTIONS *' query [#66941992]
+
 ## 0.2.1 (2014-02-27)
 
 Bugfixes:
 
-  - [#66591522] Firewall rules with 'protocol: any' broken
+  - Now handles firewall rules with 'protocol: any' correctly [#66591522]
 
 ## 0.2.0 (2014-02-21)
 

data/README.md

@@ -1,6 +1,9 @@
 # vCloud Edge Gateway
 
-vCloud Edge Gateway is a tool that supports automated provisiong of a VMware vCloud Edge Gateway. It depends on [vCloud Core](https://github.com/alphagov/vcloud-core) and uses Fog under the hood.
+vCloud Edge Gateway is a CLI tool and Ruby library that supports automated
+provisiong of a VMware vCloud Director Edge Gateway appliance. It depends on
+[vCloud Core](https://rubygems.org/gems/vcloud-core) and uses
+[Fog](http://fog.io) under the hood.
 
 ## Installation
 
@@ -22,6 +25,7 @@ To configure an Edge Gateway:
 
     $ vcloud-configure-edge input.yaml
 
+
 ## Contributing
 
 1. Fork it
@@ -30,160 +34,196 @@ To configure an Edge Gateway:
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-#Below here, rules are out of date - they will be updated shortly
 
-###Configure edge gateway services
+### Configure edge gateway services
+
+You can configure the following services on an existing edgegateway using
+`vcloud-configure-edge`.
+
+- firewall_service
+- nat_service
+- load_balancer_service
+
+NB: DHCP and VPN Services are not yet supported by the Fog platform underneath.
+Support for these is being considered.
+
+The `vcloud-configure-edge` tool takes an input YAML file describing one
+or more of these services and updates the edge gateway configuration to match,
+obeying the following rules:
+
+* A given service will not be reconfigured if its input configuration matches
+  the live configuration - to prevent unneccessary service reloads.
+* If a service is not defined in the input config, it will not be updated on
+  the remote edge gateway - to permit per-service configurations.
+* If more than one service is defined and have changed, then all changed
+  services will be updated in the same API request.
+
+#### firewall_service
+
+The edge gateway firewall service offers basic inbound and outbound
+IPv4 firewall rules, applied on top of a default policy.
+
+We default to the global firewall policy being 'drop', and each individual
+rule to be 'allow'. Rules are applied in order, with the last match winning.
+
+Each rule has the following form:
+
+```
+ - description: "Description of your rule"
+   destination_port_range: "53"  # defaults to 'Any'
+   destination_ip: "192.0.2.15"
+   source_ip: "Any"
+   source_port_range: "1024-65535"  # defaults to 'Any'
+   protocol: 'udp' # defaults to 'tcp'
+   policy: 'allow'  # defaults to 'drop'
+```
+
+Rule fields have the following behaviour
+
+* `policy` defaults to 'allow', can also be 'drop'.
+* `protocol` defaults to 'tcp'. Can be 'icmp', 'udp', 'tcp+udp' or 'any'
+* `source_port_range` and `destination_port_range` can be `Any` (default),
+  a single port number (eg '443'), or a port range such as '10000-20000'
+* `source_ip` and `destination_ip` *must* be specified.
+* `source_ip` and `destination_ip` can be one of:
+  * `Any` to match any address.
+  * `external`, or `internal` to refer to addresses on the respective 'sides'
+   of the edge gateway.
+  * A single IP address, such as `192.0.2.44`
+  * A CIDR range, eg `192.0.2.0/24`
+  * A hyphened range, such as `192.0.2.50-192.0.2.60`
+
+#### nat_service
+
+The edge gateway NAT service offers simple stateful Source-NAT and
+Destination-NAT rules.
+
+SNAT rules take a source IP address range and 'Translated IP address'. The translated
+address is generally the public address that you wish traffic to appear to be
+coming from. SNAT rules are typically used to enable outbound connectivity from
+a private address range behind the edge. The UUID of the external network that
+the traffic should appear to come from must also be specified, as per the
+`network_id` field below.
+
+A SNAT rule has the following form:
+
+```
+ - rule_type: 'SNAT'
+   network_id: '12345678-1234-1234-1234-1234567890bb' # id of EdgeGateway external network
+   original_ip: "10.10.10.0/24"  # internal IP range
+   translated_ip: "192.0.2.100
+```
+
+* `original_ip` can be a single IP address, a CIDR range, or a hyphenated
+  IP range.
+* `network_id` must be the UUID of the network on which the `translated_ip` sits.
+  Instructions are in the [finding external network
+  details](#finding-external-network-details-from-vcloud-walk) section below.
+* `translated_ip` must be an available address on the network specified by
+   `network_id`
+
 
-You can configure following services on an existing edgegateway using fog.
-- FirewallService
-- NatService
-- LoadBalancerService
+DNAT rules translate packets addressed to a particular destination IP (and
+typically port) and translate it to an internal address - they are usually
+defined to allow external hosts to connect to services on hosts with private IP
+addresses.
 
-###How to configure:
+A DNAT rule has the following form, and translates packets going to the
+`original_ip` (and `original_port`) to the `translated_ip` and
+`translated_port` values.
 
-```ruby
-require 'fog'
-vcloud = Fog::Compute::VcloudDirector.new
-vcloud.post_configure_edge_gateway_services edge_gateway_id, configuration
-vcloud.process_task(task.body)
 ```
+- rule_type: 'DNAT'
+  network_id: '12345678-1234-1234-1234-1234567890bb' # id of EdgeGateway external network
+  original_ip: "192.0.2.98" # Useable address on external network
+  original_port: "22"       # external port
+  translated_ip: "10.10.10.10"  # internal address to DNAT to
+  translated_port: "22"
+```
+
+* `network_id` specifies the UUID of the external network that packets are
+  translated from.
+* `original_ip` is an IP address on the external network above.
+
+#### load_balancer_service
+
+The load balancer service comprises two sets of configurations: 'pools' and
+'virtual_servers'. These are coupled together to form a load balanced service:
+
+* A virtual_server provides the front-end of a load balancer - the port and
+  IP that clients connect to.
+* A pool is a collection of one or more back-end nodes (IP+port combination)
+  that traffic is balanced across.
+* Each virtual_server entry specifies a pool that serves requests destined to
+  it.
+* Multiple virtual_servers can specify the same pool (to run the same service
+  on different FQDNs, for example)
+
+A typical load balancer configuration (for one service) would look something like:
 
-The Configuration contain definitions of any of the services listed.Details of service configurations may vary,
-but the mechanism is the same for updating any Edge Gateway service.<br/>You can include one or more services when you configure an Edge Gateway.
-
-###Examples:
-
-Service examples, to be used in place of the `configuration` object above.
-
-Firewall:
-```ruby
-configuration = {
-  :FirewallService => {
-    :IsEnabled => true,
-    :DefaultAction => 'allow',
-    :LogDefaultAction => false,
-    :FirewallRule => [
-      {
-        :Policy => 'allow',
-        :Description => 'description',
-        :Protocols => {:Tcp => true},
-        :Port => 22,
-        :DestinationPortRange => 22,
-        :DestinationIp => 'Internal',
-        :SourcePort => 22,
-        :SourceIp => 'External',
-        :SourcePortRange => '22'
-      }
-    ]
-  }
-}
 ```
+load_balancer_service:
+
+  pools:
+  - name: 'example-pool-1'
+    description: 'A pool balancing traffic across backend nodes on port 8080'
+    service:
+      http:
+        port: 8080
+    members:
+    - ip_address: 10.10.10.11
+    - ip_address: 10.10.10.12
+    - ip_address: 10.10.10.13
+
+  virtual_servers:
+  - name: 'example-virtual-server-1'
+    description: 'A virtual server connecting to example-pool-1'
+    ip_address: 192.0.2.10
+    network: '12345678-1234-1234-1234-123456789012' # id of external network
+    pool: 'example-pool-1' # must refer to a pool name detailed above
+    service_profiles:
+      http:  # protocol to balance, can be tcp/http/https.
+      port: '80'  # external port
+```
+
+### Finding external network details from vcloud-walk
 
-Load balancer:
-```ruby
-configuration = {
-  :LoadBalancerService => {
-    :IsEnabled => "true",
-    :Pool => [
-      {
-        :Name => 'web-app',
-        :ServicePort => [
-          {
-            :IsEnabled => "true",
-            :Protocol => "HTTP",
-            :Algorithm => "ROUND_ROBIN",
-            :Port => 80,
-            :HealthCheckPort => 80,
-            :HealthCheck => {
-              :Mode => "HTTP", :HealthThreshold => 1, :UnhealthThreshold => 6, :Interval => 20, :Timeout => 25
-            }
-          },
-          {
-            :IsEnabled => true,
-            :Protocol => "HTTPS",
-            :Algorithm => "ROUND_ROBIN",
-            :Port => 443,
-            :HealthCheckPort => 443,
-            :HealthCheck => {
-              :Mode => "SSL", :HealthThreshold => 1, :UnhealthThreshold => 6, :Interval => 20, :Timeout => 25
-            }
-          }
-        ],
-        :Member => [
-          {
-            :IpAddress => "192.0.2.0",
-            :Weight => 1,
-            :ServicePort => [
-              {:Protocol => "HTTP", :Port => 80, :HealthCheckPort => 80}
-            ]
-          }
-        ]
-      }
-    ],
-    :VirtualServer => [
-      {
-        :IsEnabled => "true",
-        :Name => "app1",
-        :Description => "app1",
-        :Interface => {:name => "Default", :href => "https://vmware.api.net/api/admin/network/2ad93597-7b54-43dd-9eb1-631dd337e5a7"},
-        :IpAddress => '192.0.2.0',
-        :ServiceProfile => [
-          {:IsEnabled => "true", :Protocol => "HTTP", :Port => 80, :Persistence => {:Method => ""}},
-          {:IsEnabled => "true", :Protocol => "HTTPS", :Port => 443, :Persistence => {:Method => ""}}
-        ],
-        :Logging => false,
-        :Pool => 'web-app'
-      }
-    ]
-  }
-}
+You can find the network UUID and external address allocations using [vCloud
+Walker](https://rubygems.org/gems/vcloud-walker):
+
+To do this, do:
+
+```
+export FOG_CREDENTIAL={crediental-tag-for-your-organization}
+vcloud-walk edgegateways > edges.out
 ```
 
-Nat:
-```ruby
-configuration = {
-  :NatService => {
-    :IsEnabled => true,
-    :nat_type => 'ipTranslation',
-    :Policy => 'allowTrafficIn',
-    :NatRule => [
-      {
-        :Description => 'a snat rule',
-        :RuleType => 'SNAT',
-        :IsEnabled => true,
-        :Id => '65538',
-        :GatewayNatRule => {
-          :Interface => {
-            :name => 'nft00001',
-            :href => 'https://vmware.api.net/api/admin/network/44265cc3-6d63-4ea9-ac72-4905b5aa6111'
-            },
-          :OriginalIp => "192.0.2.0",
-          :TranslatedIp => "203.0.113.10"
-        }
-      },
-      {
-        :Description => 'a dnat rule',
-        :RuleType => 'DNAT',
-        :IsEnabled => true,
-        :Id => '65539',
-        :GatewayNatRule =>
-        {
-          :Interface => {
-            :name => 'nft00001',
-            :href => 'https://vmware.api.net/api/admin/network/44265cc3-6d63-4ea9-ac72-4905b5aa6111'
-           },
-          :Protocol => 'tcp',
-          :OriginalIp => "203.0.113.10",
-          :OriginalPort => 22,
-          :TranslatedIp => "192.0.2.0",
-          :TranslatedPort => 22
-        },
-      }
-    ]
-  }
- }
+`edges.out` will contain the complete configuration of all edge gateways in
+your organization. Find the edge gateway you are interested in by searching for
+its name, then look for a GatewayInterface section that has an InterfaceType of
+'uplink'. This should define:
+
+* a 'href' element in a Network section. The UUID at the end of this href is
+  what you need.
+* an IpRange section with a StartAddress and EndAddress -- these define the
+  addresses that you can use for services on this external network.
+
+You can use [jq](http://stedolan.github.io/jq/) to make this easier:
 ```
+cat edges.out | jq '
+  .[] | select(.name == "NAME_OF_YOUR_EDGE_GATEWAY")
+      | .Configuration.GatewayInterfaces.GatewayInterface[]
+      | select(.InterfaceType == "uplink")
+      | ( .Network.href, .SubnetParticipation )
+      '
+```
+
+
+
+### Debug output
+
+Set environment variable `DEBUG=true` and/or `EXCON_DEBUG=true` to see Fog debug info.
 
-###Debug
+### References
 
-Set environment variable DEBUG=true to see fog debug info.
+* [vCloud Director Edge Gateway documentation](http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.admin.doc_51/GUID-ADE1DCAB-874F-45A9-9337-1E971DAC0F7D.html)

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

@@ -3,8 +3,8 @@ module Vcloud
     module ConfigurationGenerator
       class LoadBalancerService
 
-        def initialize edge_gateway
-          @edge_gateway = Vcloud::Core::EdgeGateway.get_by_name(edge_gateway)
+        def initialize(edge_gateway_interfaces)
+          @edge_gateway_interfaces = edge_gateway_interfaces
         end
 
         def generate_fog_config(load_balancer_input_config)
@@ -51,25 +51,17 @@ module Vcloud
         end
 
         def generate_virtual_server_interface_section(network_id)
+          edge_gw_interface = @edge_gateway_interfaces.find do |interface|
+            interface.network_id == network_id
+          end
+          raise "unable to find gateway network interface with id #{network_id}" unless edge_gw_interface
           vcloud_virtual_server_interface = {}
           vcloud_virtual_server_interface[:type] = 'application/vnd.vmware.vcloud.orgVdcNetwork+xml'
-          vcloud_virtual_server_interface[:name] = look_up_network_name(network_id)
-          vcloud_virtual_server_interface[:href] = look_up_network_href(network_id)
+          vcloud_virtual_server_interface[:name] = edge_gw_interface.network_name
+          vcloud_virtual_server_interface[:href] = edge_gw_interface.network_href
           vcloud_virtual_server_interface
         end
 
-        def look_up_network_name(network_id)
-          gateway_interface = @edge_gateway.vcloud_gateway_interface_by_id(network_id)
-          raise "Could not find network #{network_id}" unless gateway_interface
-          gateway_interface[:Network][:name]
-        end
-
-        def look_up_network_href(network_id)
-          gateway_interface = @edge_gateway.vcloud_gateway_interface_by_id(network_id)
-          raise "Could not find network #{network_id}" unless gateway_interface
-          gateway_interface[:Network][:href]
-        end
-
         def generate_virtual_server_service_profile_section(input_service_profile)
           input_service_profile = {} if input_service_profile.nil?
           vcloud_service_profiles = []
@@ -197,7 +189,7 @@ module Vcloud
           vcloud_pool_healthcheck_entry = {
             Mode: default_mode,
           }
-          vcloud_pool_healthcheck_entry[:Uri] = ''
+          vcloud_pool_healthcheck_entry[:Uri] = '/'
           vcloud_pool_healthcheck_entry[:HealthThreshold] = '2'
           vcloud_pool_healthcheck_entry[:UnhealthThreshold] = '3'
           vcloud_pool_healthcheck_entry[:Interval] = '5'

data/lib/vcloud/edge_gateway/edge_gateway_configuration.rb

@@ -37,7 +37,7 @@ module Vcloud
 
         load_balancer_service_config =
           EdgeGateway::ConfigurationGenerator::LoadBalancerService.new(
-            @local_config[:gateway]
+            @edge_gateway_interfaces
           ).generate_fog_config(@local_config[:load_balancer_service])
 
         unless load_balancer_service_config.nil?

data/lib/vcloud/edge_gateway/version.rb

@@ -1,6 +1,6 @@
 module Vcloud
   module EdgeGateway
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
   end
 end
 

data/lib/vcloud/schema/load_balancer_service.rb

@@ -30,6 +30,7 @@ module Vcloud
     POOL_SERVICE_SECTION = {
       type: Hash,
       required: false,
+      allowed_empty: true,
       internals: {
         enabled: { type: 'boolean', required: false },
         port:    { type: 'string_or_number', required: false },
@@ -78,6 +79,7 @@ module Vcloud
     VIRTUAL_SERVER_SERVICE_PROFILE_ENTRY = {
       type: Hash,
       required: false,
+      allowed_empty: true,
       internals: {
         enabled: { type: 'boolean', required: false },
         port: { type: 'string_or_number', required: false },

data/spec/integration/edge_gateway/load_balancer_service_spec.rb

@@ -49,7 +49,7 @@ module Vcloud
             Vcloud::Schema::EDGE_GATEWAY_SERVICES
           )
           @local_vcloud_config  = EdgeGateway::ConfigurationGenerator::LoadBalancerService.new(
-            @edge_name
+            @edge_gateway.interfaces
           ).generate_fog_config(local_config[:load_balancer_service])
         end
 

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

@@ -30,7 +30,7 @@
       name: 'router', #req
       description: 'describe it', #opt
       ip_address: '192.2.0.55', #req
-      network: 'ExternalNetwork', #req
+      network: '12345678-1234-1234-1234-123456789012', #req
       pool: 'web-app', #req
       logging: 'false', #opt, default false
       service_profiles: {

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

@@ -13,7 +13,7 @@
           HealthCheckPort: '80',
           HealthCheck:
             {
-              Mode: "HTTP", Uri: '', HealthThreshold: '1', UnhealthThreshold: '6', Interval: '20', Timeout: '25'
+              Mode: "HTTP", Uri: '/', HealthThreshold: '1', UnhealthThreshold: '6', Interval: '20', Timeout: '25'
             }
         },
         {
@@ -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_https-input.yaml

@@ -23,7 +23,7 @@
       name: 'test-vs-1',
       description: 'Our VirtualServer description',
       ip_address: '192.2.0.88',
-      network: 'ExternalNetwork',
+      network: '12345678-1234-1234-1234-123456789012',
       pool: 'test-pool-1',
       service_profiles: {
         https: {

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

@@ -11,7 +11,7 @@
     :HealthCheckPort: ''
     :HealthCheck:
       :Mode: HTTP
-      :Uri: ''
+      :Uri: '/'
       :HealthThreshold: '2'
       :UnhealthThreshold: '3'
       :Interval: '5'
@@ -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'

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

@@ -38,7 +38,7 @@
       name: 'test-vs-1',
       description: 'Description of VirtualServer',
       ip_address: '192.2.0.88',
-      network: 'ExternalNetwork',
+      network: '12345678-1234-1234-1234-123456789012',
       pool: 'test-pool-2',
       service_profiles: {
         http: {

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

@@ -6,27 +6,26 @@ module Vcloud
       describe LoadBalancerService do
 
         before(:each) do
-          @edge_gw_name = 'EdgeGateway1'
-          @edge_gw_id = '1111111-7b54-43dd-9eb1-631dd337e5a7'
-          edge_gateway = double(:edge_gateway,
-            :vcloud_gateway_interface_by_id => {
-              Network: {
-                :name => 'ExternalNetwork',
-                :href => 'https://example.com/api/admin/network/12345678-1234-1234-1234-123456789012'
-              }
-            }
+          mock_uplink_interface = double(
+            :mock_uplink,
+            :network_name => "ExternalNetwork",
+            :network_id   => "12345678-1234-1234-1234-123456789012",
+            :network_href => 'https://example.com/api/admin/network/12345678-1234-1234-1234-123456789012',
           )
-          expect(Vcloud::Core::EdgeGateway).
-            to receive(:get_by_name).
-            with(@edge_gw_name).
-            and_return(edge_gateway)
+          mock_internal_interface = double(
+            :mock_uplink,
+            :network_name => "InternalNetwork",
+            :network_id   => "12346788-1234-1234-1234-123456789000",
+            :network_href => "https://example.com/api/admin/network/12346788-1234-1234-1234-123456789000",
+          )
+          @edge_gw_interface_list = [ mock_internal_interface, mock_uplink_interface ]
         end
 
         context "top level LoadBalancer configuration defaults" do
 
           before(:each) do
             input = { } # minimum configuration
-            @output = LoadBalancerService.new(@edge_gw_name).generate_fog_config(input)
+            @output = LoadBalancerService.new(@edge_gw_interface_list).generate_fog_config(input)
           end
 
           it 'should default to LoadBalancerService enabled' do
@@ -47,10 +46,10 @@ module Vcloud
             input = { virtual_servers: [{
               name: "virtual-server-1",
               ip_address: '192.2.0.1',
-              network: "12345678-1234-1234-1234-123456789aa",
+              network: "12345678-1234-1234-1234-123456789012",
               pool: "pool-1",
             }]}
-            output = LoadBalancerService.new(@edge_gw_name).generate_fog_config(input)
+            output = LoadBalancerService.new(@edge_gw_interface_list).generate_fog_config(input)
             @rule = output[:VirtualServer].first
           end
 
@@ -107,7 +106,7 @@ module Vcloud
               name: "pool-1",
               members: [ { ip_address: '10.10.10.10' } ],
             }]}
-            output = LoadBalancerService.new(@edge_gw_name).generate_fog_config(input)
+            output = LoadBalancerService.new(@edge_gw_interface_list).generate_fog_config(input)
             @rule = output[:Pool].first
           end
 
@@ -127,7 +126,7 @@ module Vcloud
                   :HealthCheckPort=>"",
                   :HealthCheck=>{
                     :Mode=>"HTTP",
-                    :Uri=>"",
+                    :Uri=>"/",
                     :HealthThreshold=>"2",
                     :UnhealthThreshold=>"3",
                     :Interval=>"5",
@@ -142,7 +141,7 @@ module Vcloud
                   :HealthCheckPort=>"",
                   :HealthCheck=>{
                     :Mode=>"SSL",
-                    :Uri=>"",
+                    :Uri=>"/",
                     :HealthThreshold=>"2",
                     :UnhealthThreshold=>"3",
                     :Interval=>"5",
@@ -157,7 +156,7 @@ module Vcloud
                   :HealthCheckPort=>"",
                   :HealthCheck=>{
                     :Mode=>"TCP",
-                    :Uri=>"",
+                    :Uri=>"/",
                     :HealthThreshold=>"2",
                     :UnhealthThreshold=>"3",
                     :Interval=>"5",
@@ -190,7 +189,7 @@ module Vcloud
           it 'should expand out input config into Fog expected input' do
             input            = read_data_file('load_balancer_http-input.yaml')
             expected_output  = read_data_file('load_balancer_http-output.yaml')
-            generated_config = LoadBalancerService.new(@edge_gw_name).
+            generated_config = LoadBalancerService.new(@edge_gw_interface_list).
               generate_fog_config input
             expect(generated_config).to eq(expected_output)
           end
@@ -202,7 +201,7 @@ module Vcloud
           it 'should expand out input config into Fog expected input' do
             input            = read_data_file('load_balancer_https-input.yaml')
             expected_output  = read_data_file('load_balancer_https-output.yaml')
-            generated_config = LoadBalancerService.new(@edge_gw_name).
+            generated_config = LoadBalancerService.new(@edge_gw_interface_list).
               generate_fog_config input
             expect(generated_config).to eq(expected_output)
           end
@@ -214,7 +213,7 @@ module Vcloud
           it 'should expand out input config into Fog expected input' do
             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_name).
+            generated_config = LoadBalancerService.new(@edge_gw_interface_list).
               generate_fog_config input
             expect(generated_config).to eq(expected_output)
           end

data/spec/vcloud/edge_gateway/edge_gateway_configuration_spec.rb

@@ -6,15 +6,6 @@ module Vcloud
 
       before(:each) do
         @edge_gateway_id = "1111111-7b54-43dd-9eb1-631dd337e5a7"
-        @edge_gateway = double(:edge_gateway,
-          :vcloud_gateway_interface_by_id => {
-            Network: {
-              :type => "application/vnd.vmware.admin.network+xml",
-              :name => 'ane012345',
-              :href => 'https://vmware.example.com/api/admin/network/01234567-1234-1234-1234-0123456789aa'
-            }
-          })
-        Vcloud::Core::EdgeGateway.stub(:get_by_name).with(@edge_gateway_id).and_return(@edge_gateway)
         mock_edge_gateway_interface = double(
           :mock_edge_gateway_interface,
           :network_name => "ane012345",
@@ -654,7 +645,7 @@ module Vcloud
               :HealthCheckPort=>"",
               :HealthCheck=>{
                 :Mode=>"HTTP",
-                :Uri=>"",
+                :Uri=>"/",
                 :HealthThreshold=>"2",
                 :UnhealthThreshold=>"3",
                 :Interval=>"5",
@@ -668,7 +659,7 @@ module Vcloud
               :HealthCheckPort=>"",
               :HealthCheck=>{
                 :Mode=>"SSL",
-                :Uri=>"",
+                :Uri=>"/",
                 :HealthThreshold=>"2",
                 :UnhealthThreshold=>"3",
                 :Interval=>"5",
@@ -682,7 +673,7 @@ module Vcloud
               :HealthCheckPort=>"",
               :HealthCheck=>{
                 :Mode=>"TCP",
-                :Uri=>"",
+                :Uri=>"/",
                 :HealthThreshold=>"2",
                 :UnhealthThreshold=>"3",
                 :Interval=>"5",
@@ -839,7 +830,7 @@ module Vcloud
               :HealthCheckPort=>"",
               :HealthCheck=>{
                 :Mode=>"HTTP",
-                :Uri=>"",
+                :Uri=>"/",
                 :HealthThreshold=>"2",
                 :UnhealthThreshold=>"3",
                 :Interval=>"5",
@@ -853,7 +844,7 @@ module Vcloud
               :HealthCheckPort=>"",
               :HealthCheck=>{
                 :Mode=>"SSL",
-                :Uri=>"",
+                :Uri=>"/",
                 :HealthThreshold=>"2",
                 :UnhealthThreshold=>"3",
                 :Interval=>"5",
@@ -867,7 +858,7 @@ module Vcloud
               :HealthCheckPort=>"",
               :HealthCheck=>{
                 :Mode=>"TCP",
-                :Uri=>"",
+                :Uri=>"/",
                 :HealthThreshold=>"2",
                 :UnhealthThreshold=>"3",
                 :Interval=>"5",
@@ -1025,7 +1016,7 @@ module Vcloud
               :HealthCheckPort=>"",
               :HealthCheck=>{
                 :Mode=>"HTTP",
-                :Uri=>"",
+                :Uri=>"/",
                 :HealthThreshold=>"2",
                 :UnhealthThreshold=>"3",
                 :Interval=>"5",
@@ -1039,7 +1030,7 @@ module Vcloud
               :HealthCheckPort=>"",
               :HealthCheck=>{
                 :Mode=>"SSL",
-                :Uri=>"",
+                :Uri=>"/",
                 :HealthThreshold=>"2",
                 :UnhealthThreshold=>"3",
                 :Interval=>"5",
@@ -1053,7 +1044,7 @@ module Vcloud
               :HealthCheckPort=>"",
               :HealthCheck=>{
                 :Mode=>"TCP",
-                :Uri=>"",
+                :Uri=>"/",
                 :HealthThreshold=>"2",
                 :UnhealthThreshold=>"3",
                 :Interval=>"5",

data/spec/vcloud/edge_gateway/load_balancer_schema_validation_spec.rb

@@ -129,6 +129,48 @@ module Vcloud
         expect(validator.valid?).to be_true
       end
 
+      it "should validate ok if an empty pool service section is provided" do
+        input = {
+          pools: [
+            {
+              name: 'pool entry 1',
+              service: {
+                http: {},
+              },
+              members: [
+                { ip_address: "192.2.0.40" },
+                { ip_address: "192.2.0.41" },
+              ]
+            },
+          ],
+        }
+        validator = ConfigValidator.validate(:base, input, Vcloud::Schema::LOAD_BALANCER_SERVICE)
+        expect(validator.errors).to eq([])
+        expect(validator.valid?).to be_true
+      end
+
+      it "should validate ok if an empty virtual_server service_profile section is provided" do
+        input = {
+          pools: [{
+            name: 'pool-1',
+            service: { http: {} },
+            members: [ { ip_address: '10.10.10.10' } ],
+          }],
+          virtual_servers: [
+            {
+              name: 'virtual_server entry 1',
+              ip_address: "192.2.0.40",
+              network: "TestNetwork",
+              service_profiles: { http: {} },
+              pool: "pool-1",
+            },
+          ],
+        }
+        validator = ConfigValidator.validate(:base, input, Vcloud::Schema::LOAD_BALANCER_SERVICE)
+        expect(validator.errors).to eq([])
+        expect(validator.valid?).to be_true
+      end
+
       it "should be ok if no pools are specified" do
         input = {
           virtual_servers: []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcloud-edge_gateway
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-27 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -220,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2498590766883653195
+      hash: 4166614673467124064
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23