morpheus-cli 4.1.5 → 4.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cf9fe88c6a717fcd35c655ca1bf208842bd6669c793a698cbee17d6a1c6263a
-  data.tar.gz: fc1ecf887d8b6bd1ef7b3de650d1a2a9d88bd13a7fc4b6a781858623da57dcd3
+  metadata.gz: c550fa0412be48d0457ca10f54822e7b77e25bb515e6c5cb6092d43f9aee66a6
+  data.tar.gz: a8949f6a0ace1bc99f6a327ebe30e8f9678c9922c9a3d8a776543475c94141f0
 SHA512:
-  metadata.gz: 2af125ef03ebc7cfcdd528f069c33a4af72e037039b3256c954bb2e8f75511989b25be9b06a5508a49d28ebfe2686ecec6057ba19066c4daf466135570d3a9bd
-  data.tar.gz: ccf40b9d7d5e1a0bc7f12d5cb9249da035c5d043028fbf5ceb58dfdf95f2fad5b53eda43a0e9521060f92d77fd2e6369cbbe53616b92bf78ad762c241014aac8
+  metadata.gz: 46e33763b7980a60312a7479d0104dab355e34c8a01e7a561b98a18468360a975dbbc26fabc2f61ac7f0506be8e8c4f3dbc8fc998d23cd6b1481cdedbb341d1a
+  data.tar.gz: 6e64c4f697547bbad0fcba6e9aeb6ec218daf37491d5b0ebb4b309ac523a3389aeb621e6c9265035c6233bc3b0b7189d36d5ba9c08133d2d104430135802d598

data/lib/morpheus/api/api_client.rb

@@ -490,12 +490,12 @@ class Morpheus::APIClient
     Morpheus::NetworkTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
-  def network_subnets
-    Morpheus::NetworkSubnetsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+  def subnets
+    Morpheus::SubnetsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
-  def network_subnet_types
-    Morpheus::NetworkSubnetTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+  def subnet_types
+    Morpheus::SubnetTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def network_groups

data/lib/morpheus/api/network_subnets_interface.rb

@@ -1,5 +1,6 @@
 require 'morpheus/api/api_client'
 
+# This is deprecated, use SubnetsInterface instead.
 class Morpheus::NetworkSubnetsInterface < Morpheus::APIClient
   def initialize(access_token, refresh_token,expires_at = nil, base_url=nil) 
     @access_token = access_token

data/lib/morpheus/api/security_groups_interface.rb

@@ -15,7 +15,7 @@ class Morpheus::SecurityGroupsInterface < Morpheus::APIClient
   end
 
   def get(id, params={})
-    url = "#{@base_url}/api/security-groups"
+    url = "#{@base_url}/api/security-groups/#{id}"
     headers = { params: {}, authorization: "Bearer #{@access_token}" }
 
     if options.is_a?(Hash)

data/lib/morpheus/api/{network_subnet_types_interface.rb → subnet_types_interface.rb}

@@ -1,6 +1,6 @@
 require 'morpheus/api/api_client'
 
-class Morpheus::NetworkSubnetTypesInterface < Morpheus::APIClient
+class Morpheus::SubnetTypesInterface < Morpheus::APIClient
   def initialize(access_token, refresh_token,expires_at = nil, base_url=nil) 
     @access_token = access_token
     @refresh_token = refresh_token
@@ -10,14 +10,14 @@ class Morpheus::NetworkSubnetTypesInterface < Morpheus::APIClient
 
 def get(id, params={})
     raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
-    url = "#{@base_url}/api/network-subnet-types/#{id}"
+    url = "#{@base_url}/api/subnet-types/#{id}"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts)
   end
 
   def list(params={})
-    url = "#{@base_url}/api/network-subnet-types"
+    url = "#{@base_url}/api/subnet-types"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts)

data/lib/morpheus/api/subnets_interface.rb

@@ -24,7 +24,7 @@ class Morpheus::SubnetsInterface < Morpheus::APIClient
   end
 
   def create(network_id, payload)
-    url = "#{@base_url}/api/subnets"
+    url = "#{@base_url}/api/networks/#{network_id}/subnets"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
     execute(opts)

data/lib/morpheus/cli/appliance_settings_command.rb

@@ -3,15 +3,13 @@ require 'morpheus/cli/cli_command'
 class Morpheus::Cli::ApplianceSettingsCommand
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::AccountsHelper
-
+  set_command_hidden # hide until 4.2.0
   set_command_name :'appliance-settings'
 
   register_subcommands :get, :update
   
   set_default_subcommand :get
 
