opsmgr 0.33.5 → 0.34.0

data/lib/opsmgr/ui_helpers/add_first_user_spec.rb

@@ -7,8 +7,8 @@ RSpec.describe 'Adding the first user', order: :defined do
   it 'creates the admin user and logs in' do
     poll_up_to_mins(10) do
       current_ops_manager.setup_page.setup_or_login(
-        user: env_settings.ops_manager.username,
-        password: env_settings.ops_manager.password,
+        user: env_settings['ops_manager']['username'],
+        password: env_settings['ops_manager']['password'],
       )
 
       expect(page).to have_content('Installation Dashboard')

data/lib/opsmgr/ui_helpers/config_helper.rb

@@ -47,16 +47,16 @@ module SettingsHelper
   end
 
   def ops_manager_driver
-    configure_capybara(fetch_environment_settings.ops_manager.url)
+    configure_capybara(fetch_environment_settings['ops_manager']['url'])
     case om_version
     when '1.4'
-      om_1_4(fetch_environment_settings.ops_manager.url)
+      om_1_4(fetch_environment_settings['ops_manager']['url'])
     when '1.5'
-      om_1_5(fetch_environment_settings.ops_manager.url)
+      om_1_5(fetch_environment_settings['ops_manager']['url'])
     when '1.6'
-      om_1_6(fetch_environment_settings.ops_manager.url)
+      om_1_6(fetch_environment_settings['ops_manager']['url'])
     when '1.7'
-      om_1_7(fetch_environment_settings.ops_manager.url)
+      om_1_7(fetch_environment_settings['ops_manager']['url'])
     else
       fail "Unsupported Ops Manager Version #{om_version.inspect}"
     end
@@ -67,27 +67,27 @@ module SettingsHelper
     case om_version
     when '1.4'
       api_1_4(
-        host: env_settings.ops_manager.url,
-        username: env_settings.ops_manager.username,
-        password: env_settings.ops_manager.password,
+        host: env_settings['ops_manager']['url'],
+        username: env_settings['ops_manager']['username'],
+        password: env_settings['ops_manager']['password'],
       )
     when '1.5'
       api_1_5(
-        host: env_settings.ops_manager.url,
-        username: env_settings.ops_manager.username,
-        password: env_settings.ops_manager.password,
+        host: env_settings['ops_manager']['url'],
+        username: env_settings['ops_manager']['username'],
+        password: env_settings['ops_manager']['password'],
       )
     when '1.6'
       api_1_6(
-        host: env_settings.ops_manager.url,
-        username: env_settings.ops_manager.username,
-        password: env_settings.ops_manager.password,
+        host: env_settings['ops_manager']['url'],
+        username: env_settings['ops_manager']['username'],
+        password: env_settings['ops_manager']['password'],
       )
     when '1.7'
       api_1_7(
-        host: env_settings.ops_manager.url,
-        username: env_settings.ops_manager.username,
-        password: env_settings.ops_manager.password,
+        host: env_settings['ops_manager']['url'],
+        username: env_settings['ops_manager']['username'],
+        password: env_settings['ops_manager']['password'],
       )
     else
       fail "Unsupported Ops Manager Version #{om_version.inspect}"
@@ -116,7 +116,7 @@ module SettingsHelper
       # Capybara says, "All configuration must take place before the driver starts"
     end
 
-    page.current_window.resize_to(1024, 1600) # avoid overlapping footer spec failures
+    page.current_window.resize_to(1024, 2600) # avoid overlapping footer spec failures
   end
 end
 

data/lib/opsmgr/ui_helpers/delete_installation_spec.rb

@@ -9,8 +9,8 @@ RSpec.describe 'Deleting the installation', order: :defined do
     # let the caller handle the error
     poll_up_to_mins(1) do
       current_ops_manager.setup_page.setup_or_login(
-        user: env_settings.ops_manager.username,
-        password: env_settings.ops_manager.password,
+        user: env_settings['ops_manager']['username'],
+        password: env_settings['ops_manager']['password'],
       )
 
       expect(page).to have_content('Installation Dashboard')

data/lib/opsmgr/ui_helpers/delete_product_if_present_spec.rb

@@ -7,8 +7,8 @@ RSpec.describe 'Deleting a product if it is present', order: :defined do
   it 'creates the admin user and logs in' do
     poll_up_to_mins(10) do
       current_ops_manager.setup_page.setup_or_login(
-        user: env_settings.ops_manager.username,
-        password: env_settings.ops_manager.password,
+        user: env_settings['ops_manager']['username'],
+        password: env_settings['ops_manager']['password'],
       )
 
       expect(page).to have_content('Installation Dashboard')

data/lib/opsmgr/ui_helpers/delete_product_spec.rb

