opsmgr 0.33.5 → 0.34.0

data/lib/opsmgr/cmd/bosh_command.rb

@@ -1,10 +1,15 @@
+require 'backport_refinements'
+using OpsManagerUiDrivers::BackportRefinements
+
 require 'opsmgr/ui_helpers/ui_spec_runner'
 require 'opsmgr/environments'
+require 'opsmgr/api/client'
 require 'ops_manager_ui_drivers'
 require 'capybara'
 require 'capybara/dsl'
 require 'capybara/webkit'
 require 'net/ssh/gateway'
+require 'net/scp'
 
 module Opsmgr
   module Cmd
@@ -18,27 +23,22 @@ module Opsmgr
         @env_name = env_name
         @om_version = om_version
         @current_ops_manager = setup_or_login
+
+        configure_client_credentials
       end
 
       def command
         ip = ENV['DIRECTOR_IP_OVERRIDE'] || director_ip
 
-        %W(
-          bosh
-          -t #{ip}
-          -u director
-          -p #{director_password}
-        ).join(' ')
-      end
-
-      def target
-        ip = ENV['DIRECTOR_IP_OVERRIDE'] || director_ip
+        if Gem::Version.new(om_version) >= Gem::Version.new('1.7')
+          return "BOSH_CLIENT=#{@bosh_client} BOSH_CLIENT_SECRET=#{@bosh_client_secret} bosh -t #{ip} --ca-cert #{root_cert_file}"
+        end
 
         %W(
           bosh
+          -t #{ip}
           -u director
           -p #{director_password}
-          target #{ip}
         ).join(' ')
       end
 
@@ -46,9 +46,9 @@ module Opsmgr
         status_page = current_ops_manager.product_status_for(director_tile_name)
 
         partitioned_job_name = 'director-partition-null-az'
-        availability_zones = env_settings.ops_manager.availability_zones
+        availability_zones = env_settings['ops_manager']['availability_zones']
         if availability_zones
-          az_name = availability_zones.first.iaas_identifier || 'first-az'
+          az_name = availability_zones.first['iaas_identifier'] || 'first-az'
           partitioned_job_name = "director-partition-#{current_ops_manager.availability_zone_guid_for_name(az_name)}"
         end
 
@@ -59,12 +59,49 @@ module Opsmgr
 
       private
 
+      def configure_client_credentials
+        return unless Gem::Version.new(om_version) >= Gem::Version.new('1.7')
+
+        installation_settings = Opsmgr::Api::Client.new(Opsmgr::Environments.for(@env_name), @om_version).installation_settings.as_hash
+        uaa_credentials = installation_settings['products'].find { |p| p['identifier'] == 'p-bosh' }['uaa_credentials']
+
+
+        @bosh_client = uaa_credentials['identity']
+        @bosh_client_secret = uaa_credentials['password']
+      end
+
+      def root_cert_file
+        @root_cert_file_name ||= begin
+          Net::SCP.download!(
+            env_settings['ops_manager']['url'].gsub('https://', '').gsub('/', ''),
+            'ubuntu',
+            '/var/tempest/workspaces/default/root_ca_certificate',
+            filename,
+            ssh: { password: 'tempest', key_data: ops_manager_ssh_key }
+          )
+          filename
+        end
+      end
+
+      def filename
+        ENV.fetch('TMPDIR', '/tmp') + '/root_ca_certificate'
+      end
+
+      def ops_manager_ssh_key
+        case @env_settings.dig('iaas_type')
+        when 'aws'
+          @env_settings.dig('ops_manager', 'aws', 'ssh_key')
+        when 'openstack'
+          @env_settings.dig('ops_manager', 'openstack', 'ssh_private_key')
+        end
+      end
+
       def setup_or_login
         driver = ops_manager_driver(om_version)
 
         driver.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'],
         )
         driver
       end
@@ -73,12 +110,12 @@ module Opsmgr
         Capybara.configure do |c|
           c.default_driver = :webkit
           c.run_server = false
-          c.app_host = env_settings.ops_manager.url
+          c.app_host = env_settings['ops_manager']['url']
         end
 
         Capybara::Webkit.configure do |c|
           c.ignore_ssl_errors = true
-          c.allow_url(env_settings.ops_manager.url)
+          c.allow_url(env_settings['ops_manager']['url'])
         end
 
         page.current_window.resize_to(1024, 1600) # avoid overlapping footer spec failures
@@ -141,67 +178,6 @@ module Opsmgr
 
       attr_reader :env_settings, :om_version, :current_ops_manager
     end
