ops_manager_ui_drivers 1.21.1 → 1.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4a2f03e9ce3d0cad442edb05548179f17277a78
-  data.tar.gz: 223597eeb899ab684ceae65420872a80bc0b312c
+  metadata.gz: ca0ad468e05a09ec780c38bf1d9fb757760839e4
+  data.tar.gz: ce23e8b69a0dadf0f70373ae6bb03cf0ed067efc
 SHA512:
-  metadata.gz: 3fc84e715b397c89855ad759f7dfc71eb47531208ebe9b3b50567543190cbc0926c774f30c1a6fa1fae1d55b2942d7cd29bbbe34da57c393312ebe40e49d3149
-  data.tar.gz: b7efad09a9062de8b0cbfceeae6330e9ba0026764121690eb72e3c764d6f9d10938b21a6a4425b78d980b31ed8e00d8b6288a87962a1f5274cd7550993925c94
+  metadata.gz: 5f4fcd8aab14a263dc2332cdb282c4540e87bd9557abe5258894c46366d1dc39eec64b784b40593559522f2ed1154f66ad6b911f9918d67e459afc1eb5f317b0
+  data.tar.gz: dead400c8386a35383091d3a87979124270aee57f846efbb49665b01405e9e6de832ae85d13265c83201db4a7a8cf5c4d5a6335bdd25056b8c775921d6cda544

data/lib/ops_manager_ui_drivers/version.rb

@@ -1,3 +1,3 @@
 module OpsManagerUiDrivers
-  VERSION = '1.21.1'
+  VERSION = '1.22.0'
 end

data/lib/ops_manager_ui_drivers/version15/ops_manager_director.rb

@@ -18,8 +18,6 @@ module OpsManagerUiDrivers
         add_networks(test_settings)
 
         assign_networks(test_settings.ops_manager)
-
-        customize_resource_config(test_settings.ops_manager.resource_config)
       end
 
       def configure_iaas(test_settings)
@@ -128,13 +126,6 @@ module OpsManagerUiDrivers
         end
       end
 
-      def customize_resource_config(resource_config)
-        browser.click_on 'Resource Config'
-        if resource_config
-          browser.fill_in('product_resources_form[director][persistent_disk][value]', with: resource_config.persistent_disk)
-        end
-      end
-
       def assign_networks_vsphere(infrastructure_network:, deployment_network:)
         browser.click_on 'Assign Networks'
 

data/lib/ops_manager_ui_drivers/version16/ops_manager_director.rb

@@ -19,8 +19,6 @@ module OpsManagerUiDrivers
 
         assign_networks(test_settings.ops_manager)
 
-        customize_resource_config(test_settings.ops_manager.resource_config)
-
         configure_experimental_features(test_settings.ops_manager.experimental_features)
       end
 
@@ -127,13 +125,6 @@ module OpsManagerUiDrivers
         end
       end
 
-      def customize_resource_config(resource_config)
-        browser.click_on 'Resource Config'
-        if resource_config
-          browser.fill_in('product_resources_form[director][persistent_disk][value]', with: resource_config.persistent_disk)
-        end
-      end
-
       def assign_networks_vsphere(infrastructure_network:, deployment_network:)
         browser.click_on 'Assign Networks'
 

data/lib/ops_manager_ui_drivers/version17/ops_manager_director.rb

@@ -17,8 +17,6 @@ module OpsManagerUiDrivers
 
         assign_azs_and_networks(test_settings.iaas_type, test_settings.ops_manager.availability_zones, test_settings.ops_manager)
 
-        customize_resource_config(test_settings.ops_manager.resource_config)
-
         configure_experimental_features(test_settings.ops_manager.experimental_features)
       end
 
@@ -105,13 +103,6 @@ module OpsManagerUiDrivers
         browser.click_on 'Save'
       end
 
-      def customize_resource_config(resource_config)
-        browser.click_on 'Resource Config'
-        if resource_config
-          browser.fill_in('product_resources_form[director][persistent_disk][value]', with: resource_config.persistent_disk)
-        end
-      end
-
       def configure_vm_passwords(use_generated_passwords: true)
         browser.click_on 'Security'
         if use_generated_passwords

data/lib/ops_manager_ui_drivers/version17/product_resource_configuration.rb

@@ -8,40 +8,41 @@ module OpsManagerUiDrivers
         @product_name = product_name
       end
 
-      def set_instances_for_job(job_name, instance_count)
-        open_form
-        browser.find_field("product_resources_form[#{job_name}][instances][value]").set(instance_count)
-        save_form
+      def set_instances_for_job(job_name, instance_count, validate: true)
+        set_resources_for_jobs(job_name, :instances, instance_count, validate: validate)
+      end
+
+      def set_ephemeral_disk_for_job(job_name, ephemeral_disk, validate: true)
+        set_resources_for_jobs(job_name, :ephemeral_disk, ephemeral_disk, validate: validate)
       end
 
-      def set_instance_type_for_job(job_name, instance_type)
+      def set_instance_type_for_job(job_name, instance_type, validate: true)
         open_form
         browser.
           find("select[name='product_resources_form[#{job_name}][instance_type_id]']").
           find("option[value='#{instance_type}']").
           select_option
-        save_form
+        save_form(validate: validate)
       end
 
-      def set_elb_names_for_job(job_name, comma_delimited_elb_names)
+      def set_disk_type_for_job(job_name, disk_type_id, validate: true)
         open_form
-        browser.find_field("product_resources_form[#{job_name}][elb_names]").set(comma_delimited_elb_names)
-        save_form
+        browser.
+          find("select[name='product_resources_form[#{job_name}][disk_type_id]']").
+          find("option[value='#{disk_type_id}']").
+          select_option
+        save_form(validate: validate)
       end
 
-      def set_floating_ips_for_job(job_name, comma_delimited_floating_ips)
+      def set_elb_names_for_job(job_name, comma_delimited_elb_names, validate: true)
         open_form
-        browser.find_field("product_resources_form[#{job_name}][floating_ips]").set(comma_delimited_floating_ips)
-        save_form
+        browser.find_field("product_resources_form[#{job_name}][elb_names]").set(comma_delimited_elb_names)
+        save_form(validate: validate)
       end
 
-      def set_resources_for_jobs(resources_by_job, validate: true)
+      def set_floating_ips_for_job(job_name, comma_delimited_floating_ips, validate: true)
         open_form
-        resources_by_job.each do |job, resources|
-          resources.each do |resource_or_instance, value|
-            browser.fill_in("product_resources_form[#{job}][#{resource_or_instance}][value]", with: value)
-          end
-        end
+        browser.find_field("product_resources_form[#{job_name}][floating_ips]").set(comma_delimited_floating_ips)
         save_form(validate: validate)
       end
 
@@ -49,6 +50,12 @@ module OpsManagerUiDrivers
 
       attr_reader :browser
 
+      def set_resources_for_jobs(job_name, resource, value, validate: true)
+        open_form
+        browser.fill_in("product_resources_form[#{job_name}][#{resource}][value]", with: value)
+        save_form(validate: validate)
+      end
+
       def open_form
         browser.visit '/'
         browser.click_on "show-#{product_name}-configure-action"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_manager_ui_drivers
 version: !ruby/object:Gem::Version
-  version: 1.21.1
+  version: 1.22.0
 platform: ruby
 authors:
 - Pivotal, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-02 00:00:00.000000000 Z
+date: 2015-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -282,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Capybara helpers for configuring Pivotal Ops Manager