@@ -7,8 +7,8 @@ RSpec.describe 'Deleting a product', order: :defined do
   it 'creates the admin user and logs in' do
     poll_up_to_mins(10) do
       current_ops_manager.setup_page.setup_or_login(
-        user: env_settings.ops_manager.username,
-        password: env_settings.ops_manager.password,
+        user: env_settings['ops_manager']['username'],
+        password: env_settings['ops_manager']['password'],
       )
 
       expect(page).to have_content('Installation Dashboard')

data/lib/opsmgr/ui_helpers/export_installation_spec.rb

@@ -8,8 +8,8 @@ RSpec.describe 'Exporting the installation', order: :defined do
   it 'creates the admin user and logs in' do
     poll_up_to_mins(10) do
       current_ops_manager.setup_page.setup_or_login(
-        user: env_settings.ops_manager.username,
-        password: env_settings.ops_manager.password,
+        user: env_settings['ops_manager']['username'],
+        password: env_settings['ops_manager']['password'],
       )
 
       expect(page).to have_content('Installation Dashboard')

data/lib/opsmgr/ui_helpers/get_latest_install_log_spec.rb

@@ -7,8 +7,8 @@ RSpec.describe 'Getting latest install log', order: :defined do
   it 'creates the admin user and logs in' do
     poll_up_to_mins(10) do
       current_ops_manager.setup_page.setup_or_login(
-        user: env_settings.ops_manager.username,
-        password: env_settings.ops_manager.password,
+        user: env_settings['ops_manager']['username'],
+        password: env_settings['ops_manager']['password'],
       )
 
       expect(page).to have_content('Installation Dashboard')

data/lib/opsmgr/ui_helpers/import_stemcell_spec.rb

@@ -7,8 +7,8 @@ RSpec.describe 'Importing the stemcell', order: :defined do
   it 'creates the admin user and logs in' do
     poll_up_to_mins(10) do
       current_ops_manager.setup_page.setup_or_login(
-        user: env_settings.ops_manager.username,
-        password: env_settings.ops_manager.password,
+        user: env_settings['ops_manager']['username'],
+        password: env_settings['ops_manager']['password'],
       )
 
       expect(page).to have_content('Installation Dashboard')

data/lib/opsmgr/ui_helpers/microbosh/configure_microbosh_spec.rb

@@ -7,8 +7,8 @@ RSpec.describe 'Configuring director', order: :defined do
   it 'creates the admin user and logs in' do
     poll_up_to_mins(10) do
       current_ops_manager.setup_page.setup_or_login(
-        user: env_settings.ops_manager.username,
-        password: env_settings.ops_manager.password,
+        user: env_settings['ops_manager']['username'],
+        password: env_settings['ops_manager']['password'],
       )
 
       expect(page).to have_content('Installation Dashboard')

data/lib/opsmgr/ui_helpers/{import_installation_spec.rb → post_import_configuration_spec.rb}

@@ -1,22 +1,24 @@
 require_relative 'config_helper'
 
-RSpec.describe 'Importing the installation', order: :defined do
+RSpec.describe 'Post-import configuration', order: :defined do
   let!(:current_ops_manager) { ops_manager_driver }
   let!(:env_settings) { fetch_environment_settings }
 
   it 'creates the admin user and logs in' do
     poll_up_to_mins(10) do
       current_ops_manager.setup_page.setup_or_login(
-        user: env_settings.ops_manager.username,
-        password: env_settings.ops_manager.password,
+        user: env_settings['ops_manager']['username'],
+        password: env_settings['ops_manager']['password'],
       )
 
       expect(page).to have_content('Installation Dashboard')
     end
   end
 
-  it 'imports the installation' do
-    current_ops_manager.product_dashboard.import_installation_file(import_file_path)
+  it 'configures the security group' do
+    if env_settings['iaas_type'] != 'vsphere' && env_settings['iaas_type'] != 'vcloud'
+      current_ops_manager.ops_manager_director.configure_security_group(env_settings)
+    end
   end
 end
 # Copyright (c) 2014-2015 Pivotal Software, Inc.

data/lib/opsmgr/ui_helpers/trigger_install_spec.rb

@@ -7,8 +7,8 @@ RSpec.describe 'Triggering Install', order: :defined do
   it 'creates the admin user and logs in' do
     poll_up_to_mins(10) do
       current_ops_manager.setup_page.setup_or_login(
-        user: env_settings.ops_manager.username,
-        password: env_settings.ops_manager.password,
+        user: env_settings['ops_manager']['username'],
+        password: env_settings['ops_manager']['password'],
       )
 
       expect(page).to have_content('Installation Dashboard')

data/lib/opsmgr/ui_helpers/ui_spec_runner.rb

@@ -47,10 +47,8 @@ class UiSpecRunner
     run_spec([spec_path + '/export_installation_spec.rb'])
   end
 
