ops_manager_ui_drivers 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6077d80e46eb38cff09d0120cb6867e8490e3c04
-  data.tar.gz: c5adbba698bf03de4747fe69aec4585c29686e74
+  metadata.gz: a2adace82508594ca66b825dcf12f2d24ed869b2
+  data.tar.gz: eaa72f99892cf8920b5834de16824a787ca9acdc
 SHA512:
-  metadata.gz: 8865b18eb9a16aa2836d1779ebd7681fdd7b88183bfe8b5c2941b0ff906715851eacb11787bfdbd2cc5503b2df62bc1644866a214e5002969691c6de63f9b030
-  data.tar.gz: af1010289135d4597d20b3450efc937d47394927e44e98a18735d76f19187e293bd97ec024d4fb500df949186fd239aa9b61a4d0ff68208a526fb4435dc40b8b
+  metadata.gz: 11379c79012607f75fa406cc10e4497af8fbfa82d2b9786f15059452c2cdfad7864bab239ac494be989210e77e0861e09ee9bfca3e0ab814e0bfb91a780d986d
+  data.tar.gz: 481e62fde74bb1fd12aba3f57497e757da83267c0cef96b8f1d0796073e5b1202ed1a16beec434d52453a6ac5ca7ba32ac84b4b59dc1df2a1d6d424fa475712a

data/lib/ops_manager_ui_drivers/version.rb

@@ -1,3 +1,3 @@
 module OpsManagerUiDrivers
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/lib/ops_manager_ui_drivers/version15/ops_manager_director.rb

@@ -1,7 +1,7 @@
 module OpsManagerUiDrivers
   module Version15
     class OpsManagerDirector
-      def initialize(browser:, iaas_configuration: Version15::IaasConfiguration.new(browser: browser))
+      def initialize(browser:, iaas_configuration: Version15::Sections::IaasConfiguration.new(browser: browser))
         @browser            = browser
         @iaas_configuration = iaas_configuration
       end
@@ -23,12 +23,11 @@ module OpsManagerUiDrivers
       end
 
       def configure_iaas(test_settings)
-        iaas_configuration.open_form
         iaas_settings = Settings.for(test_settings)
-        iaas_settings.fields.each do |name, value|
-          iaas_configuration.set_field(name, value)
-        end
-        iaas_configuration.save_form
+        iaas_specific_fields = iaas_settings.iaas_configuration_fields
+        advanced_infrastructure_config_fields = iaas_settings.advanced_infrastructure_config_fields
+        iaas_configuration.fill_iaas_settings(iaas_specific_fields)
+        advanced_infrastructure_config.fill_advanced_infrastructure_config_settings(advanced_infrastructure_config_fields)
       end
 
       def add_availability_zones(iaas_type, iaas_availability_zones)
@@ -49,20 +48,15 @@ module OpsManagerUiDrivers
         case test_settings.iaas_type
           when OpsManagerUiDrivers::AWS_IAAS_TYPE, OpsManagerUiDrivers::OPENSTACK_IAAS_TYPE
             first_network = iaas_networks.first
-            browser.click_on 'show-network-action'
-            browser.fill_in 'network[networks][][name]', with: first_network['name']
-            browser.fill_in 'network[networks][][iaas_network_identifier]', with: first_network['identifier']
-            browser.fill_in 'network[networks][][subnet]', with: first_network['subnet']
-            browser.fill_in 'network[networks][][reserved_ip_ranges]', with: first_network['reserved_ips']
-            browser.fill_in 'network[networks][][dns]', with: first_network['dns']
-            browser.fill_in 'network[networks][][gateway]', with: first_network['gateway']
-            browser.click_on 'Save'
-            flash_errors = browser.all('.flash-message.error ul.message li').to_a
-            flash_errors.reject! { |node| node.text =~ /cannot reach gateway/i }
 
