ops_manager_ui_drivers 1.20.0 → 1.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e890a3afd7e4e227190c75f0c4d9383952e74b3
-  data.tar.gz: b1180e776c99b69fdcea72fc5bc9d2d41c64dfcb
+  metadata.gz: 840b4fd326d2a702b67edf5cf79c02e008e44482
+  data.tar.gz: 81bc8292afc5e690cc142f0976e75c33713cd30d
 SHA512:
-  metadata.gz: b72c9dbfdc3d16a8eee7154b54284da0c8b907def7fad8c3ceebf2313acb8784c1ac1d5d7e3edf2c70e76029dc8be1b1ecbc99abceb78cb90a2236da538ec7ac
-  data.tar.gz: 9c135b3ecfd131198fbefd542ad49076308caf994b9fad40b552ad85f8ca480e69643739a350022558574e4d6eb3d4dc628d04a63321025c2e81e2c7e2b8dbb0
+  metadata.gz: 8a4ae08fabb07810f967ec596498766c2f4eb0e0fac24e166dfc32bfe0962f0e02d1484437d47bf3a280a0c904e1a429102728a86daf24558ce7c78c52bc47f5
+  data.tar.gz: abe3562ef125a045dd8ac3e03849c517a432203a808db51b57bd865234840649f318706e57e43b9699d1a149af66f41c0782c0d55d1858fe5c148a241d4a63c5

data/lib/ops_manager_ui_drivers/version.rb

@@ -1,3 +1,3 @@
 module OpsManagerUiDrivers
-  VERSION = '1.20.0'
+  VERSION = '1.21.0'
 end

data/lib/ops_manager_ui_drivers/version17/{job_availability_zone_mapping_helper.rb → job_az_and_network_mapping_helper.rb}

@@ -1,6 +1,6 @@
 module OpsManagerUiDrivers
   module Version17
-    class JobAvailabilityZoneMappingHelper
+    class JobAzAndNetworkMappingHelper
       def initialize(product_name:, browser:)
         @product_name = product_name
         @browser = browser
@@ -8,19 +8,22 @@ module OpsManagerUiDrivers
 
       SINGLETON_AVAILABILITY_ZONE_INPUT_SELECTOR = "input[name='product[singleton_availability_zone_reference]']"
       AVAILABILITY_ZONE_INPUT_SELECTOR = "input[name='product[availability_zone_references][]']"
+      NETWORK_FIELD_NAME = "product_network_reference"
 
-      def assign_availability_zones!(singleton_availability_zone:, availability_zones:)
+      def assign_azs_and_network(singleton_availability_zone: nil, availability_zones: [], network:)
         open_form
 
+        got_azs = false
         browser.all(AVAILABILITY_ZONE_INPUT_SELECTOR).each do |checkbox|
+          got_azs = true
           checkbox.set(false)
         end
 
-        availability_zones.each do |az_name|
-          browser.check("#{az_name}")
-        end
+        availability_zones.each { |az_name| browser.check("#{az_name}") } if got_azs
+
+        browser.choose("#{singleton_availability_zone}") if got_azs
 
-        browser.choose("#{singleton_availability_zone}")
+        browser.find_field(NETWORK_FIELD_NAME).find(:option, text: network).select_option
 
         save_form
       end
@@ -44,6 +47,13 @@ module OpsManagerUiDrivers
         end
       end
 
+      def product_network
+        open_form
+        selected_options = browser.find_field(NETWORK_FIELD_NAME).all('option[selected]')
+        raise ArgumentError, "#{NETWORK_FIELD_NAME} not selected" if selected_options.empty?
+        selected_options.first.text
+      end
+
       private
 
       attr_reader :browser, :product_name
@@ -51,7 +61,7 @@ module OpsManagerUiDrivers
       def open_form
         browser.visit '/'
         browser.click_on "show-#{product_name}-configure-action"
-        browser.click_on "show-#{product_name}-availability-zone-assignment-action"
+        browser.click_on "show-#{product_name}-azs-and-network-assignment-action"
       end
 
       def save_form

data/lib/ops_manager_ui_drivers/version17/web_ui.rb

@@ -44,24 +44,24 @@ module OpsManagerUiDrivers
         Version17::ProductStatusHelper.new(browser: browser, product_name: product_name)
       end
 
-      def job_network_mapping_for(product_name)
-        Version17::JobNetworkMappingHelper.new(browser: browser, product_name: product_name)
-      end
-
       def product_availability_zones(product_name)
         Version17::ProductAvailabilityZones.new(browser: browser, product: product_name)
       end
 
-      def assign_availability_zones_for_product(product:, zones:)
-        if zones
-          Version17::JobAvailabilityZoneMappingHelper.new(
-            browser: browser,
-            product_name: product,
-          ).assign_availability_zones!(
-            singleton_availability_zone: zones[0]['name'],
-            availability_zones: zones.map { |z| z['name'] },
-          )
-        end
+      def job_azs_and_network_mapping_for(product_name)
+        Version17::JobAzAndNetworkMappingHelper.new(
+          browser: browser,
+          product_name: product_name,
+        )
+      end
+
+      def assign_azs_and_network_for_product(product_name:, zones:, network:)
+
+        job_azs_and_network_mapping_for(product_name).assign_azs_and_network(
+          singleton_availability_zone: zones[0]['name'],
+          availability_zones: zones.map { |z| z['name'] },
+          network: network
+        )
       end
 
       def current_time

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_manager_ui_drivers
 version: !ruby/object:Gem::Version
-  version: 1.20.0
+  version: 1.21.0
 platform: ruby
 authors:
 - Pivotal, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-01 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -244,7 +244,7 @@ files:
 - lib/ops_manager_ui_drivers/version17/bosh_product_sections/iaas_configuration.rb
 - lib/ops_manager_ui_drivers/version17/bosh_product_sections/networks.rb
 - lib/ops_manager_ui_drivers/version17/bosh_product_sections/subnet.rb
-- lib/ops_manager_ui_drivers/version17/job_availability_zone_mapping_helper.rb
+- lib/ops_manager_ui_drivers/version17/job_az_and_network_mapping_helper.rb
 - lib/ops_manager_ui_drivers/version17/job_network_mapping_helper.rb
 - lib/ops_manager_ui_drivers/version17/job_status_helper.rb
 - lib/ops_manager_ui_drivers/version17/ops_manager_director.rb