-  set_command_hidden # hiding until 4.2 release
-
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
     @appliance_settings_interface = @api_client.appliance_settings

data/lib/morpheus/cli/cli_command.rb

@@ -966,6 +966,10 @@ module Morpheus
           else
             output = records_as_csv([row], options)
           end
+        elsif options[:quiet]
+          # note: returning non nil means the calling function knows to return rght away.. kinda weird..
+          # but means we need less if options[:quiet] blocks in every action.
+          output = ""
         end
         if output
           if options[:outfile]

data/lib/morpheus/cli/credentials.rb

@@ -354,7 +354,7 @@ module Morpheus
         @@appliance_credentials_map = load_credentials_file || {}
         @@appliance_credentials_map.delete(appliance_name.to_s)
         @@appliance_credentials_map.delete(appliance_name.to_sym)
-        Morpheus::Logging::DarkPrinter.puts "clearing credentials for #{appliance_name} from file #{credentials_file_path}" if Morpheus::Logging.debug?
+        #Morpheus::Logging::DarkPrinter.puts "clearing credentials for #{appliance_name} from file #{credentials_file_path}" if Morpheus::Logging.debug?
         File.open(credentials_file_path, 'w') {|f| f.write @@appliance_credentials_map.to_yaml } #Store
         ::Morpheus::Cli::Remote.recalculate_variable_map()
         true
@@ -376,7 +376,7 @@ module Morpheus
       def load_credentials_file
         fn = credentials_file_path
         if File.exist? fn
-          Morpheus::Logging::DarkPrinter.puts "loading credentials file #{fn}" if Morpheus::Logging.debug?
+          #Morpheus::Logging::DarkPrinter.puts "loading credentials file #{fn}" if Morpheus::Logging.debug?
           return YAML.load_file(fn)
         else
           return nil
@@ -405,7 +405,7 @@ module Morpheus
           if !Dir.exists?(File.dirname(fn))
             FileUtils.mkdir_p(File.dirname(fn))
           end
-          Morpheus::Logging::DarkPrinter.puts "adding credentials for #{appliance_name} to #{fn}" if Morpheus::Logging.debug?
+          #Morpheus::Logging::DarkPrinter.puts "adding credentials for #{appliance_name} to #{fn}" if Morpheus::Logging.debug?
           File.open(fn, 'w') {|f| f.write credential_map.to_yaml } #Store
           FileUtils.chmod(0600, fn)
           @@appliance_credentials_map = credential_map
@@ -442,8 +442,7 @@ module Morpheus
           if !Dir.exists?(File.dirname(fn))
             FileUtils.mkdir_p(File.dirname(fn))
           end
-          #Morpheus::Logging::DarkPrinter.puts "renaming credentials for #{appliance_name} to #{fn}" if Morpheus::Logging.debug?
-          Morpheus::Logging::DarkPrinter.puts "renaming credentials from #{appliance_name} to #{appliance_name}" if Morpheus::Logging.debug?
+          #Morpheus::Logging::DarkPrinter.puts "renaming credentials from #{appliance_name} to #{new_appliance_name}" if Morpheus::Logging.debug?
           File.open(fn, 'w') {|f| f.write credential_map.to_yaml } #Store
           FileUtils.chmod(0600, fn)
           @@appliance_credentials_map = credential_map

data/lib/morpheus/cli/error_handler.rb

@@ -17,11 +17,13 @@ class Morpheus::Cli::ErrorHandler
   def handle_error(err, options={})
     exit_code = 1
     options = (options || {}).clone
-    # heh
-    if Morpheus::Logging.debug? && options[:debug].nil?
+    if Morpheus::Logging.debug?
       options[:debug] = true
     end
     do_print_stacktrace = true
+    
+    #@stderr.puts "#{dark}Handling error #{err.class} - #{err}#{reset}"
+
     case (err)
     when ::OptionParser::InvalidOption, ::OptionParser::AmbiguousOption, 
         ::OptionParser::MissingArgument, ::OptionParser::InvalidArgument, 
@@ -61,10 +63,7 @@ class Morpheus::Cli::ErrorHandler
     when RestClient::Exception
       print_rest_exception(err, options)
       # no stacktrace for now...
