ops_manager_ui_drivers 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 222a701fa96d33cd5eb9a9069105b215cc8d2fb4
-  data.tar.gz: 8413ddecea723f728329fdc5358fd522c54fbde8
+  metadata.gz: 3fd75785a8372387e4763f9410bb51c718a50e98
+  data.tar.gz: 4bbeafd6bedfea8196569741b158939ad02668a8
 SHA512:
-  metadata.gz: 9c92266565b2dc5b02dfce777f2a2066743198cf9442016c7bfaebc2f7eac8f6b16bc14d31ab447e54073a15524e6917a3b69c8a05c1d2b0b475328f5e33dfdc
-  data.tar.gz: 3dee7257ecb964697fb954c1d069427192fbc5a665a52180774ae0898cd3cda9b1de4ca727d5825d86b49bc9c84c939bd789f7f58d10856de0377238991fe55a
+  metadata.gz: 77ffbcc1d25af238434c74f77b679ab56005ca2592b3aadae2ad56f37439694ac172be59a4fb17e52839982463d2b5d97a8a76ec64e05c61b3ccc31fab13d0d2
+  data.tar.gz: e5c613b9a88aaafe54e16585e5c48b2531b2f7d354e6c9cc414b241920ee89eb577f9b58e40e762dfc9c8d58c5d415305db6a28d97709e7a4bec3ec57554f221

data/.rubocop.yml

@@ -0,0 +1,6 @@
+AllCops:
+  Include:
+    - Gemfile
+    - Rakefile
+    - ops_manager_ui_drivers.gemspec
+  TargetRubyVersion: 2.2

data/lib/ops_manager_ui_drivers/version.rb

@@ -1,3 +1,3 @@
 module OpsManagerUiDrivers
-  VERSION = '2.1.4'
+  VERSION = '2.1.5'
 end

data/lib/ops_manager_ui_drivers/version14/state_change_progress.rb

@@ -25,6 +25,8 @@ module OpsManagerUiDrivers
 
       private
 
+      attr_reader :browser
+
       def open_install_progress
         browser.visit '/install' unless install_progress_open?
         browser.fail_early('Install probably aborted immediately') unless install_progress_open?
@@ -34,10 +36,6 @@ module OpsManagerUiDrivers
       def install_progress_open?
         browser.current_path =~ %r(^/+install)
       end
-
-      private
-
-      attr_reader :browser
     end
   end
 end

data/lib/ops_manager_ui_drivers/version15/state_change_progress.rb

@@ -25,6 +25,8 @@ module OpsManagerUiDrivers
 
       private
 
+      attr_reader :browser
+
       def open_install_progress
         browser.visit '/install' unless install_progress_open?
         browser.fail_early('Install probably aborted immediately') unless install_progress_open?
@@ -34,10 +36,6 @@ module OpsManagerUiDrivers
       def install_progress_open?
         browser.current_path =~ %r(^/+install)
       end
-
-      private
-
-      attr_reader :browser
     end
   end
 end

data/lib/ops_manager_ui_drivers/version16/state_change_progress.rb

@@ -25,6 +25,8 @@ module OpsManagerUiDrivers
 
       private
 
+      attr_reader :browser
+
       def open_install_progress
         browser.visit '/install' unless install_progress_open?
         browser.fail_early('Install probably aborted immediately') unless install_progress_open?
@@ -34,10 +36,6 @@ module OpsManagerUiDrivers
       def install_progress_open?
         browser.current_path =~ %r(^/+install)
       end
-
-      private
-
-      attr_reader :browser
     end
   end
 end

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

@@ -10,14 +10,17 @@ module OpsManagerUiDrivers
           @bosh_product_form_section = BoshProductFormSection.new(@browser, 'network_collection[networks_attributes][0]')
         end
 
-        def add_network(name:, iaas_network_identifier:, subnet:, dns:, gateway:, reserved_ip_ranges:)
+        def add_network(name:, subnets:)
           @bosh_product_form_section.open_form('network')
 
           @browser.click_on 'Add Network'
           @bosh_product_form_section.set_fields('name' => name)
 
