ops_manager_ui_drivers 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9ee69f6177cb3e3fe83ddf62efe72e5ed46e7a4
-  data.tar.gz: 826099396b8878c9b0bc796c417a415a0d87a3d4
+  metadata.gz: 5cc64665096fb55bf4c4097208fa246b4eea5e95
+  data.tar.gz: 9e28d0e3a64b55978fb94c5f60ceff93b88b7016
 SHA512:
-  metadata.gz: 0ff6397c37ea12d61420bec5a3f5814dbfc79e917b95d94fb4ed4989393869a33f9da11fa4705b8b65f370dd2d3b2fe600957dda2b8902cee6e74183b7a90021
-  data.tar.gz: 5d932a45e9570dcd74819cee8d120c0789dfca1a619effda8497cd59ce3b9c66142851603df9ed52c83c925da172546523e80858343213f3d2ce86e36ec7507c
+  metadata.gz: 63c1d9dd73f0765a31b53b9010b819d093bed9d2e512c6e339338786ce9cb9f66c768294028d8fe3a7def36b8cecfe875bfd66257a3b62c514ac026395f8c157
+  data.tar.gz: 6d0be672fea9b6d1230095ef036e9ed247a6a0ed5cffd05828a0fd1afd195913e391b2d4fec42a7c591fa3c0284f7147861354dbd682b91a6ebfe19ad5e2a569

data/lib/ops_manager_ui_drivers/version.rb

@@ -1,3 +1,3 @@
 module OpsManagerUiDrivers
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

data/lib/ops_manager_ui_drivers/version15/iaas_configuration.rb

@@ -5,101 +5,24 @@ module OpsManagerUiDrivers
         @browser = browser
       end
 
-      def configure_iaas
-        open_form('iaas_configuration')
-
-        yield
-
-        save_form
-      end
-
-      def set_vsphere_credentials(vcenter_ip:, username:, password:)
-        set_field('vcenter_ip', vcenter_ip)
-        set_field('vcenter_username', username)
-        set_field('vcenter_password', password)
-      end
-
-      def set_vcloud_credentials(vcd_url:, organization:, user:, password:)
-        set_field('vcd_url', vcd_url)
-        set_field('organization', organization)
-        set_field('vcd_username', user)
-        set_field('vcd_password', password)
-      end
-
-      def set_aws_credentials(access_key_id:, secret_access_key:, vpc_id:, security_group:, key_pair_name:, ssh_private_key:)
-        set_field('access_key_id', access_key_id)
-        set_field('secret_access_key', secret_access_key)
-        set_field('vpc_id', vpc_id)
-        set_field('security_group', security_group)
-        set_field('key_pair_name', key_pair_name)
-        set_field('ssh_private_key', ssh_private_key)
-      end
-
-      def set_openstack_credentials(
-        identity_endpoint:,
-          username:,
-          password:,
-          tenant:,
-          security_group_name:,
-          key_pair_name:,
-          ssh_private_key:
-      )
-        set_field('identity_endpoint', identity_endpoint)
-        set_field('username', username)
-        set_field('password', password)
-        set_field('tenant', tenant)
-        set_field('security_group', security_group_name)
-        set_field('key_pair_name', key_pair_name)
-        set_field('ssh_private_key', ssh_private_key)
-      end
-
-
-      def set_datacenter(datacenter)
-        set_field('datacenter', datacenter)
-      end
-
-      def set_datastores(datastores)
-        set_field('datastores_string', datastores)
-      end
-
-      def set_microbosh_vm_folder(microbosh_vm_folder)
-        set_field('microbosh_vm_folder', microbosh_vm_folder)
-      end
-
-      def set_microbosh_template_folder(microbosh_template_folder)
-        set_field('microbosh_template_folder', microbosh_template_folder)
-      end
-
-      def set_microbosh_disk_path(microbosh_disk_path)
-        set_field('microbosh_disk_path', microbosh_disk_path)
-      end
-
-      def set_storage_profile(storage_profile)
-        set_field('storage_profile', storage_profile)
-      end
-
-      def set_catalog_name(catalog_name)
-        set_field('catalog_name', catalog_name)
+      def open_form
+        browser.visit '/'
+        browser.click_on 'show-microbosh-configure-action'
+        browser.click_on 'show-iaas_configuration-action'
       end
 