-      return exit_code
-      # if !options[:debug]
-      #   return exit_code
-      # end
+      return exit_code, err
     when ArgumentError
       @stderr.puts "#{red}Argument Error: #{err.message}#{reset}"
     else
@@ -83,7 +82,7 @@ class Morpheus::Cli::ErrorHandler
       end
     end
 
-    return exit_code
+    return exit_code, err
 
   end
 
@@ -149,7 +148,8 @@ class Morpheus::Cli::ErrorHandler
       @stderr.print red, "Error Communicating with the Appliance. #{e}", reset, "\n"
     end
     # uh, having this print method return exit_code, err to standardize return values of methods that are still calling it, at the end just by chance..
-    return exit_code, err #.to_s
+    # return exit_code, err
+    return 1, err
   end
 
   def print_rest_errors(response, options={})

data/lib/morpheus/cli/groups.rb

@@ -773,7 +773,7 @@ public
     def load_group_file
       fn = groups_file_path
       if File.exist? fn
-        Morpheus::Logging::DarkPrinter.puts "loading groups file #{fn}" if Morpheus::Logging.debug?
+        #Morpheus::Logging::DarkPrinter.puts "loading groups file #{fn}" if Morpheus::Logging.debug?
         return YAML.load_file(fn)
       else
         {}

data/lib/morpheus/cli/license.rb

@@ -68,10 +68,10 @@ class Morpheus::Cli::License
         return exit_code, err
       end
       
-      # if exit_code != 0 
-      #   print_error red, err.to_s, reset, "\n"
-      #   return exit_code, err
-      # end
+      if exit_code != 0 
+        print_error red, err.to_s, reset, "\n"
+        return exit_code, err
+      end
       
       # render output
 
@@ -143,8 +143,8 @@ class Morpheus::Cli::License
       if options[:json]
         puts JSON.pretty_generate(json_response)
       else