-
-    class IaasGateway
-      def initialize(bosh_command:, environment_name:, logger:)
-        @bosh_command = bosh_command
-        @environment = Opsmgr::Environments.for(environment_name)
-        @logger = logger
-      end
-
-      def gateway(&block)
-        case environment.settings.iaas_type
-        when 'vsphere'
-          block.call
-        when 'aws', 'openstack'
-          ssh_key_gateway(block)
-        when 'vcloud'
-          ssh_password_gateway(block)
-        end
-      end
-
-      private
-
-      attr_reader :bosh_command, :environment, :logger
-
-      def ssh_password_gateway(block)
-        ENV['DIRECTOR_IP_OVERRIDE'] = 'localhost'
-        uri = URI.parse(environment.settings.ops_manager.url)
-        director_ip = bosh_command.director_ip
-        logger.info("Setting up SSH gateway to OpsManager at #{uri.host}")
-        Net::SSH::Gateway.new(
-          uri.host,
-          'ubuntu',
-          password: 'tempest'
-        ).open(director_ip, 25_555, 25_555) do |_|
-          logger.info("Opened tunnel to Director at #{director_ip}")
-          block.call
-        end
-      end
-
-      def ssh_key_gateway(block)
-        ENV['DIRECTOR_IP_OVERRIDE'] = 'localhost'
-        uri = URI.parse(environment.settings.ops_manager.url)
-        director_ip = bosh_command.director_ip
-        Net::SSH::Gateway.new(
-          uri.host,
-          'ubuntu',
-          key_data: [ssh_key]
-        ).open(director_ip, 25_555, 25_555) do |_|
-          logger.info("Opened tunnel to Director at #{director_ip}")
-          block.call
-        end
-      end
-
-      def ssh_key
-        case environment.settings.iaas_type
-        when 'aws'
-          environment.settings.ops_manager.aws.ssh_key
-        when 'openstack'
-          environment.settings.ops_manager.openstack.ssh_private_key
-        end
-      end
-    end
   end
 end
 # Copyright (c) 2014-2015 Pivotal Software, Inc.

data/lib/opsmgr/cmd/ops_manager.rb

@@ -1,3 +1,6 @@
+require 'backport_refinements'
+using OpsManagerUiDrivers::BackportRefinements
+
 require 'opsmgr/log'
 
 module Opsmgr
@@ -18,9 +21,9 @@ module Opsmgr
         return if result['infrastructure']['type'] != 'vsphere'
 
         result['infrastructure']['file_system'] = {
-          'microbosh_vm_folder' => environment.settings.name,
-          'microbosh_template_folder' => environment.settings.name,
-          'microbosh_disk_path' => environment.settings.name,
+          'microbosh_vm_folder' => environment.settings.dig('name'),
+          'microbosh_template_folder' => environment.settings.dig('name'),
+          'microbosh_disk_path' => environment.settings.dig('name'),
         }
 
         file = Tempfile.new('om_install_settings')
@@ -85,7 +88,7 @@ module Opsmgr
       end
 
       def import_installation(client, path)
-        result = client.import_installation(path, environment.settings.ops_manager.password)
+        result = client.import_installation(path, environment.settings.dig('ops_manager', 'password'))
         if result.success?
           log.info 'Successfully imported installation'
         else

data/lib/opsmgr/environments.rb

@@ -1,4 +1,5 @@
-require 'recursive-open-struct'
+require 'backport_refinements'
+using OpsManagerUiDrivers::BackportRefinements
 
 require 'active_support'
 require 'active_support/core_ext'
@@ -51,9 +52,9 @@ module Opsmgr
       file_system = installation_settings['infrastructure']['file_system']
 
       settings_to_modify = settings
-      settings_to_modify.vm_shepherd.vm_configs[0].cleanup.datacenter_folders_to_clean << file_system['microbosh_vm_folder']
-      settings_to_modify.vm_shepherd.vm_configs[0].cleanup.datacenter_folders_to_clean << file_system['microbosh_template_folder']
-      settings_to_modify.vm_shepherd.vm_configs[0].cleanup.datastore_folders_to_clean  << file_system['microbosh_disk_path']
+      settings_to_modify.dig('vm_shepherd', 'vm_configs', 0, 'cleanup', 'datacenter_folders_to_clean') << file_system['microbosh_vm_folder']
+      settings_to_modify.dig('vm_shepherd', 'vm_configs', 0, 'cleanup', 'datacenter_folders_to_clean') << file_system['microbosh_template_folder']
+      settings_to_modify.dig('vm_shepherd', 'vm_configs', 0, 'cleanup', 'datastore_folders_to_clean') << file_system['microbosh_disk_path']
       settings_to_modify
     end
 
@@ -63,7 +64,35 @@ module Opsmgr
         raise "Specified name #{@env_name} does not match name in #{@config_path}"
       end
 