-      private
-
-      attr_reader :browser
-
       def save_form
         browser.click_on 'Save'
         browser.expect(browser.page).to browser.have_css('.flash-message.success')
       end
 
-      def open_form(form)
-        browser.visit '/'
-        browser.click_on 'show-microbosh-configure-action'
-        browser.click_on "show-#{form}-action"
-      end
-
       def set_field(field, value)
         browser.find_field("iaas_configuration[#{field}]").set(value)
       end
+
+      private
+
+      attr_reader :browser
     end
   end
 end

data/lib/ops_manager_ui_drivers/version15/ops_manager_director.rb

@@ -1,8 +1,11 @@
+require 'ops_manager_ui_drivers/version15/settings'
+
 module OpsManagerUiDrivers
   module Version15
     class OpsManagerDirector
-      def initialize(browser:)
-        @browser = browser
+      def initialize(browser:, iaas_configuration: Version15::IaasConfiguration.new(browser: browser))
+        @browser            = browser
+        @iaas_configuration = iaas_configuration
       end
 
       def configure_microbosh(test_settings)
@@ -20,48 +23,12 @@ module OpsManagerUiDrivers
       end
 
       def configure_iaas(test_settings)
-        case test_settings.iaas_type
-          when OpsManagerUiDrivers::VCLOUD_IAAS_TYPE then
-            configure_vcloud(
-              vcd_url: test_settings.ops_manager.vcloud.creds.url,
-              organization: test_settings.ops_manager.vcloud.creds.organization,
-              user: test_settings.ops_manager.vcloud.creds.user,
-              password: test_settings.ops_manager.vcloud.creds.password,
-              datacenter: test_settings.ops_manager.vcloud.vdc.name,
-              storage_profile: test_settings.ops_manager.vcloud.vdc.storage_profile,
-              catalog_name: test_settings.ops_manager.vcloud.vdc.catalog_name,
-            )
-          when OpsManagerUiDrivers::VSPHERE_IAAS_TYPE then
-            configure_vcenter(
-              ip: test_settings.ops_manager.vcenter.creds.ip,
-              username: test_settings.ops_manager.vcenter.creds.username,
-              password: test_settings.ops_manager.vcenter.creds.password,
-              datacenter: test_settings.ops_manager.vcenter.datacenter,
-              datastores: test_settings.ops_manager.vcenter.datastore,
-              microbosh_vm_folder: test_settings.ops_manager.vcenter.microbosh_vm_folder,
-              microbosh_template_folder: test_settings.ops_manager.vcenter.microbosh_template_folder,
-              microbosh_disk_path: test_settings.ops_manager.vcenter.microbosh_disk_path,
-            )
-          when OpsManagerUiDrivers::AWS_IAAS_TYPE then
-            configure_aws(
-              aws_access_key: test_settings.ops_manager.aws.aws_access_key,
-              aws_secret_key: test_settings.ops_manager.aws.aws_secret_key,
-              vpc_id: test_settings.ops_manager.aws.vpc_id,
-              security_group: test_settings.ops_manager.aws.security_group,
-              key_pair_name: test_settings.ops_manager.aws.key_pair_name,
-              ssh_private_key: test_settings.ops_manager.aws.ssh_key
-            )
-          when OpsManagerUiDrivers::OPENSTACK_IAAS_TYPE then
-            configure_openstack(
-              identity_endpoint: test_settings.ops_manager.openstack.identity_endpoint,
-              username: test_settings.ops_manager.openstack.username,
-              password: test_settings.ops_manager.openstack.password,
-              tenant: test_settings.ops_manager.openstack.tenant,
-              security_group_name: test_settings.ops_manager.openstack.security_group_name,
-              key_pair_name: test_settings.ops_manager.openstack.key_pair_name,
-              ssh_private_key: test_settings.ops_manager.openstack.ssh_private_key
-            )
+        iaas_configuration.open_form
+        iaas_settings = Settings.for(test_settings)
+        iaas_settings.fields.each do |name, value|
+          iaas_configuration.set_field(name, value)
         end
+        iaas_configuration.save_form
       end
 
       def add_azs(iaas_type, iaas_availability_zones)
