prof 0.30.9 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11815a7256e98b3cafa2457002ca2ec8be15cc3c
-  data.tar.gz: 5ca41a9f3b2d136c69b12474cc120e1134a1857c
+  metadata.gz: b3f721a22a15e1e43787f06eca04043967708dbf
+  data.tar.gz: b103d0f59b6c348a6ca73bd41e1586ae4cacc422
 SHA512:
-  metadata.gz: cda6f663a1679a7dbdf6860dce69633f7e63bfd848ba8276842cb75237af79aafd797749caef085ffe53c0959be407bb443e961d8c9fa3bd8fe35f5dfab610cb
-  data.tar.gz: 50b59b5892d19370606f44df2c2c0a334e5f1d3ae818f7e7990e4dcb242a3cc42ece04024f9afbc28bf1f2fb624b7ed604961ea135c91da07eab95186792bc8b
+  metadata.gz: 1bcf83b410f896d6fcdf9b761dd5f5d740fc937d0a809eb5bf8f3cb4030a24f40c73d18505cb07ef8d279803f1f1765297a4b19db12dcecc186159fd3cecefcf
+  data.tar.gz: 77e87a6b300443b961d43802e7a49e1c4648735b9cfd780ebd618d59c8f1263710f0c9b68ba5fd5a3e668119f32fb026a620c3aef009f76b37088301488e3c4b

data/lib/prof/environment/pcf_drinks.rb

@@ -14,7 +14,6 @@ require 'capybara'
 
 require 'prof/cloud_foundry'
 require 'prof/ops_manager'
-require 'prof/ops_manager_log_fetcher'
 require 'prof/ssh_gateway'
 require 'prof/uaa_client'
 
@@ -23,41 +22,40 @@ module Prof
     class NoDirectorVm < StandardError; end
 
     class PcfDrinks
-      def initialize(tempest_config, page: default_capybara_session)
+      def initialize(tempest_config)
         @tempest_config = tempest_config
-        @page           = page
       end
 
       def ops_manager
-        @ops_manager ||= OpsManager.new(ops_manager_config.merge(page: page))
+        @ops_manager ||= OpsManager.new(environment_name: ENV.fetch('TEMPEST_ENVIRONMENT'), version: ENV.fetch('OM_VERSION'))
       end
 
-      def cloud_foundry(credentials_identifier="admin_credentials")
+      def cloud_foundry
         @cloud_foundry ||= CloudFoundry.new(
           domain:   cloud_foundry_domain,
-          username: cloud_foundry_credentials(credentials_identifier).username,
-          password: cloud_foundry_credentials(credentials_identifier).password
+          username: ops_manager.cf_admin_credentials.username,
+          password: ops_manager.cf_admin_credentials.password
         )
       end
 
       def cloud_foundry_domain
-        tempest_config.fetch(:cloudfoundry).fetch(:domain)
+        tempest_config.fetch('cloudfoundry').fetch('domain')
       end
 
       def bosh_director
         @bosh_director ||= Hula::BoshDirector.new(
           target_url:  bosh_director_url,
-          username:    bosh_credentials.fetch('identity'),
+          username:    ops_manager.bosh_credentials.fetch('identity'),
           password:    bosh_credentials.fetch('password')
         )
       end
 
       def ssh_gateway
         SshGateway.new(
-          gateway_host:     ssh_gateway_config.fetch(:host),
-          gateway_username: ssh_gateway_config.fetch(:username),
-          gateway_password: ssh_gateway_config[:password],
-          ssh_key:          ssh_gateway_config[:ssh_key]
+          gateway_host:     ssh_gateway_config.fetch('host'),
+          gateway_username: ssh_gateway_config.fetch('username'),
+          gateway_password: ssh_gateway_config['password'],
+          ssh_key:          ssh_gateway_config['ssh_key']
         )
       end
 
@@ -77,15 +75,6 @@ module Prof
         Capybara::Session.new(Capybara.default_driver)
       end
 