-      RecursiveOpenStruct.new(string_keyed_hash, recurse_over_arrays: true)
+      fix_subnets(string_keyed_hash)
+    end
+
+    private
+
+    def fix_subnets(settings)
+      settings['ops_manager']['networks'].each do |n|
+        next if n['subnets']
+        availability_zones = settings['ops_manager']['availability_zones'] || []
+        n['subnets'] = [
+          {
+            'identifier' => n['identifier'],
+            'cidr' => n['subnet'],
+            'dns' => n['dns'],
+            'gateway' => n['gateway'],
+            'reserved_ips' => n['reserved_ips'],
+            'availability_zones' => availability_zones.map { |z| z['name'] }
+          }
+        ]
+      end
+
+      if settings['vm_shepherd']['env_config']
+        outputs = settings['vm_shepherd']['env_config']['outputs']
+        unless outputs['subnets']
+          outputs['subnets'] = [outputs['public_subnet_id'], outputs['private_subnet_id']]
+        end
+      end
+
+      settings
     end
   end
 end

data/lib/opsmgr/errand_runner.rb

@@ -3,8 +3,7 @@ require 'open3'
 
 module Opsmgr
   class ErrandRunner
-    def initialize(iaas_gateway:, bosh_command:, environment_name:, logger:, product_name:, errand_name:, download_logs:)
-      @iaas_gateway = iaas_gateway
+    def initialize(bosh_command:, environment_name:, logger:, product_name:, errand_name:, download_logs:)
       @bosh_command = bosh_command
       @environment_name = environment_name
       @logger = logger
@@ -13,7 +12,6 @@ module Opsmgr
       @download_logs = download_logs ? "--download-logs" : ""
 
       @bosh_command_runner = Opsmgr::BoshCommandRunner.new(
-        iaas_gateway: @iaas_gateway,
         bosh_command: @bosh_command,
         logger: @logger
       )

data/lib/opsmgr/product_upload_wrapper.rb

@@ -4,25 +4,25 @@ require 'opsmgr/cmd/ops_manager'
 require 'opsmgr/api/client'
 
 class ProductUploadWrapper
-  def self.wrap_add(environment:, product_path:, product_name:)
-    wrap_operation(environment, product_path, product_name, 'add')
+  def self.wrap_add(environment:, product_path:, product_name:, om_version:)
+    wrap_operation(environment, product_path, product_name, 'add', om_version)
   end
 
-  def self.wrap_upgrade(environment:, product_path:, product_name:)
-    wrap_operation(environment, product_path, product_name, 'upgrade')
+  def self.wrap_upgrade(environment:, product_path:, product_name:, om_version:)
+    wrap_operation(environment, product_path, product_name, 'upgrade', om_version)
   end
 
-  def self.wrap_upload(environment:, product_path:, product_name:)
-    wrap_operation(environment, product_path, product_name, 'upload')
+  def self.wrap_upload(environment:, product_path:, product_name:, om_version:)
+    wrap_operation(environment, product_path, product_name, 'upload', om_version)
   end
 
-  def self.wrap_operation(environment, product_path, product_name, operation)
+  def self.wrap_operation(environment, product_path, product_name, operation, om_version)
     unless %w(add upgrade upload).include?(operation)
       fail "Operation '#{operation}' is not available"
     end
 
     environment_object = Opsmgr::Environments.for(environment)
-    client = Opsmgr::Api::Client.new(environment_object)
+    client = Opsmgr::Api::Client.new(environment_object, om_version)
     opsmgr_cmd = Opsmgr::Cmd::OpsManager.new(environment_object)
     opsmgr_cmd.upload_product(client, product_path)
 

data/lib/opsmgr/tasks/bosh.rake

@@ -35,7 +35,7 @@ namespace :opsmgr do
       require 'opsmgr/cmd/ops_manager'
 
       environment = Opsmgr::Environments.for(args.environment)
-      client = Opsmgr::Api::Client.new(environment)
+      client = Opsmgr::Api::Client.new(environment, args.om_version)
       Opsmgr::Cmd::OpsManager.new(environment).configure_microbosh_infrastructure(client)
 
       UiSpecRunner.new(
@@ -71,13 +71,7 @@ namespace :opsmgr do
       env_name: args.environment_name,
       om_version: args.om_version
     )
-    iaas_gateway = Opsmgr::Cmd::IaasGateway.new(
-      bosh_command: bosh_command,
-      environment_name: args.environment_name,
-      logger: logger
-    )
     Opsmgr::BoshCommandRunner.new(
-      iaas_gateway: iaas_gateway,
       bosh_command: bosh_command,
       logger: logger
     ).run(args.command)

data/lib/opsmgr/tasks/destroy.rake