-            if (flash_errors.length > 0)
-              fail flash_errors.collect(&:text).inspect
-            end
+            networks.add_single_network(
+              name:                    first_network['name'],
+              iaas_network_identifier: first_network['identifier'],
+              subnet:                  first_network['subnet'],
+              reserved_ip_ranges:      first_network['reserved_ips'],
+              dns:                     first_network['dns'],
+              gateway:                 first_network['gateway'],
+            )
           else
             iaas_networks && iaas_networks.each do |network|
               networks.add_network(
@@ -179,11 +173,15 @@ module OpsManagerUiDrivers
 
 
       def availability_zones
-        @availability_zones ||= Version15::AvailabilityZones.new(browser: browser)
+        @availability_zones ||= Version15::Sections::AvailabilityZones.new(browser: browser)
       end
 
       def networks
-        @networks ||= Version15::Networks.new(browser: browser)
+        @networks ||= Version15::Sections::Networks.new(browser: browser)
+      end
+
+      def advanced_infrastructure_config
+        @advanced_infrastructure_config ||= Version15::Sections::AdvancedInfrastructureConfig.new(browser: browser)
       end
     end
   end

data/lib/ops_manager_ui_drivers/version15/sections/advanced_infrastructure_config.rb

@@ -0,0 +1,18 @@
+module OpsManagerUiDrivers
+  module Version15
+    module Sections
+      class AdvancedInfrastructureConfig
+        def initialize(browser:)
+          @microbosh_form_section = MicroboshFormSection.new(browser, 'advanced_infrastructure_config')
+        end
+
+        def fill_advanced_infrastructure_config_settings(fields)
+          return if fields.empty?
+          @microbosh_form_section.open_form('advanced_infrastructure_config')
+          @microbosh_form_section.set_fields(fields)
+          @microbosh_form_section.save_form
+        end
+      end
+    end
+  end
+end

data/lib/ops_manager_ui_drivers/version15/sections/availability_zones.rb

@@ -0,0 +1,29 @@
+module OpsManagerUiDrivers
+  module Version15
+    module Sections
+      class AvailabilityZones
+        def initialize(browser:)
+          @browser = browser
+          @microbosh_form_section = MicroboshFormSection.new(browser, 'availability_zones[availability_zones][]')
+        end
+
+        def add_single_az(iaas_identifier)
+          @microbosh_form_section.open_form('availability_zones')
+          @microbosh_form_section.set_fields('iaas_identifier' => iaas_identifier)
+          @microbosh_form_section.save_form
+        end
+
+        def add_az(fields)
+          @microbosh_form_section.open_form('availability_zones')
+          browser.click_on 'Add'
+          @microbosh_form_section.set_fields(fields)
+          @microbosh_form_section.save_form
+        end
+
+        private
+
+        attr_reader :browser
+      end
+    end
+  end
+end

data/lib/ops_manager_ui_drivers/version15/sections/iaas_configuration.rb

@@ -0,0 +1,17 @@
+module OpsManagerUiDrivers
+  module Version15
+    module Sections
+      class IaasConfiguration
+        def initialize(browser:)
+          @microbosh_form_section = MicroboshFormSection.new(browser, 'iaas_configuration')
+        end
+
+        def fill_iaas_settings(fields)
+          @microbosh_form_section.open_form('iaas_configuration')
+          @microbosh_form_section.set_fields(fields)
+          @microbosh_form_section.save_form
+        end
+      end
+    end
+  end
+end

data/lib/ops_manager_ui_drivers/version15/sections/microbosh_form_section.rb

@@ -0,0 +1,39 @@
+module OpsManagerUiDrivers
+  module Version15
+    module Sections
+      class MicroboshFormSection
+        def initialize(browser, field_prefix)
+          @browser = browser
+          @field_prefix = field_prefix
+        end
+
+        def open_form(form_name)
+          @browser.visit '/'
+          @browser.click_on 'show-microbosh-configure-action'
+          @browser.click_on "show-#{form_name}-action"
+        end
+
+        def save_form
+          @browser.click_on 'Save'
+          @browser.expect(@browser.page).to @browser.have_css('.flash-message.success')
+        end
+
+        def set_fields(fields)
+          fields.each do |field, value|
+            set_field(field, value)
+          end
+        end
+
+        private
+
+        def set_field(field, value)
+          last_field(field).set(value)
+        end
+
+        def last_field(field)
+          @browser.all(:field, "#{@field_prefix}[#{field}]").last
+        end
+      end
+    end
+  end
+end

data/lib/ops_manager_ui_drivers/version15/sections/networks.rb

@@ -0,0 +1,51 @@
+module OpsManagerUiDrivers
+  module Version15
+    module Sections
+      class Networks
+        def initialize(browser:)
+          @browser = browser
+          @microbosh_form_section = MicroboshFormSection.new(browser, 'network[networks][]')
+        end
+
+        def add_single_network(name:, iaas_network_identifier:, subnet:, dns:, gateway:, reserved_ip_ranges:)
+          @microbosh_form_section.open_form('network')
+
+          @microbosh_form_section.set_fields(
+            'name' => name,
+            'iaas_network_identifier' => iaas_network_identifier,
+            'subnet' => subnet,
+            'dns' => dns,
+            'gateway' => gateway,
+            'reserved_ip_ranges' => reserved_ip_ranges,
+          )
+          browser.click_on 'Save'
+          flash_errors = browser.all('.flash-message.error ul.message li').to_a
+          flash_errors.reject! { |node| node.text =~ /cannot reach gateway/i }
+
+          if (flash_errors.length > 0)
+            fail flash_errors.collect(&:text).inspect
+          end
+        end
+
+        def add_network(name:, iaas_network_identifier:, subnet:, dns:, gateway:, reserved_ip_ranges:)
+          @microbosh_form_section.open_form('network')
+
+          browser.click_on 'Add'
+          @microbosh_form_section.set_fields(
+            'name' => name,
+            'iaas_network_identifier' => iaas_network_identifier,
+            'subnet' => subnet,
+            'dns' => dns,
+            'gateway' => gateway,
+            'reserved_ip_ranges' => reserved_ip_ranges,
+          )
+          @microbosh_form_section.save_form
+        end
+
+        private
+
+        attr_reader :browser
+      end
+    end
+  end
+end

data/lib/ops_manager_ui_drivers/version15/settings.rb

@@ -17,7 +17,7 @@ module OpsManagerUiDrivers
           @test_settings = test_settings
         end
 
-        def fields
+        def iaas_configuration_fields
           {
             'vcd_url'         => test_settings.ops_manager.vcloud.creds.url,
             'organization'    => test_settings.ops_manager.vcloud.creds.organization,
@@ -29,6 +29,10 @@ module OpsManagerUiDrivers
           }
         end
 
+        def advanced_infrastructure_config_fields
+          { }
+        end
+
         private
 
         attr_reader :test_settings
@@ -43,7 +47,7 @@ module OpsManagerUiDrivers
           @test_settings = test_settings
         end
 
-        def fields
+        def iaas_configuration_fields
           {
             'vcenter_ip'                => test_settings.ops_manager.vcenter.creds.ip,
             'vcenter_username'          => test_settings.ops_manager.vcenter.creds.username,
@@ -56,6 +60,10 @@ module OpsManagerUiDrivers
           }
         end
 
+        def advanced_infrastructure_config_fields
+          { }
+        end
+
         private
 
         attr_reader :test_settings
@@ -70,7 +78,7 @@ module OpsManagerUiDrivers
           @test_settings = test_settings
         end
 
-        def fields
+        def iaas_configuration_fields
           {
             'access_key_id'     => test_settings.ops_manager.aws.aws_access_key,
             'secret_access_key' => test_settings.ops_manager.aws.aws_secret_key,
@@ -82,6 +90,10 @@ module OpsManagerUiDrivers
           }
         end
 
+        def advanced_infrastructure_config_fields
+          { }
+        end
+
         private
 
         attr_reader :test_settings
@@ -96,7 +108,7 @@ module OpsManagerUiDrivers
           @test_settings = test_settings
         end
 
-        def fields
+        def iaas_configuration_fields
           {
             'identity_endpoint' => test_settings.ops_manager.openstack.identity_endpoint,
             'username'          => test_settings.ops_manager.openstack.username,
@@ -110,6 +122,10 @@ module OpsManagerUiDrivers
           }
         end
 
+        def advanced_infrastructure_config_fields
+          { 'connection_options' => test_settings.ops_manager.openstack.connection_options }
+        end
+
         private
 
         attr_reader :test_settings

data/lib/ops_manager_ui_drivers/version16/ops_manager_director.rb

@@ -1,7 +1,7 @@
 module OpsManagerUiDrivers
   module Version16
     class OpsManagerDirector
-      def initialize(browser:, iaas_configuration: Version16::IaasConfiguration.new(browser: browser))
+      def initialize(browser:, iaas_configuration: Version16::Sections::IaasConfiguration.new(browser: browser))
         @browser            = browser
         @iaas_configuration = iaas_configuration
       end
@@ -23,12 +23,11 @@ module OpsManagerUiDrivers
       end
 
       def configure_iaas(test_settings)
-        iaas_configuration.open_form
         iaas_settings = Settings.for(test_settings)
-        iaas_settings.fields.each do |name, value|
-          iaas_configuration.set_field(name, value)
-        end
-        iaas_configuration.save_form
+        iaas_specific_fields = iaas_settings.iaas_configuration_fields
+        advanced_infrastructure_config_fields = iaas_settings.advanced_infrastructure_config_fields
+        iaas_configuration.fill_iaas_settings(iaas_specific_fields)
+        advanced_infrastructure_config.fill_advanced_infrastructure_config_settings(advanced_infrastructure_config_fields)
       end
 
       def add_availability_zones(iaas_type, iaas_availability_zones)
@@ -49,20 +48,15 @@ module OpsManagerUiDrivers
         case test_settings.iaas_type
           when OpsManagerUiDrivers::AWS_IAAS_TYPE, OpsManagerUiDrivers::OPENSTACK_IAAS_TYPE
             first_network = iaas_networks.first
-            browser.click_on 'show-network-action'
-            browser.fill_in 'network[networks][][name]', with: first_network['name']
-            browser.fill_in 'network[networks][][iaas_network_identifier]', with: first_network['identifier']
-            browser.fill_in 'network[networks][][subnet]', with: first_network['subnet']
-            browser.fill_in 'network[networks][][reserved_ip_ranges]', with: first_network['reserved_ips']
-            browser.fill_in 'network[networks][][dns]', with: first_network['dns']
-            browser.fill_in 'network[networks][][gateway]', with: first_network['gateway']
-            browser.click_on 'Save'
-            flash_errors = browser.all('.flash-message.error ul.message li').to_a
-            flash_errors.reject! { |node| node.text =~ /cannot reach gateway/i }
 
-            if (flash_errors.length > 0)
-              fail flash_errors.collect(&:text).inspect
-            end
+            networks.add_single_network(
+              name:                    first_network['name'],
+              iaas_network_identifier: first_network['identifier'],
+              subnet:                  first_network['subnet'],
+              reserved_ip_ranges:      first_network['reserved_ips'],
+              dns:                     first_network['dns'],
+              gateway:                 first_network['gateway'],
+            )
           else
             iaas_networks && iaas_networks.each do |network|
               networks.add_network(
@@ -179,11 +173,15 @@ module OpsManagerUiDrivers
 
 
       def availability_zones
-        @availability_zones ||= Version16::AvailabilityZones.new(browser: browser)
+        @availability_zones ||= Version16::Sections::AvailabilityZones.new(browser: browser)
       end
 
       def networks
-        @networks ||= Version16::Networks.new(browser: browser)
+        @networks ||= Version16::Sections::Networks.new(browser: browser)
+      end
+
+      def advanced_infrastructure_config
+        @advanced_infrastructure_config ||= Version16::Sections::AdvancedInfrastructureConfig.new(browser: browser)
       end
     end
   end

data/lib/ops_manager_ui_drivers/version16/sections/advanced_infrastructure_config.rb

@@ -0,0 +1,18 @@
+module OpsManagerUiDrivers
+  module Version16
+    module Sections
+      class AdvancedInfrastructureConfig
+        def initialize(browser:)
+          @microbosh_form_section = MicroboshFormSection.new(browser, 'advanced_infrastructure_config')
+        end
+
+        def fill_advanced_infrastructure_config_settings(fields)
+          return if fields.empty?
+          @microbosh_form_section.open_form('advanced_infrastructure_config')
+          @microbosh_form_section.set_fields(fields)
+          @microbosh_form_section.save_form
+        end
+      end
+    end
+  end
+end

data/lib/ops_manager_ui_drivers/version16/sections/availability_zones.rb

@@ -0,0 +1,29 @@
+module OpsManagerUiDrivers
+  module Version16
+    module Sections
+      class AvailabilityZones
+        def initialize(browser:)
+          @browser = browser
+          @microbosh_form_section = MicroboshFormSection.new(browser, 'availability_zones[availability_zones][]')
+        end
+
+        def add_single_az(iaas_identifier)
+          @microbosh_form_section.open_form('availability_zones')
+          @microbosh_form_section.set_fields('iaas_identifier' => iaas_identifier)
+          @microbosh_form_section.save_form
+        end
+
+        def add_az(fields)
+          @microbosh_form_section.open_form('availability_zones')
+          browser.click_on 'Add'
+          @microbosh_form_section.set_fields(fields)
+          @microbosh_form_section.save_form
+        end
+
+        private
+
+        attr_reader :browser
+      end
+    end
+  end
+end

data/lib/ops_manager_ui_drivers/version16/sections/iaas_configuration.rb

@@ -0,0 +1,17 @@
+module OpsManagerUiDrivers
+  module Version16
+    module Sections
+      class IaasConfiguration
+        def initialize(browser:)
+          @microbosh_form_section = MicroboshFormSection.new(browser, 'iaas_configuration')
+        end
+
+        def fill_iaas_settings(fields)
+          @microbosh_form_section.open_form('iaas_configuration')
+          @microbosh_form_section.set_fields(fields)
+          @microbosh_form_section.save_form
+        end
+      end
+    end
+  end
+end

data/lib/ops_manager_ui_drivers/version16/sections/microbosh_form_section.rb

@@ -0,0 +1,39 @@
+module OpsManagerUiDrivers
+  module Version16
+    module Sections
+      class MicroboshFormSection
+        def initialize(browser, field_prefix)
+          @browser = browser
+          @field_prefix = field_prefix
+        end
+
+        def open_form(form_name)
+          @browser.visit '/'
+          @browser.click_on 'show-microbosh-configure-action'
+          @browser.click_on "show-#{form_name}-action"
+        end
+
+        def save_form
+          @browser.click_on 'Save'
+          @browser.expect(@browser.page).to @browser.have_css('.flash-message.success')
+        end
+
+        def set_fields(fields)
+          fields.each do |field, value|
+            set_field(field, value)
+          end
+        end
+
+        private
+
+        def set_field(field, value)
+          last_field(field).set(value)
+        end
+
+        def last_field(field)
+          @browser.all(:field, "#{@field_prefix}[#{field}]").last
+        end
+      end
+    end
+  end
+end

data/lib/ops_manager_ui_drivers/version16/sections/networks.rb

@@ -0,0 +1,51 @@
+module OpsManagerUiDrivers
+  module Version16
+    module Sections
+      class Networks
+        def initialize(browser:)
+          @browser = browser
+          @microbosh_form_section = MicroboshFormSection.new(browser, 'network[networks][]')
+        end
+
+        def add_single_network(name:, iaas_network_identifier:, subnet:, dns:, gateway:, reserved_ip_ranges:)
+          @microbosh_form_section.open_form('network')
+
+          @microbosh_form_section.set_fields(
+            'name' => name,
+            'iaas_network_identifier' => iaas_network_identifier,
+            'subnet' => subnet,
+            'dns' => dns,
+            'gateway' => gateway,
+            'reserved_ip_ranges' => reserved_ip_ranges,
+          )
+          browser.click_on 'Save'
+          flash_errors = browser.all('.flash-message.error ul.message li').to_a
+          flash_errors.reject! { |node| node.text =~ /cannot reach gateway/i }
+
+          if (flash_errors.length > 0)
+            fail flash_errors.collect(&:text).inspect
+          end
+        end
+
+        def add_network(name:, iaas_network_identifier:, subnet:, dns:, gateway:, reserved_ip_ranges:)
+          @microbosh_form_section.open_form('network')
+
+          browser.click_on 'Add'
+          @microbosh_form_section.set_fields(
+            'name' => name,
+            'iaas_network_identifier' => iaas_network_identifier,
+            'subnet' => subnet,
+            'dns' => dns,
+            'gateway' => gateway,
+            'reserved_ip_ranges' => reserved_ip_ranges,
+          )
+          @microbosh_form_section.save_form
+        end
+
+        private
+
+        attr_reader :browser
+      end
+    end
+  end
+end

data/lib/ops_manager_ui_drivers/version16/settings.rb

@@ -17,7 +17,7 @@ module OpsManagerUiDrivers
           @test_settings = test_settings
         end
 
-        def fields
+        def iaas_configuration_fields
           {
             'vcd_url'         => test_settings.ops_manager.vcloud.creds.url,
             'organization'    => test_settings.ops_manager.vcloud.creds.organization,
@@ -29,6 +29,10 @@ module OpsManagerUiDrivers
           }
         end
 
+        def advanced_infrastructure_config_fields
+          { }
+        end
+
         private
 
         attr_reader :test_settings
@@ -43,7 +47,7 @@ module OpsManagerUiDrivers
           @test_settings = test_settings
         end
 
-        def fields
+        def iaas_configuration_fields
           {
             'vcenter_ip'                => test_settings.ops_manager.vcenter.creds.ip,
             'vcenter_username'          => test_settings.ops_manager.vcenter.creds.username,
@@ -56,6 +60,10 @@ module OpsManagerUiDrivers
           }
         end
 
+        def advanced_infrastructure_config_fields
+          { }
+        end
+
         private
 
         attr_reader :test_settings
@@ -70,7 +78,7 @@ module OpsManagerUiDrivers
           @test_settings = test_settings
         end
 
-        def fields
+        def iaas_configuration_fields
           {
             'access_key_id'     => test_settings.ops_manager.aws.aws_access_key,
             'secret_access_key' => test_settings.ops_manager.aws.aws_secret_key,
@@ -82,6 +90,10 @@ module OpsManagerUiDrivers
           }
         end
 
+        def advanced_infrastructure_config_fields
+          { }
+        end
+
         private
 
         attr_reader :test_settings
@@ -96,7 +108,7 @@ module OpsManagerUiDrivers
           @test_settings = test_settings
         end
 
-        def fields
+        def iaas_configuration_fields
           {
             'identity_endpoint' => test_settings.ops_manager.openstack.identity_endpoint,
             'username'          => test_settings.ops_manager.openstack.username,
@@ -110,6 +122,10 @@ module OpsManagerUiDrivers
           }
         end
 
+        def advanced_infrastructure_config_fields
+          { 'connection_options' => test_settings.ops_manager.openstack.connection_options }
+        end
+
         private
 
         attr_reader :test_settings

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_manager_ui_drivers
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Pivotal, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -176,13 +176,10 @@ files:
 - lib/ops_manager_ui_drivers/version14/state_change_progress.rb
 - lib/ops_manager_ui_drivers/version14/web_ui.rb
 - lib/ops_manager_ui_drivers/version15/api_1_5.rb
-- lib/ops_manager_ui_drivers/version15/availability_zones.rb
 - lib/ops_manager_ui_drivers/version15/available_products.rb
-- lib/ops_manager_ui_drivers/version15/iaas_configuration.rb
 - lib/ops_manager_ui_drivers/version15/job_availability_zone_mapping_helper.rb
 - lib/ops_manager_ui_drivers/version15/job_network_mapping_helper.rb
 - lib/ops_manager_ui_drivers/version15/job_status_helper.rb
-- lib/ops_manager_ui_drivers/version15/networks.rb
 - lib/ops_manager_ui_drivers/version15/ops_manager_director.rb
 - lib/ops_manager_ui_drivers/version15/product_availability_zones.rb
 - lib/ops_manager_ui_drivers/version15/product_configuration.rb
@@ -191,17 +188,19 @@ files:
 - lib/ops_manager_ui_drivers/version15/product_logs.rb
 - lib/ops_manager_ui_drivers/version15/product_resource_configuration.rb
 - lib/ops_manager_ui_drivers/version15/product_status_helper.rb
+- lib/ops_manager_ui_drivers/version15/sections/advanced_infrastructure_config.rb
+- lib/ops_manager_ui_drivers/version15/sections/availability_zones.rb
+- lib/ops_manager_ui_drivers/version15/sections/iaas_configuration.rb
+- lib/ops_manager_ui_drivers/version15/sections/microbosh_form_section.rb
+- lib/ops_manager_ui_drivers/version15/sections/networks.rb
 - lib/ops_manager_ui_drivers/version15/settings.rb
 - lib/ops_manager_ui_drivers/version15/setup.rb
 - lib/ops_manager_ui_drivers/version15/state_change_progress.rb
 - lib/ops_manager_ui_drivers/version15/web_ui.rb
-- lib/ops_manager_ui_drivers/version16/availability_zones.rb
 - lib/ops_manager_ui_drivers/version16/available_products.rb
-- lib/ops_manager_ui_drivers/version16/iaas_configuration.rb
 - lib/ops_manager_ui_drivers/version16/job_availability_zone_mapping_helper.rb
 - lib/ops_manager_ui_drivers/version16/job_network_mapping_helper.rb
 - lib/ops_manager_ui_drivers/version16/job_status_helper.rb
-- lib/ops_manager_ui_drivers/version16/networks.rb
 - lib/ops_manager_ui_drivers/version16/ops_manager_director.rb
 - lib/ops_manager_ui_drivers/version16/product_availability_zones.rb
 - lib/ops_manager_ui_drivers/version16/product_configuration.rb
@@ -210,6 +209,11 @@ files:
 - lib/ops_manager_ui_drivers/version16/product_logs.rb
 - lib/ops_manager_ui_drivers/version16/product_resource_configuration.rb
 - lib/ops_manager_ui_drivers/version16/product_status_helper.rb
+- lib/ops_manager_ui_drivers/version16/sections/advanced_infrastructure_config.rb
+- lib/ops_manager_ui_drivers/version16/sections/availability_zones.rb
+- lib/ops_manager_ui_drivers/version16/sections/iaas_configuration.rb
+- lib/ops_manager_ui_drivers/version16/sections/microbosh_form_section.rb
+- lib/ops_manager_ui_drivers/version16/sections/networks.rb
 - lib/ops_manager_ui_drivers/version16/settings.rb
 - lib/ops_manager_ui_drivers/version16/setup.rb
 - lib/ops_manager_ui_drivers/version16/state_change_progress.rb

data/lib/ops_manager_ui_drivers/version15/availability_zones.rb

@@ -1,54 +0,0 @@
-module OpsManagerUiDrivers
-  module Version15
-    class AvailabilityZones
-      def initialize(browser:)
-        @browser = browser
-      end
-
-      def add_single_az(iaas_identifier)
-        open_form('availability_zones')
-
-        set_fields(fields: {'iaas_identifier' => iaas_identifier})
-
-        save_form
-      end
-
-      def add_az(fields)
-        open_form('availability_zones')
-
-        browser.click_on 'Add'
-        set_fields(fields: fields)
-        save_form
-      end
-
-      private
-
-      attr_reader :browser
-
-      def save_form
-        browser.click_on 'Save'
-        browser.expect(browser.page).to browser.have_css('.flash-message.success')
-      end
-
-      def open_form(form)
-        browser.visit '/'
-        browser.click_on 'show-microbosh-configure-action'
-        browser.click_on "show-#{form}-action"
-      end
-
-      def set_fields(fields:)
-        fields.each do |field, value|
-          set_field(field, value)
-        end
-      end
-
-      def set_field(field, value)
-        last_field(field).set(value)
-      end
-
-      def last_field(field)
-        browser.all(:field, "availability_zones[availability_zones][][#{field}]").last
-      end
-    end
-  end
-end

data/lib/ops_manager_ui_drivers/version15/iaas_configuration.rb

@@ -1,28 +0,0 @@
-module OpsManagerUiDrivers
-  module Version15
-    class IaasConfiguration
-      def initialize(browser:)
-        @browser = browser
-      end
-
-      def open_form
-        browser.visit '/'
-        browser.click_on 'show-microbosh-configure-action'
-        browser.click_on 'show-iaas_configuration-action'
-      end
-
-      def save_form
-        browser.click_on 'Save'
-        browser.expect(browser.page).to browser.have_css('.flash-message.success')
-      end
-
-      def set_field(field, value)
-        browser.find_field("iaas_configuration[#{field}]").set(value)
-      end
-
-      private
-
-      attr_reader :browser
-    end
-  end
-end

data/lib/ops_manager_ui_drivers/version15/networks.rb

@@ -1,55 +0,0 @@
-module OpsManagerUiDrivers
-  module Version15
-    class Networks
-      def initialize(browser:)
-        @browser = browser
-      end
-
-      def add_network(name:, iaas_network_identifier:, subnet:, dns:, gateway:, reserved_ip_ranges:)
-        open_form('network')
-
-        browser.click_on 'Add'
-        set_fields(
-          fields: {
-            'name' => name,
-            'iaas_network_identifier' => iaas_network_identifier,
-            'subnet' => subnet,
-            'dns' => dns,
-            'gateway' => gateway,
-            'reserved_ip_ranges' => reserved_ip_ranges,
-          }
-        )
-        save_form
-      end
-
-      private
-
-      attr_reader :browser
-
-      def save_form
-        browser.click_on 'Save'
-        browser.expect(browser.page).to browser.have_css('.flash-message.success')
-      end
-
-      def open_form(form)
-        browser.visit '/'
-        browser.click_on 'show-microbosh-configure-action'
-        browser.click_on "show-#{form}-action"
-      end
-
-      def set_fields(fields:)
-        fields.each do |field, value|
-          set_field(field, value)
-        end
-      end
-
-      def set_field(field, value)
-        last_field(field).set(value)
-      end
-
-      def last_field(field)
-        browser.all(:field, "network[networks][][#{field}]").last
-      end
-    end
-  end
-end

data/lib/ops_manager_ui_drivers/version16/availability_zones.rb

@@ -1,54 +0,0 @@
-module OpsManagerUiDrivers
-  module Version16
-    class AvailabilityZones
-      def initialize(browser:)
-        @browser = browser
-      end
-
-      def add_single_az(iaas_identifier)
-        open_form('availability_zones')
-
-        set_fields(fields: {'iaas_identifier' => iaas_identifier})
-
-        save_form
-      end
-
-      def add_az(fields)
-        open_form('availability_zones')
-
-        browser.click_on 'Add'
-        set_fields(fields: fields)
-        save_form
-      end
-
-      private
-
-      attr_reader :browser
-
-      def save_form
-        browser.click_on 'Save'
-        browser.expect(browser.page).to browser.have_css('.flash-message.success')
-      end
-
-      def open_form(form)
-        browser.visit '/'
-        browser.click_on 'show-microbosh-configure-action'
-        browser.click_on "show-#{form}-action"
-      end
-
-      def set_fields(fields:)
-        fields.each do |field, value|
-          set_field(field, value)
-        end
-      end
-
-      def set_field(field, value)
-        last_field(field).set(value)
-      end
-
-      def last_field(field)
-        browser.all(:field, "availability_zones[availability_zones][][#{field}]").last
-      end
-    end
-  end
-end

data/lib/ops_manager_ui_drivers/version16/iaas_configuration.rb

@@ -1,28 +0,0 @@
-module OpsManagerUiDrivers
-  module Version16
-    class IaasConfiguration
-      def initialize(browser:)
-        @browser = browser
-      end
-
-      def open_form
-        browser.visit '/'
-        browser.click_on 'show-microbosh-configure-action'
-        browser.click_on 'show-iaas_configuration-action'
-      end
-
-      def save_form
-        browser.click_on 'Save'
-        browser.expect(browser.page).to browser.have_css('.flash-message.success')
-      end
-
-      def set_field(field, value)
-        browser.find_field("iaas_configuration[#{field}]").set(value)
-      end
-
-      private
-
-      attr_reader :browser
-    end
-  end
-end

data/lib/ops_manager_ui_drivers/version16/networks.rb

@@ -1,55 +0,0 @@
-module OpsManagerUiDrivers
-  module Version16
-    class Networks
-      def initialize(browser:)
-        @browser = browser
-      end
-
-      def add_network(name:, iaas_network_identifier:, subnet:, dns:, gateway:, reserved_ip_ranges:)
-        open_form('network')
-
-        browser.click_on 'Add'
-        set_fields(
-          fields: {
-            'name' => name,
-            'iaas_network_identifier' => iaas_network_identifier,
-            'subnet' => subnet,
-            'dns' => dns,
-            'gateway' => gateway,
-            'reserved_ip_ranges' => reserved_ip_ranges,
-          }
-        )
-        save_form
-      end
-
-      private
-
-      attr_reader :browser
-
-      def save_form
-        browser.click_on 'Save'
-        browser.expect(browser.page).to browser.have_css('.flash-message.success')
-      end
-
-      def open_form(form)
-        browser.visit '/'
-        browser.click_on 'show-microbosh-configure-action'
-        browser.click_on "show-#{form}-action"
-      end
-
-      def set_fields(fields:)
-        fields.each do |field, value|
-          set_field(field, value)
-        end
-      end
-
-      def set_field(field, value)
-        last_field(field).set(value)
-      end
-
-      def last_field(field)
-        browser.all(:field, "network[networks][][#{field}]").last
-      end
-    end
-  end
-end