-      def log_fetcher
-        OpsManagerLogFetcher.new(
-          ssh_gateway: ssh_gateway,
-          host:        ops_manager_hostname,
-          username:    ops_manager_vm_config.fetch(:username),
-          password:    ops_manager_vm_config.fetch(:password)
-        )
-      end
-
       def cloud_controller_client_credentials
         @cloud_controller_client_credentials ||= ops_manager.cc_client_credentials
       end
@@ -109,47 +98,24 @@ module Prof
       end
 
       def ops_manager_hostname
-        URI.parse(ops_manager_config.fetch(:url)).hostname
+        URI.parse(ops_manager_config.fetch('url')).hostname
       end
 
       def ops_manager_config
-        tempest_config.fetch(:tempest)
-      end
-
-      def ops_manager_vm_config
-        tempest_config.fetch(:tempest_vm)
+        tempest_config.fetch('tempest')
       end
 
       def ssh_gateway_config
-        tempest_config.fetch(:proxy)
+        tempest_config.fetch('proxy')
       end
 
-      def bosh_director_url
-        return URI("https://127.0.0.1:#{forwarded_bosh_port}").to_s if !tempest_config[:proxy].nil?
+      def bosh_director_urlo
+        return URI("https://127.0.0.1:#{forwarded_bosh_port}").to_s if !tempest_config['proxy'].nil?
         return director.hostname
       end
 
-      def bosh_product
-        # old versions of OpsMan (< v1.6 RC4)
-        @bosh_product ||= ops_manager
-                          .send(:opsmanager_client)
-                          .send(:product, 'microbosh')
-
-        # newer versions of OpsMan (>= v1.6 RC4)
-        @bosh_product ||= ops_manager
-                          .send(:opsmanager_client)
-                          .send(:product, 'p-bosh')
-      end
-
       def bosh_credentials
-        # TODO: push this code into ops manager
-        @bosh_credentials ||= bosh_product
-                              .job_of_type('director')
-                              .properties.fetch('director_credentials')
-      end
-
-      def cloud_foundry_credentials(credentials_identifier)
-        @cloud_foundry_credentials ||= ops_manager.cf_uaa_credentials(credentials_identifier)
+        @bosh_credentials = ops_manager.bosh_credentials
       end
     end
   end

data/lib/prof/external_spec/helpers/capybara.rb

@@ -24,6 +24,7 @@ module Prof
           ::Capybara.default_driver    = driver
           ::Capybara.javascript_driver = driver
 
