Revert "added ibmcloud support (openshift#2700)" (openshift#2705)

This reverts commit dba8d95.

Author: liangxia

Gemfile

@@ -35,8 +35,6 @@ gem 'azure_mgmt_compute', '~>0.18.0'
 gem 'azure_mgmt_resources', '~>0.17.0'
 gem 'azure_mgmt_network', '~>0.17.0'
 
-###### IBM cloud
-gem 'ibm_vpc'
 # gem 'timers'
 ## Logging
 gem 'term-ansicolor'

lib/launchers/ibmcloud.rb

@@ -4,90 +4,18 @@
 unless $LOAD_PATH.any? {|p| File.expand_path(p) == lib_path}
   $LOAD_PATH.unshift(lib_path)
 end
+
 require 'collections'
 require 'common'
-require 'cgi'
-
-require "ibm_vpc"
 
 module BushSlicer
   class IBMCloud
     include Common::Helper
     include CollectionsIncl
-    attr_reader :config, :vpc, :regions
-    attr_accessor :region
+    attr_reader :config
 
     def initialize(**opts)
       @config = conf[:services, opts.delete(:service_name) || :ibmcloud]
-      authenticator = IbmVpc::Authenticators::IamAuthenticator.new(
-        apikey: @config[:auth][:apikey]
-      )
-      @vpc = IbmVpc::VpcV1.new(authenticator: authenticator)
-      @regions ||= vpc.list_regions.result['regions']
-      if opts[:region]
-        puts("Setting region to #{opts[:region]}...\n")
-        region=(opts[:region])
-      end
-    end
-
-    # @return Array of region hash
-    # {"name"=>"us-south", "href"=>"https://us-south.iaas.cloud.ibm.com/v1/regions/us-south", "endpoint"=>"https://us-south.iaas.cloud.ibm.com", "status"=>"available"}
-    def regions
-      @regions ||= self.vpc.list_regions.result['regions']
-    end
-
-    # @return Hash containing region information
-    def get_region(name)
-      region_hash = self.regions.select {|r| r['name'] == name}.first
-      raise "Unsupported region '#{name}" unless region_hash
-      return region_hash
     end
-
-    def set_region(reg_name)
-      region_info = self.get_region(reg_name)
-      self.vpc.service_url = region_info['endpoint'] + "/v1"
-    end
-    # @returns current region hash
-    def current_region
-      self.vpc.service_url
-      self.regions.select {|r| r['endpoint'].start_with? self.vpc.service_url[0..-4]}.first
-    end
-
-    def instances
-      start = nil
-      instances = []
-      loop do
-        response = self.vpc.list_instances(start: start)
-        instances += response.result["instances"]
-
-        next_link = response.result.dig("next", "href")
-        break if next_link.nil?
-
-        start = CGI.parse(URI(next_link).query)["start"].first
-      end
-      return instances
-    end
-
-    def get_instances_by_status(status: 'running', region: nil)
-      instances = self.instances
-      if instances.count > 0
-        insts = instances.select {|i| i['status'] == status }
-        instances = insts
-      end
-      return instances
-    end
-
-    def instance_uptime(instance)
-      ((Time.now.utc - Time.parse(instance['created_at'])) / (60 * 60)).round(2)
-    end
-
   end
 end
-
-if __FILE__ == $0
-  extend BushSlicer::Common::Helper
-  ibm = BushSlicer::IBMCloud.new(region: 'eu-gb')
-  insts2 = ibm.instances
-  print inst2
-end
-

tools/cloud_usage.rb

@@ -81,18 +81,6 @@ def run
           ps.get_summary(target_region: options.region, options: options)
         end
       end
-      command :"ibmcloud" do |c|
-        c.syntax = "#{File.basename __FILE__} -r <ibmcloud_region_name> [--all]"
-        c.description = 'display summary of running instances'
-        c.option("-r", "--region region_name", "report on this region only")
-        c.option("-u", "--uptime cluter uptime limit", "report for clusters having uptime over this limit")
-        c.action do |args, options|
-          ps = IBMCloudSummary.new(svc_name: "ibmcloud", jenkins: @jenkins)
-          options.config = conf
-          say 'Getting summary...'
-          ps.get_summary(target_region: options.region, options: options)
-        end
-      end
       command :"gce" do |c|
         c.syntax = "#{File.basename __FILE__} -r <gce_region_name> [--all]"
         c.description = 'display summary of running instances'

tools/instance_summary.rb

@@ -869,126 +869,7 @@ def get_summary(target_region: nil, options: nil, global_region: "alicloud-v4")
       end
       print_grand_summary(grand_summary)
     end
-  end
-
-  class IBMCloudSummary < InstanceSummary
-    attr_accessor :ibm, :ibm_prices
-    def initialize(svc_name: :ibmcloud, jenkins: nil)
-      @ibm = IBMCloud.new(service_name: svc_name, region: 'us-east')
-      @jenkins = jenkins
-      @table = Text::Table.new
-      # hard-coded pricing lookup table name: => price/hr
-      @ibm_prices = {
-        "bx2-2x8" => 0.096,
-        "bx2d-2x8" => 0.104,
-        "bx2-4x16" => 0.192,
-        "bx2d-4x16" => 0.208,
-        "bx2-8x32" => 0.384,
-        "bx2d-8x32" => 0.417,
-        "bx2-16x64" => 0.768,
-        "bx2d-16x64" => 0.834,
-        "bx2-32x128" => 1.536,
-        "bx2d-32x128" => 1.668,
-        "bx2-48x192" => 2.305,
-        "bx2d-48x192" => 2.502,
-        "bx2-64x256" => 3.073,
-        "bx2d-64x256" => 3.336,
-        "bx2-96x384" => 4.609,
-        "bx2d-96x384" => 5.004,
-        "bx2-128x512" => 6.146,
-        "bx2d-128x512" => 6.672,
-      }
-    end
-
-    # @return <Hashed Array of Instances> with each hash key being keyed on the `owned` tag.
-    def regroup_instances(instances)
-      cluster_map = {}
-      instances.each do |r|
-        begin
-          owned = r.dig("resource_group", "name")
-        rescue
-          # for bastion hosts, there doesn't seem to be a tag associated with
-          # them, so just set it as empty
-          owned = no_owner
-        end
-        if cluster_map[owned]
-          cluster_map[owned] << r
-        else
-          cluster_map[owned] = [r]
-        end
-      end
-      return cluster_map
-    end
-
-    # @instances <Array of unordered Instance obj>
-    def summarize_instances(region, instances)
-      summary = []
-      ibm = @ibm
-      jenkins = @jenkins
-      cm = regroup_instances(instances)
-      cm.each do | owned, inst_list |
-        inst_list.each do | inst |
-          inst_summary = {}
-          # inst_summary[:inst_obj] = inst
-          inst_summary[:region] = region
-          inst_summary[:name]= inst["name"]
-          inst_summary[:type] = inst['profile']['name']
-          inst_summary[:uptime]= ibm.instance_uptime inst
-          inst_hourly_price = @ibm_prices[inst_summary[:type]]
-          cost = 0.0
-          if inst_hourly_price.nil?
-            inst_hourly_price = 0.0
-            puts "##### WARNING, setting hourly price for '#{inst_summary[:type]}' to 0.0 because it's not known"
-          end
-
-          cost = inst_summary[:uptime] * inst_hourly_price
-          inst_summary[:cost] = cost.round(2)
-          inst_summary[:owned] = owned
-          if inst_summary[:owned]
-            inst_summary[:flexy_job_id], inst_summary[:inst_prefix] = jenkins.get_jenkins_flexy_job_id(inst_summary[:owned])
-          else
-            inst_summary[:flexy_job_id], inst_summary[:inst_prefix] = nil, nil
-          end
-          summary << inst_summary
-        end
-      end
-      return summary
-    end
 
-    def get_summary(target_region: nil, options: nil, global_region: "ibmcloud")
-      regions = ibm.regions
-      ibm_instances = {}
-      threads = []
-      # regions is an Array of ihash
-      # for example: {"name"=>"au-syd", "href"=>"https://us-south.iaas.cloud.ibm.com/v1/regions/au-syd", "endpoint"=>"https://au-syd.iaas.cloud.ibm.com", "status"=>"available"
-      regions.each do | region |
-        if target_region
-          # first check name is valid
-          raise "Unsupported region '#{target_region}'" unless regions.map {|r| r['name']}.include? target_region
-          region_name = target_region
-        else
-          region_name = region['name']
-        end
-        end_point = region.dig('endpoint')
-        puts ("Getting instances for region '#{region_name}'...\n")
-        ibm = IBMCloud.new(region_id: region_name)
-        ibm.set_region(region_name)
-        instances = ibm.get_instances_by_status(status: 'running') #, region_name: region['name'], region_endpoint: end_point)
-        ibm_instances[region_name] = instances
-        break if target_region
-      end
-      grand_summary = []
-      ibm_instances.each do |region, inst_list|
-        total_cost = 0.0
-        summary = summarize_instances(region, inst_list)
-        print_summary(summary) if inst_list.count > 0
-        options.platform = "IBMCloud #{region}"
-        print_longlived_clusters(summary, options) if inst_list.count > 0
-        summary.each { |s| total_cost += s[:cost]}
-        grand_summary << {platform: 'IBMCloud', region: region, inst_count: inst_list.count, total_cost: total_cost}
-      end
-      print_grand_summary(grand_summary)
-    end
   end
 end