ops_manager_ui_drivers 1.19.0 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6890069868254041b2527b22ef42719cb482d27f
-  data.tar.gz: d8c9d974266b68bd166a312474f0eb3f40eea474
+  metadata.gz: 9e890a3afd7e4e227190c75f0c4d9383952e74b3
+  data.tar.gz: b1180e776c99b69fdcea72fc5bc9d2d41c64dfcb
 SHA512:
-  metadata.gz: e6719d625f46df29354d637d8e4e12929f3a9afd95815e2daa82417ee8c790c652ee384335427fb077fcdbd9b9dbf128a2646f4835c8e462f5a2a80b369560a9
-  data.tar.gz: 1e6c0064d22df12045262e95d915bb4a9126595d47bc4709c8875430958a52e9721ef182cb829ac661e36a89fc302ee541d6fd950e412b978907c26697c4a93d
+  metadata.gz: b72c9dbfdc3d16a8eee7154b54284da0c8b907def7fad8c3ceebf2313acb8784c1ac1d5d7e3edf2c70e76029dc8be1b1ecbc99abceb78cb90a2236da538ec7ac
+  data.tar.gz: 9c135b3ecfd131198fbefd542ad49076308caf994b9fad40b552ad85f8ca480e69643739a350022558574e4d6eb3d4dc628d04a63321025c2e81e2c7e2b8dbb0

data/lib/ops_manager_ui_drivers/version.rb

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

data/lib/ops_manager_ui_drivers/version17/ops_manager_director.rb

@@ -13,11 +13,9 @@ module OpsManagerUiDrivers
 
         add_availability_zones(test_settings.iaas_type, test_settings.ops_manager.availability_zones)
 
-        assign_availability_zone(test_settings.iaas_type, test_settings.ops_manager.availability_zones)
-
         add_networks(test_settings)
 
-        assign_networks(test_settings.ops_manager)
+        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)
 
@@ -90,22 +88,21 @@ module OpsManagerUiDrivers
         browser.click_on 'Save'
       end
 
-      def assign_availability_zone(iaas_type, iaas_availability_zones)
-        return unless iaas_availability_zones
+      def assign_azs_and_networks(iaas_type, iaas_availability_zones, ops_manager)
         case iaas_type
           when OpsManagerUiDrivers::AWS_IAAS_TYPE, OpsManagerUiDrivers::OPENSTACK_IAAS_TYPE
-            browser.click_on 'Assign Availability Zones'
+            browser.click_on 'Assign AZs and Networks'
+            browser.select(ops_manager.networks[0]['name'], from: 'Network')
             browser.select(iaas_availability_zones.first['iaas_identifier'])
-            browser.click_on 'Save'
           when OpsManagerUiDrivers::VSPHERE_IAAS_TYPE
-            browser.click_on 'Assign Availability Zones'
+            browser.click_on 'Assign AZs and Networks'
+            browser.select(ops_manager.networks[0]['name'], from: 'Network')
             browser.select(iaas_availability_zones.first['name'])
-            browser.click_on 'Save'
+          when OpsManagerUiDrivers::VCLOUD_IAAS_TYPE
+            browser.click_on 'Assign Networks'
+            browser.select(ops_manager.networks[0]['name'], from: 'Network')
         end
-      end
-
-      def assign_networks(ops_manager)
-        assign_network(ops_manager.networks[0]['name'])
+        browser.click_on 'Save'
       end
 
       def customize_resource_config(resource_config)
@@ -115,13 +112,6 @@ module OpsManagerUiDrivers
         end
       end
 
-      def assign_network(network_name)
-        browser.click_on 'Assign Networks'
-
-        browser.select(network_name, from: 'Network')
-        browser.click_on 'Save'
-      end
-
       def configure_vm_passwords(use_generated_passwords: true)
         browser.click_on 'Security'
         if use_generated_passwords

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ops_manager_ui_drivers
 version: !ruby/object:Gem::Version
-  version: 1.19.0
+  version: 1.20.0
 platform: ruby
 authors:
 - Pivotal, Inc.