+
           ::Capybara.register_driver :poltergeist do |app|
             ::Capybara::Poltergeist::Driver.new(
               app,
@@ -37,6 +38,10 @@ module Prof
           end
 
           ::Capybara.register_driver :webkit do |app|
+            ::Capybara::Webkit.configure do |config|
+              config.block_unknown_urls
+            end
+
             ::Capybara::Webkit::Driver.new(app).tap do |d|
               d.browser.ignore_ssl_errors
               d.browser.allow_url('*')

data/lib/prof/external_spec/helpers/file_helper.rb

@@ -14,20 +14,14 @@ module Prof
   module ExternalSpec
     module Helpers
       module FileHelper
-        def root_path
-          defined?(ROOT_PATH) ? ROOT_PATH : Dir.pwd
-        end
 
         def file_path(relative_to_root)
-          File.expand_path(relative_to_root, root_path)
+          root_path = defined?(ROOT_PATH) ? ROOT_PATH : Dir.pwd
+          File.expand_path(relative_to_root, )
         end
 
         def json_contents(relative_to_root)
-          JSON.parse(file_contents(relative_to_root), symbolize_names: true)
-        end
-
-        def file_contents(relative_to_root)
-          File.read(file_path(relative_to_root))
+          raise 'Please use YAML.load_file() instead. See example in p-rabbitmq'
         end
       end
     end

data/lib/prof/external_spec/spec_helper.rb

@@ -8,28 +8,33 @@
 # USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
+require 'opsmgr/ui_helpers/config_helper'
 require 'prof/external_spec/helpers/capybara'
-require 'prof/external_spec/helpers/debug'
 require 'prof/external_spec/helpers/file_helper'
 require 'prof/external_spec/helpers/product_path'
 
 require 'rspec_junit_formatter'
+require 'capybara/webkit'
+require 'opsmgr/log'
+require 'pry'
+
+Opsmgr::Log.stdout_mode!
 
 RSpec.configure do |config|
+  config.formatter = :documentation
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
   config.include Prof::ExternalSpec::Helpers::Capybara
-  config.include Prof::ExternalSpec::Helpers::Debug
   config.include Prof::ExternalSpec::Helpers::FileHelper
   config.include Prof::ExternalSpec::Helpers::ProductPath
 
   config.add_formatter RSpecJUnitFormatter, 'rspec.xml'
 
   config.full_backtrace = true
+  config.fail_fast = false
 
   config.before(:all) do
     setup_browser(:webkit)
   end
-
-  config.after(:each) do |example|
-    save_exception_output(example)
-  end
 end

data/lib/prof/ops_manager.rb

@@ -7,136 +7,62 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 # USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
-
-require 'capybara'
-require 'opsmanager_client/client'
-require 'forwardable'
-
-require 'prof/ops_manager/web_app_internals'
-require 'prof/ops_manager/rails_500_error'
-require 'prof/tile'
-require 'json'
+require 'opsmgr/api/client'
+require 'opsmgr/environments'
+require 'ostruct'
 
 module Prof
   class OpsManager
-    extend Forwardable
+    def initialize(environment_name:, version: "1.7")
+      @api = Opsmgr::Api::Client.new(
+        Opsmgr::Environments.for(environment_name),
+        version
+      )
 
-    def initialize(url:, username:, password:, page: default_capybara_session, log_fetcher: null_log_fetcher, version: "1.6")
-      @url         = url
-      @username    = username
-      @password    = password
-      @page        = page
-      @log_fetcher = log_fetcher
-      @version     = Gem::Version.new(version)
+      @api_installation_settings = @api.installation_settings
     end
 
     attr_reader :url
 
-    def_delegators :web_app_internals,
-                   :apply_changes
-
-    def_delegators :opsmanager_client,
-                   :cc_client_credentials,
-                   :cf_admin_credentials,
-                   :cf_uaa_credentials,
-                   :cf_installed?,
-                   :delete_unused_products,
-                   :system_domain,
-                   :upgrade_product,
-                   :vms_for_job_type
-
-    def_delegators :dashboard,
-                   :apply_setting,
-                   :tile,
-                   :tile_configuration,
-                   :tile_configure
-
-    # Add ability to get hold of the capybara session
-    # while transitioning code over to page objects
-    def browser(&_block)
-      yield page, url
-    end
-
-    def uninstall_tile(*tile_or_tiles)
-      tiles = Array(tile_or_tiles).flatten
-      return if tiles.empty?
-
-      tiles.each { |t| web_app_internals.tile_uninstall(t) }
-      web_app_internals.apply_changes
+    def cf_admin_credentials
+      OpenStruct.new({
+        'username' => 'admin',
+        'password' => @api_installation_settings.uaa_admin_password
+      })
     end
-    alias_method :uninstall_tiles, :uninstall_tile
 
-    def setup_tile(tile)
-      puts "Adding #{tile.name}"
-      add_tile(tile)
-
-      puts "Installing update"
-      apply_changes
-    rescue Rails500Error => e
-      puts "FAILED: '#{e.message}'\n"
-      logs = log_fetcher.fetch_logs('production.log', 500)
-      raise Rails500Error, "#{e.message}\n---------------\n#{logs}"
+    def bosh_credentials
+      {
+        'identity' => 'director',
+        'password' => @api_installation_settings.director_password
+      }
     end
 
-    def add_tile(tile)
-      opsmanager_client.add_product(tile)
+    def system_domain
+      @api_installation_settings.system_domain
     end
 
-    def upload_product(product)
-      puts "Uploading product #{product.name}"
-      opsmanager_client.upload_product(product)
-      Tile.new(name: product.name, version: product.version)
-    end
+    def vms_for_job_type(job_type)
+      manifest = @api_installation_settings.as_hash
 
-    def product_tiles
-      tiles.reject{|t| ['cf', 'microbosh', 'p-bosh'].include?(t.name) }
-    end
+      product = get_product_for_job(manifest, job_type)
+      ips = @api_installation_settings.ips_for_job(product_name: product['identifier'], job_name: job_type)
+      vm_credentials = product["jobs"].detect { |job| job["installation_name"] == job_type }['vm_credentials']
 
-    def tiles
-      opsmanager_client.send(:installed_products).map {|tempest_product|
-        Tile.new(
-          name:    tempest_product.type,
-          version: tempest_product.version,
-          guid:    tempest_product.guid
+      ips.map do |ip|
+        OpenStruct.new(
+          :hostname => ip,
+          :username => vm_credentials.fetch("identity"),
+          :password => vm_credentials.fetch("password")
         )
-      }
-    end
-
-    def vms_for_job_type(job_type)
-      opsmanager_client.vms_for_job_type(job_type)
+      end
     end
 
     private
 
-    attr_reader :username, :password, :page, :log_fetcher, :version
-
-    def default_capybara_session
-      Capybara::Session.new(Capybara.default_driver)
-    end
-
-    def web_app_internals
-      @web_app_internals ||= WebAppInternals.new(dashboard, opsmanager_client, page, url)
-    end
-
-    def opsmanager_client
-      @opsmanager_client ||= ::OpsmanagerClient::Client.new(url, username, password)
-    end
-
-    def dashboard
-      @dashboard ||= login_page.login.tap { page.visit(url) unless page.current_url == url }
-    end
-
-    def login_page
-      @login_page ||= WebAppInternals::Page::Login.new(page: page, url: url, username: username, password: password, version: version)
-    end
-
-    def null_log_fetcher
-      NullLogFetcher.new
-    end
-
-    class NullLogFetcher
-      def fetch_logs(_, _)
-        return 'No Log fetcher configured.'
+    def get_product_for_job(manifest, job_type)
+      manifest["products"].detect do |product|
+        product['jobs'].any? { |job| job['identifier'] == job_type }
       end
     end
   end

data/lib/prof/version.rb

@@ -9,5 +9,5 @@
 #
 
 module Prof
-  VERSION = '0.30.9'
+  VERSION = '0.31.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prof
 version: !ruby/object:Gem::Version
-  version: 0.30.9
+  version: 0.31.0
 platform: ruby
 authors:
 - CF London
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem-release
@@ -305,19 +305,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: opsmanager_client
+  name: opsmgr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.5
+        version: 0.34.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.5
+        version: 0.34.17
 description: A gem to test Cloud Foundry service brokers
 email:
 - cf-london@pivotallabs.com
@@ -331,7 +331,6 @@ files:
 - lib/prof/environment/pcf_drinks.rb
 - lib/prof/environment_manager.rb
 - lib/prof/external_spec/helpers/capybara.rb
-- lib/prof/external_spec/helpers/debug.rb
 - lib/prof/external_spec/helpers/file_helper.rb
 - lib/prof/external_spec/helpers/product_path.rb
 - lib/prof/external_spec/shared_examples/deployment.rb
@@ -345,23 +344,6 @@ files:
 - lib/prof/matchers/ssl.rb
 - lib/prof/matchers/tile_configuration.rb
 - lib/prof/ops_manager.rb
-- lib/prof/ops_manager/rails_500_error.rb
-- lib/prof/ops_manager/web_app_internals.rb
-- lib/prof/ops_manager/web_app_internals/page/checkbox_field.rb
-- lib/prof/ops_manager/web_app_internals/page/click_field.rb
-- lib/prof/ops_manager/web_app_internals/page/dashboard.rb
-- lib/prof/ops_manager/web_app_internals/page/flash_message.rb
-- lib/prof/ops_manager/web_app_internals/page/form.rb
-- lib/prof/ops_manager/web_app_internals/page/form_error.rb
-- lib/prof/ops_manager/web_app_internals/page/form_field.rb
-- lib/prof/ops_manager/web_app_internals/page/form_fields.rb
-- lib/prof/ops_manager/web_app_internals/page/installation_progress.rb
-- lib/prof/ops_manager/web_app_internals/page/login.rb
-- lib/prof/ops_manager/web_app_internals/page/modal.rb
-- lib/prof/ops_manager/web_app_internals/page/rails_500.rb
-- lib/prof/ops_manager/web_app_internals/page/select_field.rb
-- lib/prof/ops_manager/web_app_internals/page/tile_settings.rb
-- lib/prof/ops_manager_log_fetcher.rb
 - lib/prof/product.rb
 - lib/prof/pushed_test_app.rb
 - lib/prof/service_instance.rb
@@ -396,7 +378,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A gem to test CF service brokers

data/lib/prof/external_spec/helpers/debug.rb

@@ -1,53 +0,0 @@
-# Copyright (c) 2014-2015 Pivotal Software, Inc.
-# All rights reserved.
-# THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-# INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-# PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-# USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-module Prof
-  module ExternalSpec
-    module Helpers
-      module Debug
-
-        def recording_exceptions
-          yield
-        rescue Exception => ex
-          @recorded_exception = ex
-          raise
-        end
-
-        def save_exceptions
-          yield
-        rescue Exception => ex
-          ops_manager.browser do |page|
-            name = "failure"
-            puts "Saving failure data for '#{name}'"
-            page.save_page("#{name}.html")
-            page.save_screenshot("#{name}.png")
-          end
-          raise
-        end
-
-        def save_exception_output(example)
-          unless @recorded_exception
-            return unless example.respond_to?(:exception)
-            return unless example.respond_to?(:full_description)
-            return unless respond_to?(:ops_manager)
-            return unless example.exception
-          end
-
-          ops_manager.browser do |page|
-            name = example.full_description.gsub(/\W/, '_')
-            puts "Saving failure data for '#{name}'"
-            page.save_page("#{name}.html")
-            page.save_screenshot("#{name}.png")
-          end
-        end
-      end
-    end
-  end
-end

data/lib/prof/ops_manager/rails_500_error.rb

@@ -1,15 +0,0 @@
-# Copyright (c) 2014-2015 Pivotal Software, Inc.
-# All rights reserved.
-# THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-# INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-# PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-# USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-module Prof
-  class OpsManager
-    class Rails500Error < StandardError; end
-  end
-end

data/lib/prof/ops_manager/web_app_internals/page/checkbox_field.rb

@@ -1,38 +0,0 @@
-# Copyright (c) 2014-2015 Pivotal Software, Inc.
-# All rights reserved.
-# THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-# INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-# PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-# USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-require 'prof/ops_manager/web_app_internals/page/form_field'
-
-module Prof
-  class OpsManager
-    class WebAppInternals
-      module Page
-        class CheckboxField < FormField
-          def initialize(name:, value:, checked:)
-            super(name: name, value: value)
-            @checked = checked
-          end
-
-          private
-
-          attr_reader :checked
-
-          def selector
-            super + "[value$='#{value}']"
-          end
-
-          def set_value(field)
-            field.set(checked)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/prof/ops_manager/web_app_internals/page/click_field.rb

@@ -1,40 +0,0 @@
-# Copyright (c) 2014-2015 Pivotal Software, Inc.
-# All rights reserved.
-# THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-# INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-# PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-# USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-require 'prof/ops_manager/web_app_internals/page/form_field'
-
-module Prof
-  class OpsManager
-    class WebAppInternals
-      module Page
-        class ClickField < FormField
-          def initialize(name:, expected_state: )
-            super(name: name, value: nil)
-            @expected_state = expected_state
-          end
-
-          private
-
-          attr_reader :expected_state
-
-          def selector
-            super + ":not([type=hidden])"
-          end
-
-          def set_value(field)
-            unless field.checked? == expected_state
-              field.click
-            end
-          end
-        end
-      end
-    end
-  end
-end