@@ -4,14 +4,14 @@ namespace :opsmgr do
 
   namespace :destroy do
     desc "- Clear our Resource Pool, deleting stemcells, all installed products' VMs (including Ops Mgr)"
-    task :vms, [:environment] do |_, args|
+    task :vms, [:environment, :om_version] do |_, args|
       require 'opsmgr/cmd/ops_manager'
       require 'opsmgr/environments'
       require 'opsmgr/api/client'
 
       env = Opsmgr::Environments.for(args.environment)
       begin
-        installation_settings = Opsmgr::Api::Client.new(env).installation_settings.as_hash
+        installation_settings = Opsmgr::Api::Client.new(env, args.om_version).installation_settings.as_hash
       rescue
         installation_settings = { 'infrastructure' => {} }
       end

data/lib/opsmgr/tasks/info.rake

@@ -4,7 +4,7 @@ namespace :opsmgr do
     task :host, [:environment] do |_, args|
       require 'opsmgr/environments'
       require 'uri'
-      uri = URI(Opsmgr::Environments.for(args.environment).settings.ops_manager.url)
+      uri = URI(Opsmgr::Environments.for(args.environment).settings['ops_manager']['url'])
       puts uri.host
     end
   end

data/lib/opsmgr/tasks/opsmgr.rake

@@ -36,9 +36,18 @@ namespace :opsmgr do
     require 'opsmgr/api/client'
 
     environment_object = Opsmgr::Environments.for(args.environment)
-    client = Opsmgr::Api::Client.new(environment_object)
+    client = Opsmgr::Api::Client.new(environment_object, args.om_version)
     opsmgr_cmd = Opsmgr::Cmd::OpsManager.new(environment_object)
     opsmgr_cmd.import_installation(client, args.import_file)
+
+    if Gem::Version.new(args.om_version) >= Gem::Version.new('1.7')
+      require 'opsmgr/ui_helpers/ui_spec_runner'
+
+      UiSpecRunner.new(
+        environment: args.environment,
+        om_version: args.om_version
+      ).post_import_configuration
+    end
   end
 
   desc 'Delete installation'
@@ -123,7 +132,7 @@ namespace :opsmgr do
     require 'opsmgr/environments'
 
     environment = Opsmgr::Environments.for(args.environment)
-    client = Opsmgr::Api::Client.new(environment)
+    client = Opsmgr::Api::Client.new(environment, args.om_version)
     Opsmgr::Cmd::OpsManager.new(environment).delete_unused_products(client)
   end
 
@@ -156,13 +165,7 @@ namespace :opsmgr do
       env_name: args.environment_name,
       om_version: args.om_version
     )
-    iaas_gateway = Opsmgr::Cmd::IaasGateway.new(
-      bosh_command: bosh_command,
-      environment_name: args.environment_name,
-      logger: logger
-    )
     Opsmgr::ErrandRunner.new(
-      iaas_gateway: iaas_gateway,
       bosh_command: bosh_command,
       environment_name: args.environment_name,
       logger: logger,

data/lib/opsmgr/tasks/product.rake

@@ -1,35 +1,38 @@
 namespace :opsmgr do
   namespace :product do
     desc 'Upload a Pivotal Product'
-    task :upload, [:environment, :_om_version, :product_path, :product_name] do |_, args|
+    task :upload, [:environment, :om_version, :product_path, :product_name] do |_, args|
       require 'opsmgr/product_upload_wrapper'
 
       ProductUploadWrapper.wrap_upload(
         environment: args.environment,
         product_path: args.product_path,
-        product_name: args.product_name
+        product_name: args.product_name,
+        om_version: args.om_version
       )
     end
 
     desc 'Upload and Add a Pivotal Product'
-    task :upload_add, [:environment, :_om_version, :product_path, :product_name] do |_, args|
+    task :upload_add, [:environment, :om_version, :product_path, :product_name] do |_, args|
       require 'opsmgr/product_upload_wrapper'
 
       ProductUploadWrapper.wrap_add(
         environment: args.environment,
         product_path: args.product_path,
-        product_name: args.product_name
+        product_name: args.product_name,
+        om_version: args.om_version
       )
     end
 
     desc 'Upgrade a Generic Pivotal Product'
-    task :upload_upgrade, [:environment, :_om_version, :product_path, :product_name] do |_, args|
+    task :upload_upgrade, [:environment, :om_version, :product_path, :product_name] do |_, args|
       require 'opsmgr/product_upload_wrapper'
 
       ProductUploadWrapper.wrap_upgrade(
         environment: args.environment,
         product_path: args.product_path,
-        product_name: args.product_name
+        product_name: args.product_name,
+        om_version: args.om_version
       )
     end