-        print_green_success "License applied successfully!"
-        # get([]) # show it
+        print_green_success "License installed!"
+        get([] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
       return 0
     rescue RestClient::Exception => e
@@ -265,12 +265,6 @@ class Morpheus::Cli::License
       end
 
       json_response = @license_interface.uninstall(params)
-      
-      @apps_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @apps_interface.dry.wiki(app["id"], params)
-        return
-      end
       render_result = render_with_format(json_response, options)
       return 0 if render_result
       return 0 if options[:quiet]

data/lib/morpheus/cli/mixins/infrastructure_helper.rb

@@ -21,6 +21,36 @@ module Morpheus::Cli::InfrastructureHelper
     @clouds_interface
   end
 
+  def networks_interface
+    # @api_client.networks
+    raise "#{self.class} has not defined @networks_interface" if @networks_interface.nil?
+    @networks_interface
+  end
+
+  def subnets_interface
+    # @api_client.subnets
+    raise "#{self.class} has not defined @subnets_interface" if @subnets_interface.nil?
+    @subnets_interface
+  end
+
+  def network_groups_interface
+    # @api_client.network_groups
+    raise "#{self.class} has not defined @network_groups_interface" if @network_groups_interface.nil?
+    @network_groups_interface
+  end
+
+  def network_types_interface
+    # @api_client.network_types
+    raise "#{self.class} has not defined @network_types_interface" if @network_types_interface.nil?
+    @network_types_interface
+  end
+  
+  def subnet_types_interface
+    # @api_client.subnet_types
+    raise "#{self.class} has not defined @subnet_types_interface" if @subnet_types_interface.nil?
+    @subnet_types_interface
+  end
+
   def find_group_by_name_or_id(val)
     if val.to_s =~ /\A\d{1,}\Z/
       return find_group_by_id(val)
@@ -103,4 +133,349 @@ module Morpheus::Cli::InfrastructureHelper
     return get_available_cloud_types().find { |z| z['name'].downcase == name.downcase || z['code'].downcase == name.downcase}
   end
 
+
+  # Networks
+
+  def find_network_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_network_by_id(val)
+    else
+      return find_network_by_name(val)
+    end
+  end
+
+  def find_network_by_id(id)
+    begin
+      json_response = networks_interface.get(id.to_i)
+      return json_response['network']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Network not found by id #{id}"
+        return nil
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_network_by_name(name)
+    json_response = networks_interface.list({name: name.to_s})
+    networks = json_response['networks']
+    if networks.empty?
+      print_red_alert "Network not found by name #{name}"
+      return nil
+    elsif networks.size > 1
+      print_red_alert "#{networks.size} networks found by name #{name}"
+      rows = networks.collect do |it|
+        {id: it['id'], name: it['name']}
+      end
+      puts as_pretty_table(rows, [:id, :name], {color:red})
+      return nil
+    else
+      network = networks[0]
+      # merge in tenants map
+      if json_response['tenants'] && json_response['tenants'][network['id']]
+        network['tenants'] = json_response['tenants'][network['id']]
+      end
+      return network
+    end
+  end
+
+  def find_network_type_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_network_type_by_id(val)
+    else
+      return find_network_type_by_name(val)
+    end
+  end
+
+  def find_network_type_by_id(id)
+    begin
+      json_response = network_types_interface.get(id.to_i)
+      return json_response['networkType']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Network Type not found by id #{id}"
+        return nil
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_network_type_by_name(name)
+    json_response = network_types_interface.list({name: name.to_s})
+    network_types = json_response['networkTypes']
+    if network_types.empty?
+      print_red_alert "Network Type not found by name #{name}"
+      return network_types
+    elsif network_types.size > 1
+      print_red_alert "#{network_types.size} network types found by name #{name}"
+      rows = network_types.collect do |it|
+        {id: it['id'], name: it['name']}
+      end
+      puts as_pretty_table(rows, [:id, :name], {color:red})
+      return nil
+    else
+      return network_types[0]
+    end
+  end
+
+  def find_subnet_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_subnet_by_id(val)
+    else
+      return find_subnet_by_name(val)
+    end
+  end
+
+  def find_subnet_by_id(id)
+    begin
+      json_response = subnets_interface.get(id.to_i)
+      return json_response['subnet']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Subnet not found by id #{id}"
+        return nil
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_subnet_by_name(name)
+    json_response = subnets_interface.list({name: name.to_s})
+    subnets = json_response['subnets']
+    if subnets.empty?
+      print_red_alert "Subnet not found by name #{name}"
+      return nil
+    elsif subnets.size > 1
+      print_red_alert "#{subnets.size} subnets found by name #{name}"
+      rows = subnets.collect do |it|
+        {id: it['id'], name: it['name']}
+      end
+      puts as_pretty_table(rows, [:id, :name], {color:red})
+      return nil
+    else
+      return subnets[0]
+    end
+  end
+
+  def find_subnet_type_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_subnet_type_by_id(val)
+    else
+      return find_subnet_type_by_name(val)
+    end
+  end
+
+  def find_subnet_type_by_id(id)
+    begin
+      json_response = subnet_types_interface.get(id.to_i)
+      return json_response['subnetType']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Subnet Type not found by id #{id}"
+        return nil
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_subnet_type_by_name(name)
+    json_response = subnet_types_interface.list({name: name.to_s})
+    subnet_types = json_response['subnetTypes']
+    if subnet_types.empty?
+      print_red_alert "Subnet Type not found by name #{name}"
+      return subnet_types
+    elsif subnet_types.size > 1
+      print_red_alert "#{subnet_types.size} subnet types found by name #{name}"
+      rows = subnet_types.collect do |it|
+        {id: it['id'], name: it['name']}
+      end
+      puts as_pretty_table(rows, [:id, :name], {color:red})
+      return nil
+    else
+      return subnet_types[0]
+    end
+  end
+
+  def find_network_group_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_network_group_by_id(val)
+    else
+      return find_network_group_by_name(val)
+    end
+  end
+
+  def find_network_group_by_id(id)
+    begin
+      json_response = network_groups_interface.get(id.to_i)
+      return json_response['networkGroup']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Network Group not found by id #{id}"
+        return nil
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_network_group_by_name(name)
+    json_response = network_groups_interface.list({name: name.to_s})
+    network_groups = json_response['networkGroups']
+    if network_groups.empty?
+      print_red_alert "Network Group not found by name #{name}"
+      return nil
+    elsif network_groups.size > 1
+      print_red_alert "#{network_groups.size} network groups found by name #{name}"
+      # print_networks_table(networks, {color: red})
+      rows = network_groups.collect do |it|
+        {id: it['id'], name: it['name']}
+      end
+      puts as_pretty_table(rows, [:id, :name], {color:red})
+      return nil
+    else
+      return network_groups[0]
+    end
+  end
+
+  def prompt_for_network(network_id, options={}, required=true, field_name='network', field_label='Network')
+    # Prompt for a Network, text input that searches by name or id
+    network = nil
+    still_prompting = true
+    while still_prompting do
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => field_name, 'type' => 'text', 'fieldLabel' => field_label, 'required' => required, 'description' => 'Network name or ID.'}], network_id ? {(field_name) => network_id} : {})
+      network_id = v_prompt['network']
+      begin
+        network = find_network_by_name_or_id(network_id)
+      rescue SystemExit => cmdexit
+      end
+      if options[:no_prompt]
+        still_prompting = false
+      else
+        still_prompting = network ? false : true
+      end
+      if still_prompting
+        network_id = nil
+      end
+    end
+    return {success:!!network, network: network}
+  end
+
+  def prompt_for_networks(params, options={}, api_client=nil, api_params={})
+    # Networks
+    network_list = nil
+    network_ids = nil
+    still_prompting = true
+    if params['networks'].nil?
+      still_prompting = true
+      while still_prompting do
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'networks', 'type' => 'text', 'fieldLabel' => 'Networks', 'required' => false, 'description' => 'Networks to include, comma separated list of names or IDs.'}], options[:options])
+        unless v_prompt['networks'].to_s.empty?
+          network_list = v_prompt['networks'].split(",").collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+        end
+        network_ids = []
+        bad_ids = []
+        if network_list && network_list.size > 0
+          network_list.each do |it|
+            found_network = nil
+            begin
+              found_network = find_network_by_name_or_id(it)
+            rescue SystemExit => cmdexit
+            end
+            if found_network
+              network_ids << found_network['id']
+            else
+              bad_ids << it
+            end
+          end
+        end
+        still_prompting = bad_ids.empty? ? false : true
+      end
+    else
+      network_list = params['networks']
+      still_prompting = false
+      network_ids = []
+      bad_ids = []
+      if network_list && network_list.size > 0
+        network_list.each do |it|
+          found_network = nil
+          begin
+            found_network = find_network_by_name_or_id(it)
+          rescue SystemExit => cmdexit
+          end
+          if found_network
+            network_ids << found_network['id']
+          else
+            bad_ids << it
+          end
+        end
+      end
+      if !bad_ids.empty?
+        return {success:false, msg:"Networks not found: #{bad_ids}"}
+      end
+    end
+    return {success:true, data: network_ids}
+  end
+
+  def prompt_for_subnets(params, options={}, api_client=nil, api_params={})
+    # todo: make this a generic method now please.
+    # Subnets
+    record_list = nil
+    record_ids = nil
+    still_prompting = true
+    if params['subnets'].nil?
+      still_prompting = true
+      while still_prompting do
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'subnets', 'type' => 'text', 'fieldLabel' => 'Subnets', 'required' => false, 'description' => 'Subnets to include, comma separated list of names or IDs.'}], options[:options])
+        unless v_prompt['subnets'].to_s.empty?
+          record_list = v_prompt['subnets'].split(",").collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+        end
+        record_ids = []
+        bad_ids = []
+        if record_list && record_list.size > 0
+          record_list.each do |it|
+            found_record = nil
+            begin
+              found_record = find_subnet_by_name_or_id(it)
+            rescue SystemExit => cmdexit
+            end
+            if found_record
+              record_ids << found_record['id']
+            else
+              bad_ids << it
+            end
+          end
+        end
+        still_prompting = bad_ids.empty? ? false : true
+      end
+    else
+      record_list = params['subnets']
+      still_prompting = false
+      record_ids = []
+      bad_ids = []
+      if record_list && record_list.size > 0
+        record_list.each do |it|
+          found_network = nil
+          begin
+            found_network = find_record_by_name_or_id(it)
+          rescue SystemExit => cmdexit
+          end
+          if found_network
+            record_ids << found_network['id']
+          else
+            bad_ids << it
+          end
+        end
+      end
+      if !bad_ids.empty?
+        return {success:false, msg:"Subnets not found: #{bad_ids}"}
+      end
+    end
+    return {success:true, data: record_ids}
+  end
+
 end

data/lib/morpheus/cli/monitoring_alerts_command.rb

@@ -15,8 +15,6 @@ class Morpheus::Cli::MonitoringAlertsCommand
 
   register_subcommands :list, :get, :add, :update, :remove
 
-  set_command_hidden # hiding until 4.1.1 release
-
   def initialize()
     # @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
   end