@@ -99,12 +66,12 @@ module OpsManagerUiDrivers
           else
             iaas_networks && iaas_networks.each do |network|
               networks.add_network(
-                name: network['name'],
+                name:                    network['name'],
                 iaas_network_identifier: network['identifier'],
-                subnet: network['subnet'],
-                reserved_ip_ranges: network['reserved_ips'],
-                dns: network['dns'],
-                gateway: network['gateway'],
+                subnet:                  network['subnet'],
+                reserved_ip_ranges:      network['reserved_ips'],
+                dns:                     network['dns'],
+                gateway:                 network['gateway'],
               )
             end
         end
@@ -161,7 +128,7 @@ module OpsManagerUiDrivers
 
           assign_networks_vsphere(
             infrastructure_network: infrastructure_network['name'],
-            deployment_network: deployment_network['name'],
+            deployment_network:     deployment_network['name'],
           )
         else
           assign_network(deployment_network: ops_manager.networks[0]['name'])
@@ -189,66 +156,9 @@ module OpsManagerUiDrivers
       end
 
       private
-      attr_reader :browser
 
-      def configure_vcenter(ip:, username:, password:, datacenter:, datastores:, microbosh_vm_folder:, microbosh_template_folder:, microbosh_disk_path:)
-        iaas_configuration.configure_iaas do
-          iaas_configuration.set_vsphere_credentials(vcenter_ip: ip, username: username, password: password)
-          iaas_configuration.set_datacenter(datacenter)
-          iaas_configuration.set_datastores(datastores)
-          iaas_configuration.set_microbosh_vm_folder(microbosh_vm_folder)
-          iaas_configuration.set_microbosh_template_folder(microbosh_template_folder)
-          iaas_configuration.set_microbosh_disk_path(microbosh_disk_path)
-        end
-      end
+      attr_reader :browser, :iaas_configuration
 
-      def configure_vcloud(vcd_url:, organization:, user:, password:, datacenter:, storage_profile:, catalog_name:)
-        iaas_configuration.configure_iaas do
-          iaas_configuration.set_vcloud_credentials(vcd_url: vcd_url, organization: organization, user: user, password: password)
-          iaas_configuration.set_datacenter(datacenter)
-          iaas_configuration.set_storage_profile(storage_profile)
-          iaas_configuration.set_catalog_name(catalog_name)
-        end
-      end
-
-      def configure_aws(aws_access_key:, aws_secret_key:, vpc_id:, security_group:, key_pair_name:, ssh_private_key:)
-        iaas_configuration.configure_iaas do
-          iaas_configuration.set_aws_credentials(
-            access_key_id: aws_access_key,
-            secret_access_key: aws_secret_key,
-            vpc_id: vpc_id,
-            security_group: security_group,
-            key_pair_name: key_pair_name,
-            ssh_private_key: ssh_private_key
-          )
-        end
-      end
-
-      def configure_openstack(
-        identity_endpoint:,
-          username:,
-          password:,
-          tenant:,
-          security_group_name:,
-          key_pair_name:,
-          ssh_private_key:
-      )
-        iaas_configuration.configure_iaas do
-          iaas_configuration.set_openstack_credentials(
-            identity_endpoint: identity_endpoint,
-            username: username,
-            password: password,
-            tenant: tenant,
-            security_group_name: security_group_name,
-            key_pair_name: key_pair_name,
-            ssh_private_key: ssh_private_key
-          )
-        end
-      end
-
-      def iaas_configuration
-        @iaas_configuration ||= Version15::IaasConfiguration.new(browser: browser)
-      end
 
       def availability_zones
         @availability_zones ||= Version15::AvailabilityZones.new(browser: browser)

data/lib/ops_manager_ui_drivers/version15/settings.rb