-  def import_installation(import_file)
-    ENV['IMPORT_FILE'] = import_file
-
-    run_spec([spec_path + '/import_installation_spec.rb'])
+  def post_import_configuration
+    run_spec([spec_path + '/post_import_configuration_spec.rb'])
   end
 
   def delete_installation

data/lib/opsmgr/ui_helpers/uncheck_errands_spec.rb

@@ -6,8 +6,8 @@ RSpec.describe 'Unchecking Errands', order: :defined do
 
   it 'logs in' do
     current_ops_manager.setup_page.setup_or_login(
-      user: env_settings.ops_manager.username,
-      password: env_settings.ops_manager.password,
+      user: env_settings['ops_manager']['username'],
+      password: env_settings['ops_manager']['password'],
     )
   end
 

data/lib/opsmgr/ui_helpers/upload_and_add_product_spec.rb

@@ -6,8 +6,8 @@ RSpec.describe 'Uploading and Adding a Product', order: :defined do
 
   it 'logs in' do
     current_ops_manager.setup_page.setup_or_login(
-      user: env_settings.ops_manager.username,
-      password: env_settings.ops_manager.password,
+      user: env_settings['ops_manager']['username'],
+      password: env_settings['ops_manager']['password'],
     )
   end
 

data/lib/opsmgr/ui_helpers/upload_and_upgrade_product_spec.rb

@@ -6,8 +6,8 @@ RSpec.describe 'Uploading and Upgrading a Product', order: :defined do
 
   it 'logs in' do
     current_ops_manager.setup_page.setup_or_login(
-      user: env_settings.ops_manager.username,
-      password: env_settings.ops_manager.password,
+      user: env_settings['ops_manager']['username'],
+      password: env_settings['ops_manager']['password'],
     )
   end
 

data/lib/opsmgr/version.rb

@@ -1,5 +1,5 @@
 module Opsmgr
-  VERSION = '0.33.5'
+  VERSION = '0.34.0'
 end
 # Copyright (c) 2014-2015 Pivotal Software, Inc.
 # All rights reserved.

data/sample_env_files/aws.yml

@@ -40,6 +40,7 @@ ops_manager:
     aws_secret_key: {{iam_aws_secret_access_key}}
     vpc_id: {{vpc}}
     security_group: {{vms_security_group_name}}
+    security_group_id: {{vms_security_group_id}}
     key_pair_name: {{ssh_key_pair_name}}
     region: {{region}}
     ssh_key: _KEY_

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opsmgr
 version: !ruby/object:Gem::Version
-  version: 0.33.5
+  version: 0.34.0
 platform: ruby
 authors:
 - Release Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -100,28 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: ops_manager_ui_drivers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.25.0
+        version: 2.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.25.0
+        version: 2.4.2
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-scp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -318,7 +332,6 @@ files:
 - README.md
 - lib/opsmgr.rb
 - lib/opsmgr/api/client.rb
-- lib/opsmgr/api/endpoints_factory.rb
 - lib/opsmgr/api/http_client.rb
 - lib/opsmgr/api/results.rb
 - lib/opsmgr/api/version20/endpoints.rb
@@ -356,9 +369,9 @@ files:
 - lib/opsmgr/ui_helpers/delete_product_spec.rb
 - lib/opsmgr/ui_helpers/export_installation_spec.rb
 - lib/opsmgr/ui_helpers/get_latest_install_log_spec.rb
-- lib/opsmgr/ui_helpers/import_installation_spec.rb
 - lib/opsmgr/ui_helpers/import_stemcell_spec.rb
 - lib/opsmgr/ui_helpers/microbosh/configure_microbosh_spec.rb
+- lib/opsmgr/ui_helpers/post_import_configuration_spec.rb
 - lib/opsmgr/ui_helpers/trigger_install_spec.rb
 - lib/opsmgr/ui_helpers/ui_spec_runner.rb
 - lib/opsmgr/ui_helpers/uncheck_errands_spec.rb

data/lib/opsmgr/api/endpoints_factory.rb

@@ -1,39 +0,0 @@
-require 'net/http'
-require 'opsmgr/api/version20/endpoints'
-
-module Opsmgr
-  module Api
-    class EndpointsFactory
-      def self.create(environment)
-        req = Net::HTTP::Get.new('/api/api_version')
-        uri = URI.parse(environment.settings.ops_manager.url)
-        req.basic_auth(environment.settings.ops_manager.username, environment.settings.ops_manager.password)
-
-        response = http(uri).request(req)
-
-        api_version = JSON.parse(response.body).fetch('version')
-        case api_version
-        when '2.0'
-          return Opsmgr::Api::Version20::Endpoints.new
-        end
-      end
-
-      def self.http(uri)
-        http = Net::HTTP.new(uri.host, uri.port)
-        if uri.scheme == 'https'
-          http.use_ssl = true
-          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        end
-        http
-      end
-    end
-  end
-end
-# 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.