-          subnet_section = Subnet.new(browser: @browser, network_form: @bosh_product_form_section)
-          subnet_section.add_subnet(iaas_identifier: iaas_network_identifier, subnet: subnet, dns: dns, gateway: gateway, reserved_ip_ranges: reserved_ip_ranges)
+          subnets.each_with_index do |subnet, index|
+            subnet_section = Subnet.new(browser: @browser, network_form: @bosh_product_form_section, subnet_index: index)
+            subnet_section.add_subnet(**subnet.symbolize_keys)
+          end
+
 
           @browser.click_on 'Save'
           @browser.expect(@browser.page).to @browser.have_css(FLASH_MESSAGE_CLASS)

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

@@ -5,20 +5,28 @@ module OpsManagerUiDrivers
         FLASH_MESSAGE_CLASS  = '.flash-message'.freeze
         FLASH_MESSAGE_ERRORS = '.flash-message.error ul.message li'.freeze
 
-        def initialize(browser:, network_form:)
+        def initialize(browser:, network_form:, subnet_index:)
           @browser                   = browser
-          @bosh_product_form_section = BoshProductFormSection.new(@browser, "#{network_form.field_prefix}[subnets][0]")
+          @subnet_index = subnet_index
+          @subnet_form_section =
+            BoshProductFormSection.new(@browser, "#{network_form.field_prefix}[subnets][#{subnet_index}]")
         end
 
-        def add_subnet(iaas_identifier:, subnet:, dns:, gateway:, reserved_ip_ranges:)
-          @bosh_product_form_section.set_fields(
-            'iaas_identifier'    => iaas_identifier,
-            'cidr'               => subnet,
+        def add_subnet(identifier:, cidr:, dns:, gateway:, reserved_ips:, availability_zones:)
+          @browser.click_on 'Add Subnet' if @subnet_index > 0
+
+          @subnet_form_section.set_fields(
+            'iaas_identifier'    => identifier,
+            'cidr'               => cidr,
             'dns'                => dns,
             'gateway'            => gateway,
-            'reserved_ip_ranges' => reserved_ip_ranges,
+            'reserved_ip_ranges' => reserved_ips,
           )
-          @bosh_product_form_section.select_all_az_references_on_page
+
+          availability_zones.each do |availability_zone|
+            @browser.
+              find(:xpath, %Q{//label/input[contains(@name, "#{@subnet_form_section.field_prefix}[availability_zone_references]")]/..}, text: availability_zone).click
+          end
         end
       end
     end

data/lib/ops_manager_ui_drivers/version17/ops_manager_director.rb

@@ -34,7 +34,9 @@ module OpsManagerUiDrivers
         case iaas_type
           when OpsManagerUiDrivers::AWS_IAAS_TYPE, OpsManagerUiDrivers::OPENSTACK_IAAS_TYPE
             return unless iaas_availability_zones
-            availability_zones.add_single_az(iaas_availability_zones.first['iaas_identifier'])
+            iaas_availability_zones && iaas_availability_zones.each do |az|
+              availability_zones.add_az('iaas_identifier' => az['iaas_identifier'])
+            end
           when OpsManagerUiDrivers::VSPHERE_IAAS_TYPE
             iaas_availability_zones && iaas_availability_zones.each do |az|
               availability_zones.add_az('name' => az['name'], 'cluster' => az['cluster'], 'resource_pool' => az['resource_pool'])
@@ -48,11 +50,7 @@ module OpsManagerUiDrivers
         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'],
+            subnets:                 network['subnets'],
           )
         end
       end

data/lib/ops_manager_ui_drivers/version17/state_change_progress.rb

@@ -25,6 +25,8 @@ module OpsManagerUiDrivers
 
       private
 
+      attr_reader :browser
+
       def open_install_progress
         browser.visit '/install' unless install_progress_open?
         browser.fail_early('Install probably aborted immediately') unless install_progress_open?
@@ -34,10 +36,6 @@ module OpsManagerUiDrivers
       def install_progress_open?
         browser.current_path =~ %r(^/+install)
       end
-
-      private
-
-      attr_reader :browser
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_manager_ui_drivers
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors:
 - Pivotal, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -173,6 +173,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
@@ -298,7 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Capybara helpers for configuring Pivotal Ops Manager