@@ -0,0 +1,116 @@
+module OpsManagerUiDrivers
+  module Version15
+    module Settings
+      def self.for(test_settings)
+        settings_class = [Vcloud, Vsphere, AWS, OpenStack].find do |klass|
+          klass.works_with?(test_settings.iaas_type)
+        end or raise("Unsupported IaaS: #{test_settings.iaas_type.inspect}")
+        settings_class.new(test_settings)
+      end
+
+      class Vcloud
+        def self.works_with?(iaas_type)
+          iaas_type == 'vcloud'
+        end
+
+        def initialize(test_settings)
+          @test_settings = test_settings
+        end
+
+        def fields
+          {
+            'vcd_url'         => test_settings.ops_manager.vcloud.creds.url,
+            'organization'    => test_settings.ops_manager.vcloud.creds.organization,
+            'vcd_username'    => test_settings.ops_manager.vcloud.creds.user,
+            'vcd_password'    => test_settings.ops_manager.vcloud.creds.password,
+            'datacenter'      => test_settings.ops_manager.vcloud.vdc.name,
+            'storage_profile' => test_settings.ops_manager.vcloud.vdc.storage_profile,
+            'catalog_name'    => test_settings.ops_manager.vcloud.vdc.catalog_name,
+          }
+        end
+
+        private
+
+        attr_reader :test_settings
+      end
+
+      class Vsphere
+        def self.works_with?(iaas_type)
+          iaas_type == 'vsphere'
+        end
+
+        def initialize(test_settings)
+          @test_settings = test_settings
+        end
+
+        def fields
+          {
+            'vcenter_ip'                => test_settings.ops_manager.vcenter.creds.ip,
+            'vcenter_username'          => test_settings.ops_manager.vcenter.creds.username,
+            'vcenter_password'          => test_settings.ops_manager.vcenter.creds.password,
+            'datacenter'                => test_settings.ops_manager.vcenter.datacenter,
+            'datastores_string'         => test_settings.ops_manager.vcenter.datastore,
+            'microbosh_vm_folder'       => test_settings.ops_manager.vcenter.microbosh_vm_folder,
+            'microbosh_template_folder' => test_settings.ops_manager.vcenter.microbosh_template_folder,
+            'microbosh_disk_path'       => test_settings.ops_manager.vcenter.microbosh_disk_path,
+          }
+        end
+
+        private
+
+        attr_reader :test_settings
+      end
+
+      class AWS
+        def self.works_with?(iaas_type)
+          iaas_type == 'aws'
+        end
+
+        def initialize(test_settings)
+          @test_settings = test_settings
+        end
+
+        def fields
+          {
+            'access_key_id'     => test_settings.ops_manager.aws.aws_access_key,
+            'secret_access_key' => test_settings.ops_manager.aws.aws_secret_key,
+            'vpc_id'            => test_settings.ops_manager.aws.vpc_id,
+            'security_group'    => test_settings.ops_manager.aws.security_group,
+            'key_pair_name'     => test_settings.ops_manager.aws.key_pair_name,
+            'ssh_private_key'   => test_settings.ops_manager.aws.ssh_key,
+          }
+        end
+
+        private
+
+        attr_reader :test_settings
+      end
+
+      class OpenStack
+        def self.works_with?(iaas_type)
+          iaas_type == 'openstack'
+        end
+
+        def initialize(test_settings)
+          @test_settings = test_settings
+        end
+
+        def fields
+          {
+            'identity_endpoint' => test_settings.ops_manager.openstack.identity_endpoint,
+            'username'          => test_settings.ops_manager.openstack.username,
+            'password'          => test_settings.ops_manager.openstack.password,
+            'tenant'            => test_settings.ops_manager.openstack.tenant,
+            'security_group'    => test_settings.ops_manager.openstack.security_group_name,
+            'key_pair_name'     => test_settings.ops_manager.openstack.key_pair_name,
+            'ssh_private_key'   => test_settings.ops_manager.openstack.ssh_private_key,
+          }
+        end
+
+        private
+
+        attr_reader :test_settings
+      end
+    end
+  end
+end

data/ops_manager_ui_drivers.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'recursive-open-struct'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_manager_ui_drivers
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Pivotal, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2015-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: recursive-open-struct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - cf-tempest-eng+ops_manager_ui_drivers@pivotal.io
@@ -179,6 +193,7 @@ files:
 - lib/ops_manager_ui_drivers/version15/product_logs.rb
 - lib/ops_manager_ui_drivers/version15/product_resource_configuration.rb
 - lib/ops_manager_ui_drivers/version15/product_status_helper.rb
+- lib/ops_manager_ui_drivers/version15/settings.rb
 - lib/ops_manager_ui_drivers/version15/setup.rb
 - lib/ops_manager_ui_drivers/version15/state_change_progress.rb
 - lib/ops_manager_ui_drivers/version15/web_ui.rb