ops_manager_ui_drivers 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73a3f106789d50ea07ba4600485708043fbf98ef
-  data.tar.gz: 5e6d464653c9688a473761daf207a6daf3882420
+  metadata.gz: 2106eb9ec8050edbf458f776025c171e45b283cf
+  data.tar.gz: fd46c9b4b0c67929f1850d82d7737c9f6c729c3e
 SHA512:
-  metadata.gz: 1486f957adddf008b71fca0aab0b78ba451c41c10ce34543791d622baaf8afd920e353db48ff6b0383e643d5b45aa57fc112487ec49d734330c3dceca420df70
-  data.tar.gz: c59aded15ea1967952f0a04f9eed2d434513504110ee952f855ada0605062bfbf408a414e8cefc7272ed6ce3946557af210a8a0d0ef65dfeafc9b84984ea8fdc
+  metadata.gz: 5a23dde9c57d044a5c4d49dc27d9eb4f625d2b8437981716693d5713baaaed18fffc30e9f9163927561ac6a1e97d5d96074a4f2e3af7460f7ed9db71002bfbe7
+  data.tar.gz: 1b6a97c24cbafbf3172c07f34c05f852671868b378e0d9eb95d8109574b1b6b528056d2e290d5d263f1c2f0efbacd434b82f8612ec372f89809ad7d697d2052b

data/lib/ops_manager_ui_drivers/version.rb

@@ -1,3 +1,3 @@
 module OpsManagerUiDrivers
-  VERSION = '1.10.0'
+  VERSION = '1.11.0'
 end

data/lib/ops_manager_ui_drivers/version17/bosh_product_sections/networks.rb

@@ -4,12 +4,13 @@ module OpsManagerUiDrivers
       class Networks
         def initialize(browser:)
           @browser = browser
-          @bosh_product_form_section = BoshProductFormSection.new(browser, 'network_collection[networks_attributes][0]')
+          @bosh_product_form_section = BoshProductFormSection.new(@browser, 'network_collection[networks_attributes][0]')
         end
 
-        def add_single_network(name:, iaas_network_identifier:, subnet:, dns:, gateway:, reserved_ip_ranges:)
+        def add_network(name:, iaas_network_identifier:, subnet:, dns:, gateway:, reserved_ip_ranges:)
           @bosh_product_form_section.open_form('network')
 
+          @browser.click_on 'Add'
           @bosh_product_form_section.set_fields(
             'name' => name,
             'iaas_network_identifier' => iaas_network_identifier,
@@ -18,8 +19,9 @@ module OpsManagerUiDrivers
             'gateway' => gateway,
             'reserved_ip_ranges' => reserved_ip_ranges,
           )
-          browser.click_on 'Save'
-          flash_errors = browser.all('.flash-message.error ul.message li').to_a
+          @browser.click_on 'Save'
+          @browser.expect(@browser.page).to @browser.have_css('.flash-message')
+          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)
@@ -27,32 +29,13 @@ module OpsManagerUiDrivers
           end
         end
 
-        def add_network(name:, iaas_network_identifier:, subnet:, dns:, gateway:, reserved_ip_ranges:)
-          @bosh_product_form_section.open_form('network')
-
-          browser.click_on 'Add'
-          @bosh_product_form_section.set_fields(
-            'name' => name,
-            'iaas_network_identifier' => iaas_network_identifier,
-            'subnet' => subnet,
-            'dns' => dns,
-            'gateway' => gateway,
-            'reserved_ip_ranges' => reserved_ip_ranges,
-          )
-          @bosh_product_form_section.save_form
-        end
-
         def delete_network(network_name)
           @bosh_product_form_section.open_form('network')
-          button = browser.find("i[id='delete-#{network_name}']")
+          button = @browser.find("i[id='delete-#{network_name}']")
           button.trigger('click')
 
           @bosh_product_form_section.save_form
         end
-
-        private
-
-        attr_reader :browser
       end
     end
   end

data/lib/ops_manager_ui_drivers/version17/ops_manager_director.rb

@@ -2,7 +2,7 @@ module OpsManagerUiDrivers
   module Version17
     class OpsManagerDirector
       def initialize(browser:, iaas_configuration: Version17::BoshProductSections::IaasConfiguration.new(browser: browser))
-        @browser            = browser
+        @browser = browser
         @iaas_configuration = iaas_configuration
       end
 
@@ -45,29 +45,15 @@ module OpsManagerUiDrivers
       def add_networks(test_settings)
         iaas_networks = test_settings.ops_manager.networks
 
-        case test_settings.iaas_type
-          when OpsManagerUiDrivers::AWS_IAAS_TYPE, OpsManagerUiDrivers::OPENSTACK_IAAS_TYPE
-            first_network = iaas_networks.first
-
-            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(
-                name:                    network['name'],
-                iaas_network_identifier: network['identifier'],
-                subnet:                  network['subnet'],
-                reserved_ip_ranges:      network['reserved_ips'],
-                dns:                     network['dns'],
-                gateway:                 network['gateway'],
-              )
-            end
+        iaas_networks && iaas_networks.each do |network|
+          networks.add_network(
+            name: network['name'],
+            iaas_network_identifier: network['identifier'],
+            subnet: network['subnet'],
+            reserved_ip_ranges: network['reserved_ips'],
+            dns: network['dns'],
+            gateway: network['gateway'],
+          )
         end
       end
 
@@ -117,19 +103,7 @@ module OpsManagerUiDrivers
       end
 
       def assign_networks(ops_manager)
-        if ops_manager.vcenter
-          deployment_network = ops_manager.networks[0]
-
-          infrastructure_network =
-            ops_manager.networks[1] ? ops_manager.networks[1] : ops_manager.networks[0]
-
-          assign_networks_vsphere(
-            infrastructure_network: infrastructure_network['name'],
-            deployment_network:     deployment_network['name'],
-          )
-        else
-          assign_network(deployment_network: ops_manager.networks[0]['name'])
-        end
+        assign_network(ops_manager.networks[0]['name'])
       end
 
       def customize_resource_config(resource_config)
@@ -139,24 +113,10 @@ module OpsManagerUiDrivers
         end
       end
 
-      def assign_networks_vsphere(infrastructure_network:, deployment_network:)
-        browser.click_on 'Assign Networks'
-
-        browser.within browser.find '#director_network_assignments_infrastructure_network' do
-          browser.select infrastructure_network
-        end
-
-        browser.within browser.find '#director_network_assignments_deployment_network' do
-          browser.select deployment_network
-        end
-        browser.click_on 'Save'
-        browser.poll_up_to_times(20) { browser.assert_text('Successfully assigned infrastructure network') }
-      end
-
-      def assign_network(deployment_network:)
+      def assign_network(network_name)
         browser.click_on 'Assign Networks'
 
-        browser.select(deployment_network, from: 'Network')
+        browser.select(network_name, from: 'Network')
         browser.click_on 'Save'
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_manager_ui_drivers
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Pivotal, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara