ops_manager_cli 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de760b1ee988f72565a9792c838e90b0ad0c4727
-  data.tar.gz: ed687f1f53abfcd0e81ab380ba319b61b0eb4442
+  metadata.gz: 275c833c1e7b72ba2ab90fa53b3ef0025556907f
+  data.tar.gz: 435c7bde99641128d0f9fb57f108918f4a92cd16
 SHA512:
-  metadata.gz: bd81cf062bed911b6f06f04ee005c328cc90cb535ef987a33d895caea05b3007684cab923fe8907aa32c8ca174cc430991ea8dc3841da869a67673918dbe38c6
-  data.tar.gz: 0ef5e2082449ab75e5c3b12f033948c7782866a37ff5a3e24671b312c0a3d4fb431ec1e62d77a6f0276a8a9c5a52ea9ad55453c050aa7f34ffc98314bba595e9
+  metadata.gz: 41210680cd70a74580a55afd53368ac4e985b1e7c9b6cf6e08bd1a900711fd3c19252fa26d82042d860fbbb1836ea79708746e2473edb37de63a4dfca225a836
+  data.tar.gz: 507f8d1f8929e727e9fd6cf75955d3226150bd11251ea4baeb1099b22dd630d7e4df944780ebfe72866615130779d591f355fcc740fd1842a194aca3193aa450

data/.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 rvm:
-  - 2.0.0
+  - 2.2.0
 before_install: gem install bundler -v 1.10.6

data/Dockerfile

@@ -1,28 +1,25 @@
 FROM ruby:2.3.0
 
 ENV GEM_NAME ops_manager_cli
-ENV GEM_VERSION 0.3.2
+ENV GEM_VERSION 0.4.0
 ENV OVFTOOL_VERSION 4.1.0-2459827
-ENV OVFTOOL_INSTALLER vmware-ovftool-${OVFTOOL_VERSION}-lin.x86_64.bundle 
-ARG DOWNLOAD_URL=https://storage.googleapis.com/mortarchive/pub/ovftool/${OVFTOOL_INSTALLER} 
-ENV DOWNLOAD_URL ${DOWNLOAD_URL}
+ENV OVFTOOL_INSTALLER VMware-ovftool-${OVFTOOL_VERSION}-lin.x86_64.bundle
+ARG DOWNLOAD_URL
 
 # ================== Installs OVF tools ==============
 RUN echo $DOWNLOAD_URL
-RUN wget -q ${DOWNLOAD_URL} \
-  && wget -q ${DOWNLOAD_URL}.sha256 \
-  && sha256sum -c ${OVFTOOL_INSTALLER}.sha256 \
+RUN wget -v ${DOWNLOAD_URL} \
   && sh ${OVFTOOL_INSTALLER} -p /usr/local --eulas-agreed --required \
   && rm -f ${OVFTOOL_INSTALLER}*
 
 # ================== Installs Spruce ==============
-RUN wget --no-check-certificate -q https://github.com/geofffranks/spruce/releases/download/v1.0.1/spruce_1.0.1_linux_amd64.tar.gz \
+RUN wget -v --no-check-certificate https://github.com/geofffranks/spruce/releases/download/v1.0.1/spruce_1.0.1_linux_amd64.tar.gz \
     && tar -xvf spruce_1.0.1_linux_amd64.tar.gz \
     && chmod +x /spruce_1.0.1_linux_amd64/spruce \
     && ln -s /spruce_1.0.1_linux_amd64/spruce /usr/bin/.
 
 # ================== Installs JQ ==============
-RUN wget -q -O /usr/local/bin/jq --no-check-certificate https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64
+RUN wget -v -O /usr/local/bin/jq --no-check-certificate https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64
 RUN chmod +x /usr/local/bin/jq
 
 # ================== Installs ops_manager_cli gem ==============

data/Gemfile

@@ -2,4 +2,3 @@ source 'http://rubygems.org'
 
 # Specify your gem's dependencies in ops_manager.gemspec
 gemspec
-

data/README.md

@@ -1,16 +1,17 @@
-# OpsManagerCli
+# OpsManagerCli [![Build Status](https://travis-ci.org/compozed/ops_manager_cli.png?branch=master)](https://travis-ci.org/compozed/ops_manager_cli) [![Code Climate](https://codeclimate.com/github/compozed/ops_manager_cli.png)](https://codeclimate.com/github/compozed/ops_manager_cli)
+
 
 Command line tool to interact with Pivotal Operations Manager through its API, because GUIs are evil.
 
 Questions? Pop in our [slack channel](https://cloudfoundry.slack.com/messages/ops_manager_cli/)!
 
-*Please note that the APIs of Ops Manager is experimental at this point.  Changes to the APIs with new Ops Manager releases may break functionality.  The project also does not offer any support for the usage of this in any environments.*
+*Please note that the APIs of Ops Manager is experimental at this point.  Changes to the APIs with new Ops Manager releases may break functionality.*
 
 ## Features
 
 ### Core features
 
-- Support for deploying on vSphere infrastructure only
+- Support for deploying on vSphere infrastructure
 - Deploy/Upgrade Ops Manager appliance
 - Deploy/Upgrade product tiles
 - Generate config settings templates for product tiles deployments
@@ -25,11 +26,17 @@ Questions? Pop in our [slack channel](https://cloudfoundry.slack.com/messages/op
 
 ### Limitations:
 
-- No support for enabling and running errands (future work)
+- No support for enabling and running errands for ops_manager **< 1.7.x**
+
 
 ### Test with Ops Manager Version
 
-- up to 1.7.11.0
+- up to 1.8.3.0
+
+## Upgrading OpsManager appliance from **1.7.x** to **1.8.x**
+
+On ops_manager_cli **>=0.4.0** support for upgrading to **1.8.x** was removed.
+Use ops_manager_cli **0.3.1** to upgrade from **1.7.x** -> **1.8.x**. 
 
 ## Dependencies
 

data/lib/ops_manager/api/base.rb

@@ -1,8 +1,20 @@
 class OpsManager
   module Api
     class Base
+      attr_reader :silent
+
       include OpsManager::Logging
 
+      def initialize(opts = {})
+        @silent = opts[:silent]
+      end
+
+      %w{ get post put delete multipart_post}.each do |m|
+        define_method "authenticated_#{m}" do |endpoint, opts = {}|
+          send(m, endpoint, add_authentication(opts))
+        end
+      end
+
       def get(endpoint, opts = {})
         uri = uri_for(endpoint)
         http = http_for(uri)
@@ -136,6 +148,20 @@ class OpsManager
           http.read_timeout = 1200
         end
       end
+
+      def add_authentication(opts={})
+        opts[:headers] ||= {}
+        opts[:headers]['Authorization'] ||= authorization_header
+        opts
+      end
+
+      def say_green(str)
+        puts str.green unless silent
+      end
+
+      def print_green(str)
+        print str.green unless silent
+      end
     end
   end
 end

data/lib/ops_manager/api/opsman.rb

@@ -6,31 +6,18 @@ require "uaa"
 class OpsManager
   module Api
     class Opsman < OpsManager::Api::Base
-      attr_reader :silent
-
-      def initialize(opts = {})
-        @silent = opts[:silent]
-      end
-
-      def say_green(str)
-        puts str.green unless silent
-      end
-
-      def print_green(str)
-        print str.green unless silent
-      end
-
       def create_user
         body= "setup[decryption_passphrase]=#{password}&setup[decryption_passphrase_confirmation]=#{password}&setup[eula_accepted]=true&setup[identity_provider]=internal&setup[admin_user_name]=#{username}&setup[admin_password]=#{password}&setup[admin_password_confirmation]=#{password}"
         post("/api/v0/setup" , body: body)
       end
 
       def upload_installation_settings(filepath = 'installation_settings.json')
-        say_green( '====> Uploading installation settings...')
+        print_green '====> Uploading installation settings ...'
         yaml = UploadIO.new(filepath, 'text/yaml')
         opts = { "installation[file]" => yaml}
         res = authenticated_multipart_post("/api/installation_settings", opts)
         raise OpsManager::InstallationSettingsError.new(res.body) unless res.code == '200'
+        say_green 'done'
         res
       end
 
@@ -39,39 +26,48 @@ class OpsManager
       end
 
       def get_installation_settings(opts = {})
-        say_green( '====> Downloading installation settings...')
-        authenticated_get("/api/installation_settings", opts)
+        print_green '====> Downloading installation settings ...'
+        res = authenticated_get("/api/installation_settings", opts)
+        say_green 'done'
+        res
       end
 
       def upload_installation_assets
-        say_green( '====> Uploading installation assets...')
+        print_green( '====> Uploading installation assets ...')
         zip = UploadIO.new("#{Dir.pwd}/installation_assets.zip", 'application/x-zip-compressed')
         opts = {:passphrase => @password, "installation[file]" => zip }
-        multipart_post( "/api/v0/installation_asset_collection", opts)
+        res = multipart_post( "/api/v0/installation_asset_collection", opts)
+        say_green 'done'
+        res
       end
 
       def get_installation_assets
         opts = { write_to: "installation_assets.zip" }
-        say_green( '====> Download installation assets...')
-        authenticated_get("/api/v0/installation_asset_collection", opts)
+        say_green '====> Download installation assets ...'
+        res = authenticated_get("/api/v0/installation_asset_collection", opts)
+        say_green 'done'
+        res
       end
 
       def delete_products(opts = {})
-        say_green( '====> Deleating unused products...')
-        opts = add_authentication(opts)
-        delete('/api/v0/products', opts)
+        print_green '====> Deleating unused products ...'
+        res = authenticated_delete('/api/v0/products', opts)
+        say_green 'done'
+        res
       end
 
       def trigger_installation(opts = {})
-        print_green('====> Applying changes...')
-        authenticated_post('/api/v0/installations', opts)
+        print_green('====> Applying changes')
+        res = authenticated_post('/api/v0/installations', opts)
+        raise OpsManager::InstallationError.new(res.body) if res.code =~  /422/
+        res
       end
 
       def add_staged_products(name, version)
-        print_green( "====> Adding available product to the installation...")
+        print_green( "====> Adding available product to the installation ...")
         body = "name=#{name}&product_version=#{version}"
         res = authenticated_post('/api/v0/staged/products', body: body)
-        raise OpsManager::ProductDeploymentError.new(res.body) if res.code == '404'
+        raise OpsManager::ProductDeploymentError.new(res.body) if res.code =~ /404|500/
         say_green('done')
         res
       end
@@ -91,21 +87,24 @@ class OpsManager
       end
 
       def get_installations(opts = {})
-        authenticated_get('/api/v0/installations')
+        print_green '====> Getting installations ...'
+        res = authenticated_get('/api/v0/installations')
+        say_green 'done'
+        res
       end
 
       def upgrade_product_installation(guid, product_version)
-        say_green( "====> Bumping product installation #{guid} product_version to #{product_version}...")
+        print_green "====> Bumping product installation #{guid} product_version to #{product_version} ..."
         opts = { to_version: product_version }
-        opts = add_authentication(opts)
-        res = put("/api/v0/staged/products/#{guid}", opts)
+        res = authenticated_put("/api/v0/staged/products/#{guid}", opts)
         raise OpsManager::UpgradeError.new(res.body) unless res.code == '200'
+        say_green 'done'
         res
       end
 
       def upload_product(filepath)
         file = "#{filepath}"
-        cmd = "curl -k \"https://#{target}/api/v0/available_products\" -F 'product[file]=@#{file}' -X POST -H 'Authorization: Bearer #{access_token}'"
+        cmd = "curl -s -k \"https://#{target}/api/v0/available_products\" -F 'product[file]=@#{file}' -X POST -H 'Authorization: Bearer #{access_token}'"
         logger.info "running cmd: #{cmd}"
         body = `#{cmd}`
         logger.info "Upload product response: #{body}"
@@ -116,24 +115,29 @@ class OpsManager
         authenticated_get("/api/v0/available_products")
       end
 
-      def get_current_version
-        products = JSON.parse(get_available_products.body)
-        directors = products.select{ |i| i.fetch('name') =~/p-bosh|microbosh/ }
-        versions = directors.inject([]){ |r, i| r << OpsManager::Semver.new(i.fetch('product_version')) }
-        versions.sort.last.to_s.gsub(/.0$/,'')
-
+      def get_diagnostic_report
+        authenticated_get("/api/v0/diagnostic_report")
       rescue Errno::ETIMEDOUT , Errno::EHOSTUNREACH, Net::HTTPFatalError, Net::OpenTimeout
         nil
       end
 
-
       def import_stemcell(filepath)
         return unless filepath
-        say_green('====> Uploading stemcell...')
         tar = UploadIO.new(filepath, 'multipart/form-data')
+        print_green "====> Uploading stemcell: #{tar} ..."
         opts = { "stemcell[file]" => tar }
-        res = authenticated_multipart_post("/api/v0/stemcells", opts)
+        res = nil
+
+        3.times do
+          res = authenticated_multipart_post("/api/v0/stemcells", opts)
+          case res.code
+            when '200' ; break
+            when '503' ; sleep(60)
+          end
+        end
+
         raise OpsManager::StemcellUploadError.new(res.body) unless res.code == '200'
+        say_green 'done'
         res
       end
 
@@ -150,24 +154,13 @@ class OpsManager
       end
 
       def get_token
-        token_issuer.owner_password_grant('admin', password, 'opsman.admin').tap do |token|
+        token_issuer.owner_password_grant(username, password, 'opsman.admin').tap do |token|
           logger.info "UAA Token: #{token.inspect}"
         end
       rescue  CF::UAA::TargetError
         nil
       end
 
-      def authenticated_get(endpoint, opts = {})
-        get(endpoint, add_authentication(opts))
-      end
-
-      def authenticated_post(endpoint, opts = {})
-        post(endpoint, add_authentication(opts))
-      end
-
-      def authenticated_multipart_post(endpoint, opts = {})
-        multipart_post(endpoint, add_authentication(opts))
-      end
 
       private
       def token_issuer
@@ -179,11 +172,8 @@ class OpsManager
         @access_token ||= get_token.info['access_token']
       end
 
-
-      def add_authentication(opts={})
-        opts[:headers] ||= {}
-        opts[:headers]['Authorization'] ||= "Bearer #{access_token}"
-        opts
+      def authorization_header
+        "Bearer #{access_token}"
       end
     end
   end

data/lib/ops_manager/api/pivnet.rb

@@ -2,64 +2,44 @@ class OpsManager
   module Api
     class Pivnet < OpsManager::Api::Base
 
-      def initialize
-        get_authentication
+      def get_product_releases(product_slug, opts = {})
+        authenticated_get("/api/v2/products/#{product_slug}/releases", opts)
       end
 
-      def download_stemcell(stemcell_version, stemcell_path, filename_regex)
-        puts "====> Downloading stemcell #{ stemcell_path }...".green
+      def accept_product_release_eula(product_slug, release_id)
+        print_green("====> Accepting #{product_slug} release #{release_id} eula ...")
+        res = authenticated_post("/api/v2/products/#{product_slug}/releases/#{release_id}/eula_acceptance")
+        say_green "done"
+        res
+      end
 
-        release_id = get_release_for(stemcell_version).fetch('id')
-        product_file = get_product_file_for(release_id, filename_regex)
-        product_file_id = product_file.fetch('id')
+      def get_product_release_files(product_slug, release_id)
+        authenticated_get("/api/v2/products/#{product_slug}/releases/#{release_id}/product_files")
+      end
 
-        accept_release_eula(release_id)
-        download_product(release_id, product_file_id, stemcell_path)
+      def download_product_release_file(product_slug, release_id, file_id, opts = {})
+        print_green "====> Downloading stemcell: #{opts[:write_to]} ..."
+        res = authenticated_post("/api/v2/products/#{product_slug}/releases/#{release_id}/product_files/#{file_id}/download", opts)
+        say_green "done"
+        res
       end
 
       def get_authentication
-        puts "====> Authentication to Pivnet".green
-        opts = { headers: { 'Authorization' => "Token #{pivnet_token}" } }
-        res = get("/api/v2/authentication", opts)
+        say_green "====> Authentication to Pivnet"
+        res = authenticated_get("/api/v2/authentication")
         raise OpsManager::PivnetAuthenticationError.new(res.body) unless res.code == '200'
         res
       end
 
       private
-
-      def accept_release_eula(release_id)
-        puts "====> Accepting stemcell eula ...".green
-        opts = { headers: { 'Authorization' => "Token #{pivnet_token}" } }
-        post("/api/v2/products/stemcells/releases/#{release_id}/eula_acceptance", opts)
-      end
-
-      def download_product(release_id, product_file_id, stemcell_path)
-        opts = { write_to: stemcell_path, headers: { 'Authorization' => "Token #{pivnet_token}" } }
-        post("/api/v2/products/stemcells/releases/#{release_id}/product_files/#{product_file_id}/download", opts)
-      end
-
-      def get_stemcell_releases(opts = {})
-        get("/api/v2/products/stemcells/releases", opts)
-      end
-
-      def get_product_files(release_id, opts = {})
-        get("/api/v2/products/stemcells/releases/#{release_id}/product_files",opts)
-      end
-
-      def get_release_for(stemcell_version)
-        releases = JSON.parse(get_stemcell_releases.body).fetch('releases')
-        releases.select{ |r| r.fetch('version') == stemcell_version }.first
-      end
-
-      def get_product_file_for(release_id, filename_regex)
-        products = JSON.parse(get_product_files(release_id).body).fetch('product_files')
-        products.select{ |r| r.fetch('aws_object_key') =~ filename_regex }.first
-      end
-
       def target
         @target ||= "network.pivotal.io"
       end
 
+      def authorization_header
+        "Token #{pivnet_token}"
+      end
+
       def pivnet_token
         @pivnet_token ||= OpsManager.get_conf(:pivnet_token)
       end

data/lib/ops_manager/appliance_deployment.rb

@@ -1,14 +1,15 @@
 require "ops_manager/api/opsman"
 require "ops_manager/api/pivnet"
-require "ops_manager/installation_settings"
 require 'ops_manager/configs/opsman_deployment'
+require 'fileutils'
 
 class OpsManager::ApplianceDeployment
   extend Forwardable
-  def_delegators :pivnet_api, :download_stemcell
+  def_delegators :pivnet_api, :get_product_releases, :accept_product_release_eula,
+    :get_product_release_files, :download_product_release_file
   def_delegators :opsman_api, :create_user, :trigger_installation, :get_installation_assets,
-    :get_installation_settings, :upload_installation_assets, :import_stemcell, :target,
-    :password, :username, :get_current_version ,:ops_manager_version=
+    :get_installation_settings, :get_diagnostic_report, :upload_installation_assets,
+    :import_stemcell, :target, :password, :username, :ops_manager_version=
 
   attr_reader :config_file
 
@@ -26,15 +27,17 @@ class OpsManager::ApplianceDeployment
 
     case
     when current_version.empty?
-      puts "No OpsManager deployed at #{target}. Deploying ...".green
+      puts "No OpsManager deployed at #{config.ip}. Deploying ...".green
       deploy
       create_first_user
     when current_version < desired_version then
-      puts "OpsManager at #{target} version is #{current_version}. Upgrading to #{desired_version}.../".green
+      puts "OpsManager at #{config.ip} version is #{current_version}. Upgrading to #{desired_version} .../".green
       upgrade
     when current_version == desired_version then
-      puts "OpsManager at #{target} version is already #{config.desired_version}. Skiping ...".green
+      puts "OpsManager at #{config.ip} version is already #{config.desired_version}. Skiping ...".green
     end
+
+    puts '====> Finish!'.green
   end
 
   def deploy
@@ -48,38 +51,107 @@ class OpsManager::ApplianceDeployment
   end
 
   def create_first_user
-    puts '====> Creating initial user...'.green
+    puts '====> Creating initial user'.green
     until( create_user.code.to_i == 200) do
-      print '.'.green ; sleep 1
+      print ' .'.green ; sleep 1
     end
   end
 
   def upgrade
     get_installation_assets
-    get_installation_settings(write_to: 'installation_settings.json')
+    download_current_stemcells
     stop_current_vm(current_vm_name)
     deploy
     upload_installation_assets
-    provision_missing_stemcells
+    provision_stemcells
     OpsManager::InstallationRunner.trigger!.wait_for_result
+  end
 
-    puts "====> Finish!".green
+  def list_current_stemcells
+    JSON.parse(installation_settings).fetch('products').inject([]) do |a, p|
+      a << p['stemcell'].fetch('version')
+    end
   end
 
+  # Finds available stemcell's pivotal network release.
+  # If it can not find the exact version it will try to find the newest minor version available.
+  # #
+  # @param version [String] the version number, eg: '2362.17'
+  # @return release_id [Integer] the pivotal netowkr release id of the found stemcell.
+  def find_stemcell_release(version)
+    version  = OpsManager::Semver.new(version)
+    releases = stemcell_releases.collect do |r|
+      {
+        release_id:  r['id'],
+        version:     OpsManager::Semver.new(r['version']),
+      }
+    end
+    releases.keep_if{ |r| r[:version].major == version.major }
+    exact_version = releases.select {|r| r[:version] == version }
+    return exact_version.first[:release_id] unless exact_version.empty?
+    releases_sorted_by_version = releases.sort_by{ |r| r[:version].minor }.reverse
+    return releases_sorted_by_version.first[:release_id] unless releases_sorted_by_version.empty?
+  end
+
+  # Finds stemcell's pivotal network release file.
+  # #
+  # @param release_id [String] the version number, eg: '2362.17'
+  # @param filename [Regex] the version number, eg: /vsphere/
+  # @return id and name [Array] the pivotal network file ID and Filename for the matching stemcell.
+  def find_stemcell_file(release_id, filename)
+    files = JSON.parse(get_product_release_files('stemcells', release_id).body).fetch('product_files')
+    file = files.select{ |r| r.fetch('aws_object_key') =~ filename }.first
+    return file['id'], file['aws_object_key'].split('/')[-1]
+  end
+
+  # Lists all the available stemcells in the current installation_settings.
+  # Downloads those stemcells.
+  def download_current_stemcells
+    puts "Downloading existing stemcells ...".green
+    FileUtils.mkdir_p current_stemcell_dir
+    list_current_stemcells.each do |stemcell_version|
+      release_id = find_stemcell_release(stemcell_version)
+      accept_product_release_eula('stemcells', release_id )
+      file_id, file_name = find_stemcell_file(release_id, /vsphere/)
+      download_product_release_file('stemcells', release_id, file_id, write_to: "#{current_stemcell_dir}/#{file_name}")
+    end
+  end
 
   def new_vm_name
     @new_vm_name ||= "#{config.name}-#{config.desired_version}"
   end
 
-  private
   def current_version
-    @current_version ||= OpsManager::Semver.new(get_current_version)
+    @current_version ||= OpsManager::Semver.new(version_from_diagnostic_report)
   end
 
   def desired_version
     @desired_version ||= OpsManager::Semver.new(config.desired_version)
   end
 
+  def provision_stemcells
+    Dir.glob("#{current_stemcell_dir}/*").each do |stemcell_filepath|
+      import_stemcell(stemcell_filepath)
+    end
+  end
+
+  private
+  def diagnostic_report
+    @diagnostic_report ||= get_diagnostic_report
+  end
+
+  def version_from_diagnostic_report
+    return unless diagnostic_report
+    version = parsed_diagnostic_report
+      .fetch("versions")
+      .fetch("release_version")
+    version.gsub(/.0$/,'')
+  end
+
+  def parsed_diagnostic_report
+    JSON.parse(diagnostic_report.body)
+  end
+
   def current_vm_name
     @current_vm_name ||= "#{config.name}-#{current_version}"
   end
@@ -88,14 +160,6 @@ class OpsManager::ApplianceDeployment
     @desired_vm_name ||= "#{config.name}-#{config.desired_version}"
   end
 
-  def provision_missing_stemcells
-    puts '====> Reprovisioning missing stemcells...'.green
-    installation_settings.stemcells.each do |s|
-      download_stemcell(s.fetch(:version), s.fetch(:file), /vsphere/)
-      import_stemcell(s.fetch(:file))
-    end
-  end
-
   def pivnet_api
     @pivnet_api ||= OpsManager::Api::Pivnet.new
   end
@@ -109,15 +173,23 @@ class OpsManager::ApplianceDeployment
     @config ||= OpsManager::Configs::OpsmanDeployment.new(parsed_yml)
   end
 
+  def desired_version?(version)
+    !!(desired_version.to_s =~/#{version}/)
+  end
+
   def installation_settings
-    @installation_settings ||= OpsManager::InstallationSettings.new(parsed_installation_settings)
+    @installation_settings ||= get_installation_settings.body
   end
 
-  def parsed_installation_settings
-    JSON.parse(File.read('installation_settings.json'))
+  def get_stemcell_releases
+    get_product_releases('stemcells')
   end
 
-  def desired_version?(version)
-    !!(desired_version.to_s =~/#{version}/)
+  def stemcell_releases
+    @stemcell_releases ||= JSON.parse(get_stemcell_releases.body).fetch('releases')
+  end
+
+  def current_stemcell_dir
+    "/tmp/current_stemcells"
   end
 end

data/lib/ops_manager/cli.rb

@@ -75,19 +75,7 @@ class OpsManager
     class DeleteUnusedProducts < Clamp::Command
 
       def execute
-        OpsManager.new.delete_products
-      end
-    end
-
-    class GetUaaToken < Clamp::Command
-      def execute
-        puts OpsManager::Api::Opsman.new.get_token.info.fetch('access_token')
-      end
-    end
-
-    class SSH < Clamp::Command
-      def execute
-        `ssh ubuntu@#{OpsManager.get_conf(:target)}`
+        OpsManager::Api::Opsman.new.delete_products
       end
     end
 
@@ -106,7 +94,7 @@ class OpsManager
         if @installation_id == "last"
           puts OpsManager::Installation.all.last.logs
         else
-          puts OpsManager::Installation.new(@installation_id).logs
+          puts OpsManager::Installation.new(@installation_id.to_i).logs
         end
       end
     end
@@ -119,7 +107,7 @@ class OpsManager
 
     class Curl < Clamp::Command
       option ['-X', '--http-method'], "HTTP_METHOD", "HTTP Method (GET,POST)", default: 'GET'
-      parameter "ENDPOINT", "OpsManager api endpoint. eg: /v0/installation_settings", required: true
+      parameter "ENDPOINT", "OpsManager api endpoint. eg: /api/v0/installation_settings", required: true
 
       def execute
         puts case http_method.strip
@@ -138,6 +126,12 @@ class OpsManager
       end
     end
 
+    class Version < Clamp::Command
+      def execute
+        puts OpsManager::VERSION
+      end
+    end
+
     # Core commands
     subcommand "status", "Test credentials and shows status", Status
     subcommand "target", "Target an OpsManager appliance", Target
@@ -148,12 +142,12 @@ class OpsManager
     subcommand "get-product-template", "Generates Product tile installation template", GetProductTemplate
 
     # Other commands
+    subcommand "version", "Shows OpsManagerCLI version", Version
     subcommand "curl", "Authenticated curl requests(POST/GET)", Curl
+    subcommand "delete-unused-products", "Deletes unused product tiles", DeleteUnusedProducts
     subcommand "get-installation-settings", "Gets installation settings", GetInstallationSettings
     subcommand "get-installation-logs", "Gets installation logs", GetInstallationLogs
-    subcommand "get-uaa-token", "Gets uaa token from OpsManager", GetUaaToken
     subcommand "import-stemcell", "Uploads stemcell to OpsManager", ImportStemcell
-    subcommand "delete-unused-products", "Deletes unused product tiles", DeleteUnusedProducts
 
   end
 end

data/lib/ops_manager/deployments/vsphere.rb

@@ -1,27 +1,29 @@
 require 'rbvmomi'
 require "uri"
+require 'shellwords'
 require "ops_manager/logging"
 
 class OpsManager
   module Deployments
     module Vsphere
       include OpsManager::Logging
-      include OpsManager::Logging
 
       def deploy_vm(name, ip)
-        puts '====> Starts ova deployment'.green
+        print '====> Deploying ova ...'.green
         vcenter_target= "vi://#{vcenter_username}:#{vcenter_password}@#{config.opts['vcenter']['host']}/#{config.opts['vcenter']['datacenter']}/host/#{config.opts['vcenter']['cluster']}"
         cmd = "echo yes | ovftool --acceptAllEulas --noSSLVerify --powerOn --X:waitForIp --net:\"Network 1=#{config.opts['portgroup']}\" --name=#{name} -ds=#{config.opts['datastore']} --prop:ip0=#{ip} --prop:netmask0=#{config.opts['netmask']}  --prop:gateway=#{config.opts['gateway']} --prop:DNS=#{config.opts['dns']} --prop:ntp_servers=#{config.opts['ntp_servers'].join(',')} --prop:admin_password=#{config.password} #{config.opts['ova_path']} #{vcenter_target}"
-        logger.info cmd
-        puts `#{cmd}`
+        logger.info "Running: #{cmd}"
+        logger.info `#{cmd}`
+        puts 'done'.green
       end
 
       def stop_current_vm(name)
-        puts "====> Stopping vm #{name}...".green
+        print "====> Stopping vm #{name}...".green
         dc = vim.serviceInstance.find_datacenter(config.opts['vcenter']['datacenter'])
         logger.info "finding vm: #{name}"
         vm = dc.find_vm(name) or fail "VM not found"
         vm.PowerOffVM_Task.wait_for_completion
+        puts 'done'.green
       end
 
       private
@@ -30,11 +32,11 @@ class OpsManager
       end
 
       def vcenter_username
-        URI.encode(config.opts['vcenter']['username'])
+        Shellwords.escape(URI.encode(config.opts['vcenter']['username']))
       end
 
       def vcenter_password
-        URI.encode(config.opts['vcenter']['password'])
+        Shellwords.escape(URI.encode(config.opts['vcenter']['password']))
       end
     end
   end

data/lib/ops_manager/director_template_generator.rb

@@ -7,53 +7,56 @@ class OpsManager
       delete_uaa_ssl
       delete_guid
       delete_ip_assignments
+      add_merging_strategy_for_networks
+
       installation_settings.to_h
     end
 
     def generate_yml
       generate.to_yaml
-        .gsub('"(( merge on guid ))"', '(( merge on guid ))')
+        .gsub('"(( merge on name ))"', '(( merge on name ))')
         .gsub('"(( merge on identifier ))"', '(( merge on identifier ))')
     end
 
     private
     def installation_settings
       return @installation_settings if @installation_settings
-      parsed_installation_settings = JSON.parse(installation_settings_response.body)
-      @installation_settings = OpsManager::InstallationSettings.new(parsed_installation_settings)
+      res = OpsManager::Api::Opsman.new(silent: true).get_installation_settings
+      @installation_settings = JSON.parse(res.body)
     end
 
     def merge_director_template_products
-      installation_settings.merge!('products' => director_product_template.fetch('products'))
+      installation_settings.merge!('products' => product_template.fetch('products'))
+    end
+
+    def add_merging_strategy_for_networks
+      installation_settings['infrastructure']['networks'].tap do |networks|
+        networks.unshift("(( merge on name ))") if networks
+      end
     end
 
     def delete_schema_version
-      @installation_settings.delete('installation_schema_version')
+      installation_settings.delete('installation_schema_version')
     end
 
     def delete_ip_assignments
-      @installation_settings.delete('ip_assignments')
+      installation_settings.delete('ip_assignments')
     end
 
     def delete_guid
-      @installation_settings.delete('guid')
+      installation_settings.delete('guid')
     end
 
     def delete_director_ssl
-      director_product_template["products"][1].delete("director_ssl")
+      product_template["products"][1].delete("director_ssl")
     end
 
     def delete_uaa_ssl
-      director_product_template["products"][1].delete("uaa_ssl")
+      product_template["products"][1].delete("uaa_ssl")
     end
 
-    def director_product_template
-      @director_product_template ||= OpsManager::ProductTemplateGenerator.new('p-bosh').generate
-    end
-
-
-    def installation_settings_response
-      OpsManager::Api::Opsman.new(silent: true).get_installation_settings
+    def product_template
+      @product_template ||= OpsManager::ProductTemplateGenerator.new('p-bosh').generate
     end
   end
 end

data/lib/ops_manager/installation.rb

@@ -32,7 +32,7 @@ class OpsManager
     end
 
     def opsman_api
-      @opsman_api ||= OpsManager::Api::Opsman.new
+      @opsman_api ||= OpsManager::Api::Opsman.new(silent: true)
     end
   end
 end

data/lib/ops_manager/installation_runner.rb

@@ -1,12 +1,12 @@
 class OpsManager
   class InstallationRunner
     extend Forwardable
-    def_delegators :opsman_api, :trigger_installation, :get_installation, :get_current_version,
+    def_delegators :opsman_api, :trigger_installation, :get_installation,
       :get_staged_products, :get_staged_products_errands
     attr_reader :id
 
     def trigger!
-      res = trigger_installation( body: body.join('&') )
+      res = trigger_installation( body: body )
       @id = JSON.parse(res.body).fetch('install').fetch('id').to_i
       self
     end
@@ -17,7 +17,7 @@ class OpsManager
 
     def wait_for_result
       while JSON.parse(get_installation(id).body).fetch('status') == 'running'
-        print '.'.green
+        print ' .'.green
         sleep 10
       end
       puts ''
@@ -27,8 +27,7 @@ class OpsManager
     def body
       @body ||= [ 'ignore_warnings=true' ]
       @body << errands_body
-
-      @body
+      @body.join('&')
     end
 
     def opsman_api
@@ -36,18 +35,16 @@ class OpsManager
     end
 
     def errands_body
-      staged_products_guids.collect do |product_guid|
-        post_deploy_errands_body_for(product_guid)
-      end
+      staged_products_guids.collect { |product_guid| post_deploy_errands_body_for(product_guid) }
     end
 
     def post_deploy_errands_body_for(product_guid)
       post_deploy_errands = post_deploy_errands_for(product_guid)
 
-      unless post_deploy_errands.empty?
-        post_deploy_errands.collect{ |e| "enabled_errands[#{product_guid}][post_deploy_errands][]=#{e}" }
-      else
+      if post_deploy_errands.empty?
         "enabled_errands[#{product_guid}]{}"
+      else
+        post_deploy_errands.collect{ |e| "enabled_errands[#{product_guid}][post_deploy_errands][]=#{e}" }
       end
     end
 
@@ -65,7 +62,8 @@ class OpsManager
 
     def errands_for(product_guid)
       res = get_staged_products_errands(product_guid)
-      if res.code == 200
+
+      if res.code == '200'
         JSON.parse(res.body)['errands']
       else
         []

data/lib/ops_manager/product_deployment.rb

@@ -44,9 +44,11 @@ class OpsManager
       print "====> Uploading product...".green
       if ProductDeployment.exists?(config.name, config.desired_version)
         puts "product already exists".green
-      else
+      elsif config.filepath
         upload_product(config.filepath)
         puts "done".green
+      else
+        puts "no filepath provided, skipping product upload.".green
       end
     end
 

data/lib/ops_manager/product_installation.rb

@@ -36,7 +36,7 @@ class OpsManager
       end
 
       def opsman_api
-        @opsman_api = OpsManager::Api::Opsman.new
+        @opsman_api = OpsManager::Api::Opsman.new(silent: true)
       end
     end
   end

data/lib/ops_manager/product_template_generator.rb

@@ -1,7 +1,7 @@
 class OpsManager
   class ProductTemplateGenerator
-    OPS_MANAGER_PASSWORD_LENGTH = 20
-    OPS_MANAGER_SECRET_LENGTH = 20
+    OPS_MANAGER_PASSWORD_LENGTH = 32
+    OPS_MANAGER_SECRET_LENGTH = 32
     OPS_MANAGER_SALT_LENGTH = 16
 
     attr_reader :product_name
@@ -25,6 +25,7 @@ class OpsManager
       delete_private_key_pem
       delete_product_version_from_properties
       add_merging_strategy_for_jobs
+      add_merging_strategy_for_job_properties
 
       { 'products' => [ "(( merge on identifier ))" , selected_product ] }
     end
@@ -109,6 +110,12 @@ class OpsManager
       selected_product['jobs'].unshift("(( merge on identifier ))")
     end
 
+    def add_merging_strategy_for_job_properties
+      selected_product['jobs'].each do |j|
+        j['properties'].unshift("(( merge on identifier ))") if j['properties']
+      end
+    end
+
     def delete_partitions
       delete_from_jobs('partitions')
     end
@@ -136,12 +143,9 @@ class OpsManager
     end
 
     def installation_settings
-      parsed_installation_settings = JSON.parse(installation_settings_response.body)
-      OpsManager::InstallationSettings.new(parsed_installation_settings)
-    end
-
-    def installation_settings_response
-      OpsManager::Api::Opsman.new(silent: true).get_installation_settings
+      return @installation_settings if @installation_settings
+      res = OpsManager::Api::Opsman.new(silent: true).get_installation_settings
+      @installation_settings = JSON.parse(res.body)
     end
   end
 end

data/lib/ops_manager/semver.rb

@@ -5,6 +5,14 @@ class OpsManager
       super(s.split('.').map { |e| e.to_i })
     end
 
+    def major
+      self[0]
+    end
+
+    def minor
+      self[1]
+    end
+
     def < x
       (self <=> x) < 0
     end

data/lib/ops_manager/version.rb

@@ -1,3 +1,3 @@
 class OpsManager
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/ops_manager.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "byebug"
   spec.add_dependency "rbvmomi"
@@ -29,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "net-ping"
   spec.add_dependency "cf-uaa-lib"
   spec.add_dependency "session_config"
+  spec.add_dependency "rubysl-shellwords"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_manager_cli
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - CompoZed
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: vcr
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,13 +81,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rbvmomi
+  name: multipart-post
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: multipart-post
+  name: clamp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: clamp
+  name: net-ping
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: net-ping
+  name: cf-uaa-lib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cf-uaa-lib
+  name: session_config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: session_config
+  name: rubysl-shellwords
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -196,7 +196,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/clean_tapes
 - bin/console
 - bin/setup
 - exe/ops_manager
@@ -214,7 +213,6 @@ files:
 - lib/ops_manager/errors.rb
 - lib/ops_manager/installation.rb
 - lib/ops_manager/installation_runner.rb
-- lib/ops_manager/installation_settings.rb
 - lib/ops_manager/logging.rb
 - lib/ops_manager/product_deployment.rb
 - lib/ops_manager/product_installation.rb

data/bin/clean_tapes

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-echo 'Replacing sensitive data in the source file with dummy data'
-
-USAGE="Usage ./clean_tapes SENSITIVE_INFO DUMMY_INFO"
-
-if [[ $# -ne 2 ]]; then
-  echo "Illegal number of parameters"
-  echo $USAGE
-  exit
-fi
-
-pattern=$1
-replacement=$2
-
-pushd spec/fixtures/vcr_cassettes/
-  ack -l $pattern | xargs perl -pi -E "s/$pattern/$replacement/g"
-popd
-

data/lib/ops_manager/installation_settings.rb

@@ -1,16 +0,0 @@
-class OpsManager
-  class InstallationSettings < Hash
-    def initialize(parsed_installation_settings)
-      super.merge!(parsed_installation_settings)
-    end
-
-    def stemcells
-      self.fetch('products').inject([]) do |a, p|
-        a << {
-          version: p['stemcell'].fetch('version'),
-          file: p['stemcell'].fetch('file'),
-        }
-      end
-    end
-  end
-end