morpheus-cli 5.3.2.1 → 5.3.4

data/lib/morpheus/cli/network_scopes_command.rb

@@ -0,0 +1,442 @@
+require 'rest_client'
+require 'optparse'
+require 'filesize'
+require 'morpheus/cli/cli_command'
+require 'morpheus/cli/mixins/infrastructure_helper'
+
+class Morpheus::Cli::NetworkScopesCommand
+  include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::ProvisioningHelper
+  include Morpheus::Cli::WhoamiHelper
+
+  set_command_name :'network-scopes'
+  register_subcommands :list, :get, :add, :update, :remove
+
+  def connect(opts)
+    @api_client = establish_remote_appliance_connection(opts)
+    @account_interface = @api_client.accounts
+    @network_servers_interface = @api_client.network_servers
+    @options_interface = @api_client.options
+  end
+
+  def handle(args)
+    handle_subcommand(args)
+  end
+
+  def list(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[server]")
+      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "List network scopes." + "\n" +
+        "[server] is required. This is the name or id of a network server."
+    end
+
+    optparse.parse!(args)
+    connect(options)
+
+    if args.count < 1
+      puts optparse
+      return 1
+    end
+
+    server = find_network_server(args[0])
+    if server.nil?
+      return 1
+    end
+
+    _list(server, options)
+  end
+
+  def _list(server, options)
+    @network_servers_interface.setopts(options)
+
+    if options[:dry_run]
+      print_dry_run @network_servers_interface.dry.list_scopes(server['id'])
+      return
+    end
+
+    if server['type']['hasScopes']
+      json_response = @network_servers_interface.list_scopes(server['id'])
+      render_response(json_response, options, 'networkScopes') do
+        print_h1 "Network Scopes For: #{server['name']}"
+        print cyan
+        print_scopes(server, json_response['networkScopes'])
+      end
+    else
+      print_red_alert "Scopes not supported for #{server['type']['name']}"
+    end
+    print reset
+  end
+
+  def get(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[server] [scope]")
+      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "Display details on a network scope." + "\n" +
+        "[server] is required. This is the name or id of a network server.\n" +
+        "[scope] is required. This is the id of a network scope.\n"
+    end
+
+    optparse.parse!(args)
+    connect(options)
+
+    if args.count < 2
+      puts optparse
+      return 1
+    end
+
+    server = find_network_server(args[0])
+    if server.nil?
+      return 1
+    end
+
+    _get(server, args[1], options)
+  end
+
+  def _get(server, scope_id, options)
+    @network_servers_interface.setopts(options)
+
+    if options[:dry_run]
+      if scope_id.to_s =~ /\A\d{1,}\Z/
+        print_dry_run @network_servers_interface.dry.get_scope(server['id'], scope_id.to_i)
+      else
+        print_dry_run @network_servers_interface.dry.list_scopes(server['id'], {name: scope_id})
+      end
+      return
+    end
+
+    if server['type']['hasScopes']
+      scope = find_scope(server['id'], scope_id)
+
+      return 1 if scope.nil?
+
+      render_response({networkScope: scope}, options, 'networkScope') do
+        print_h1 "Network Scope Details"
+        print cyan
+
+        description_cols = {
+          "ID" => lambda {|it| it['id']},
+          "Name" => lambda {|it| it['name']},
+          "Description" => lambda {|it| it['description']},
+          "Status" => lambda {|it| it['status']}
+        }
+
+        if is_master_account
+          description_cols["Visibility"] = lambda {|it| it['visibility']}
+          description_cols["Tenants"] = lambda {|it| it['tenants'].collect {|tenant| tenant['name']}.join(', ')}
+        end
+
+        server['type']['scopeOptionTypes'].sort_by {|it| it['displayOrder']}.each do |option_type|
+          description_cols[option_type['fieldLabel']] = lambda {|it| Morpheus::Cli::OptionTypes.get_option_value(it, option_type, true)}
+        end
+        print_description_list(description_cols, scope)
+      end
+    else
+      print_red_alert "Scopes not supported for #{server['type']['name']}"
+    end
+    println reset
+  end
+
+  def add(args)
+    options = {:options=>{}}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = subcommand_usage("[server]")
+      opts.on( '--name NAME', "Name" ) do |val|
+        options[:name] = val.to_s
+      end
+      opts.on("--description [TEXT]", String, "Description") do |val|
+        options[:description] = val.to_s
+      end
+      add_perms_options(opts, options, ['plans', 'groups'])
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
+      opts.footer = "Create a network scope." + "\n" +
+        "[server] is required. This is the name or id of a network server.\n";
+    end
+    optparse.parse!(args)
+    connect(options)
+    if args.count < 1
+      print_error Morpheus::Terminal.angry_prompt
+      puts_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.inspect}\n#{optparse}"
+      return 1
+    end
+
+    server = find_network_server(args[0])
+    if server.nil?
+      return 1
+    end
+
+    if !server['type']['hasScopes']
+      print_red_alert "Scopes not supported for #{server['type']['name']}"
+      return 1
+    end
+
+    if options[:payload]
+      payload = options[:payload]
+    else
+      params['name'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => 'Name', 'required' => true, 'description' => 'Name.'}],options[:options],@api_client,{})['name']
+      params['description'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'description', 'type' => 'text', 'fieldLabel' => 'Description', 'required' => false, 'description' => 'Description.'}],options[:options],@api_client,{})['description']
+
+      option_types = server['type']['scopeOptionTypes'].sort_by {|it| it['displayOrder']}
+
+      # prompt options
+      option_result = Morpheus::Cli::OptionTypes.prompt(option_types, options[:options].deep_merge({:context_map => {'scope' => ''}}), @api_client, {'networkServerId' => server['id']}, nil, true)
+
+      # prompt permissions
+      perms = prompt_permissions(options, ['plans', 'groups'])
+      perms = {'visibility' => perms['resourcePool']['visibility'], 'tenants' => perms['tenantPermissions']['accounts'].collect {|it| {'id' => it}}}
+      payload = {'networkScope' => params.deep_merge(option_result).deep_merge(perms)}
+    end
+
+    @network_servers_interface.setopts(options)
+
+    if options[:dry_run]
+      print_dry_run @network_servers_interface.dry.create_scope(server['id'], payload)
+      return
+    end
+
+    json_response = @network_servers_interface.create_scope(server['id'], payload)
+    render_response(json_response, options, 'networkScope') do
+      print_green_success "\nAdded Network Scope #{json_response['id']}\n"
+      _get(server, json_response['id'], options)
+    end
+  end
+
+  def update(args)
+    options = {:options=>{}}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = subcommand_usage("[server] [scope]")
+      opts.on( '--name NAME', "Name" ) do |val|
+        params['name'] = val.to_s
+      end
+      opts.on("--description [TEXT]", String, "Description") do |val|
+        params['description'] = val.to_s
+      end
+      add_perms_options(opts, options, ['plans', 'groups'])
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
+      opts.footer = "Update a network scope.\n" +
+        "[server] is required. This is the name or id of an existing network server.\n" +
+        "[scope] is required. This is the name or id of an existing network scope."
+    end
+    optparse.parse!(args)
+    if args.count != 2
+      raise_command_error "wrong number of arguments, expected 2 and got (#{args.count}) #{args}\n#{optparse}"
+    end
+    connect(options)
+
+    server = find_network_server(args[0])
+    if server.nil?
+      return 1
+    end
+
+    if !server['type']['hasScopes']
+      print_red_alert "Scopes not supported for #{server['type']['name']}"
+      return 1
+    end
+
+    scope = find_scope(server['id'], args[1])
+    return 1 if scope.nil?
+
+    payload = parse_payload(options) || {'networkScope' => params}
+    payload['networkScope'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options] && !payload['networkScope'].nil?
+
+    if !options[:visibility].nil?
+      payload['networkScope']['visibility'] = options[:visibility]
+    end
+    if !options[:tenants].nil?
+      payload['networkScope']['tenants'] = options[:tenants].collect {|id| {id: id.to_i}}
+    end
+
+    if payload['networkScope'].empty?
+      option_types = server['type']['scopeOptionTypes'].sort_by {|it| it['displayOrder']}
+      print_green_success "Nothing to update"
+      println cyan
+      print Morpheus::Cli::OptionTypes.display_option_types_help(
+        option_types,
+        {:include_context => true, :context_map => {'scope' => ''}, :color => cyan, :title => "Available Scope Options"}
+      )
+      exit 1
+    end
+
+    #payload = {'networkScope' => scope.deep_merge(payload['networkScope'])}
+
+    @network_servers_interface.setopts(options)
+
+    if options[:dry_run]
+      print_dry_run @network_servers_interface.dry.update_scope(server['id'], scope['id'], payload)
+      return
+    end
+
+    json_response = @network_servers_interface.update_scope(server['id'], scope['id'], payload)
+    render_response(json_response, options, 'networkScope') do
+      print_green_success "\nUpdated Network Scope #{scope['id']}\n"
+      _get(server, scope['id'], options)
+    end
+  end
+
+  def remove(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[server] [scope]")
+      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :quiet, :remote])
+      opts.footer = "Delete a network scope.\n" +
+        "[server] is required. This is the name or id of an existing network server.\n" +
+        "[scope] is required. This is the name or id of an existing network scope."
+    end
+    optparse.parse!(args)
+    if args.count != 2
+      raise_command_error "wrong number of arguments, expected 2 and got (#{args.count}) #{args}\n#{optparse}"
+    end
+    connect(options)
+
+    server = find_network_server(args[0])
+    if server.nil?
+      return 1
+    end
+
+    if !server['type']['hasScopes']
+      print_red_alert "Scopes not supported for #{server['type']['name']}"
+      return 1
+    end
+
+    scope = find_scope(server['id'], args[1])
+    return 1 if scope.nil?
+
+    unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to remove the network scope '#{scope['name']}' from server '#{server['name']}'?", options)
+      return 9, "aborted command"
+    end
+
+    @network_servers_interface.setopts(options)
+
+    if options[:dry_run]
+      print_dry_run @network_servers_interface.dry.destroy_scope(server['id'], scope['id'])
+      return
+    end
+    json_response = @network_servers_interface.destroy_scope(server['id'], scope['id'])
+    render_response(json_response, options, 'networkScope') do
+      print_green_success "\nDeleted Network Scope #{scope['name']}\n"
+      _list(server, options)
+    end
+  end
+
+  private
+
+  def print_scopes(server, scopes)
+    if scopes.count > 0
+      cols = [:id, :name, :description, :status]
+      server['type']['scopeOptionTypes'].sort_by {|it| it['displayOrder']}.each do |option_type|
+        cols << option_type['fieldLabel']
+      end
+      cols += [:visibility, :tenants] if is_master_account
+      rows = scopes.collect do |it|
+        row = {
+          id: it['id'],
+          name: it['name'],
+          description: it['description'],
+          status: it['statusMessage'],
+        }
+        server['type']['scopeOptionTypes'].sort_by {|it| it['displayOrder']}.each do |option_type|
+          row[option_type['fieldLabel']] = Morpheus::Cli::OptionTypes.get_option_value(it, option_type, true)
+        end
+        if is_master_account
+          row = row.merge({
+            visibility: it['visibility'],
+            tenants: it['tenants'].collect {|it| it['name']}.join(', ')
+          })
+        end
+        row
+      end
+      puts as_pretty_table(rows, cols)
+    else
+      println "No Scopes\n"
+    end
+  end
+
+  def find_network_server(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_network_server_by_id(val)
+    else
+      if server = find_network_server_by_name(val)
+        return find_network_server_by_id(server['id'])
+      end
+    end
+  end
+
+  def find_network_server_by_id(id)
+    begin
+      json_response = @network_servers_interface.get(id.to_i)
+      return json_response['networkServer']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Network Server not found by id #{id}"
+        return nil
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_network_server_by_name(name)
+    json_response = @network_servers_interface.list({phrase: name.to_s})
+    servers = json_response['networkServers']
+    if servers.empty?
+      print_red_alert "Network Server not found by name #{name}"
+      return nil
+    elsif servers.size > 1
+      print_red_alert "#{servers.size} network servers found by name #{name}"
+      rows = servers.collect do |it|
+        {id: it['id'], name: it['name']}
+      end
+      puts as_pretty_table(rows, [:id, :name], {color:red})
+      return nil
+    else
+      return servers[0]
+    end
+  end
+
+  def find_scope(server_id, val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_scope_by_id(server_id, val)
+    else
+      if scope = find_scope_by_name(server_id, val)
+        return find_scope_by_id(server_id, scope['id'])
+      end
+    end
+  end
+
+  def find_scope_by_id(server_id, scope_id)
+    begin
+      json_response = @network_servers_interface.get_scope(server_id, scope_id.to_i)
+      return json_response['networkScope']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Network Scope not found by id #{id}"
+        return nil
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_scope_by_name(server_id, name)
+    json_response = @network_servers_interface.list_scope(server_id, {phrase: name.to_s})
+    scopes = json_response['networkScopes']
+    if scopes.empty?
+      print_red_alert "Network Scope not found by name #{name}"
+      return nil
+    elsif scopes.size > 1
+      print_red_alert "#{scopes.size} network scopes found by name #{name}"
+      rows = scopes.collect do |it|
+        {id: it['id'], name: it['name']}
+      end
+      puts as_pretty_table(rows, [:id, :name], {color:red})
+      return nil
+    else
+      return scopes[0]
+    end
+  end
+
+end

data/lib/morpheus/cli/networks_command.rb

@@ -617,9 +617,10 @@ class Morpheus::Cli::NetworksCommand
         if network_type_option_types && network_type_option_types.size > 0
           api_params = {}
           api_params['network.site.id'] = group ? group['id'] : 'shared'
+          api_params['network.zone.id'] = cloud['id'] if !cloud.nil?
           api_params['network.type.id'] = network_type['id']
           api_params['network.networkServer.id'] = network_server_id if !network_server_id.nil?
-          network_type_params = Morpheus::Cli::OptionTypes.prompt(network_type_option_types,options[:options],@api_client, api_params)
+          network_type_params = Morpheus::Cli::OptionTypes.prompt(network_type_option_types,(options[:options] || {}).merge(payload),@api_client, api_params)
           # network context options belong at network level and not network.network
           network_context_params = network_type_params.delete('network')
           payload['network'].deep_merge!(network_context_params) if network_context_params
@@ -660,8 +661,7 @@ class Morpheus::Cli::NetworksCommand
             payload['network']['pool'] = options['pool'].to_i
           else
             # todo: select dropdown
-            # v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'pool', 'fieldLabel' => 'Network Pool', 'type' => 'select', 'optionSource' => 'networkPools', 'required' => false, 'description' => ''}], options, @api_client, {zoneId: cloud['id']})
-            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'pool', 'fieldLabel' => 'Network Pool', 'type' => 'text', 'required' => false, 'description' => ''}], options)
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'pool', 'fieldLabel' => 'Network Pool', 'type' => 'select', 'optionSource' => 'networkPools', 'required' => false, 'description' => ''}], options, @api_client, api_params)
             payload['network']['pool'] = v_prompt['pool'].to_i if v_prompt['pool']
           end
         end

data/lib/morpheus/cli/option_parser.rb

@@ -32,27 +32,35 @@ module Morpheus
           #out << "Options:\n"
           # the default way..
           # out << summarize().join("")
-
           # super hacky, should be examining the option, not the fully formatted description
           my_summaries = summarize()
-          summarize().each do |opt_description|
-            is_hidden = (@hidden_options || []).find { |hidden_switch|
-              # opt_description.include?("--#{hidden_switch}")
-              if hidden_switch.start_with?("-")
-                opt_description.to_s.strip.start_with?("#{hidden_switch} ")
-              else
-                opt_description.to_s.strip.start_with?("--#{hidden_switch} ")
-              end
-            }
-            if is_hidden
-              if opts[:show_hidden_options]
-                # out << opt_description + " (hidden)"
-                out << opt_description
+          if opts[:show_hidden_options]
+            my_summaries.each do |full_line|
+              out << full_line
+            end
+          else
+            on_hidden_option = false
+            my_summaries.each do |full_line|
+              opt_description = full_line.to_s.strip
+              if opt_description.start_with?("-")
+                is_hidden = (@hidden_options || []).find { |hidden_switch|
+                  if hidden_switch.start_with?("-")
+                    opt_description.start_with?("#{hidden_switch} ")
+                  else
+                    opt_description.start_with?("--#{hidden_switch} ")
+                  end
+                }
+                if is_hidden
+                  on_hidden_option = true
+                else
+                  on_hidden_option = false
+                  out << full_line
+                end
               else
-                # hidden
+                if on_hidden_option == false
+                  out << full_line
+                end
               end
-            else
-              out << opt_description
             end
           end
         end

data/lib/morpheus/cli/option_types.rb

@@ -61,11 +61,11 @@ module Morpheus
         ).each do |option_type|
           context_map = results
           value = nil
-          value_found=false
+          value_found = false
+          field_group = (option_type['fieldGroup'] || 'default').to_s.sub(/options\Z/i, "").strip # avoid "ADVANCED OPTION OPTIONS"
 
-          if cur_field_group != (option_type['fieldGroup'] || 'default')
-            cur_field_group = option_type['fieldGroup']
-            cur_field_group = cur_field_group.to_s.sub(/options\Z/i, "").strip # avoid "ADVANCED OPTION OPTIONS"
+          if cur_field_group != field_group
+            cur_field_group = field_group
             print "\n#{cur_field_group.upcase} OPTIONS\n#{"=" * ("#{cur_field_group} OPTIONS".length)}\n\n"
           end
 
@@ -102,10 +102,10 @@ module Morpheus
             end
 
             found_dep_value = match_type == 'all' ? true : false
-            visible_option_check_value.split(',').each do |value|
+            visible_option_check_value.sub(',', ' ').split(' ').each do |value|
               parts = value.split(':')
               depends_on_code = parts[0]
-              depends_on_value = parts.count > 1 ? parts[1].to_s.strip : '.'
+              depends_on_value = parts.count > 1 ? parts[1].to_s.strip : nil
               depends_on_option_type = option_types.find {|it| it["code"] == depends_on_code }
               if !depends_on_option_type
                 depends_on_option_type = option_types.find {|it|
@@ -115,13 +115,18 @@ module Morpheus
 
               if depends_on_option_type
                 depends_on_field_key = depends_on_option_type['fieldContext'].nil? || depends_on_option_type['fieldContext'].empty? ? "#{depends_on_option_type['fieldName']}" : "#{depends_on_option_type['fieldContext']}.#{depends_on_option_type['fieldName']}"
-                field_value = get_object_value(results, depends_on_field_key) || get_object_value(options, depends_on_field_key)
+              else
+                depends_on_field_key = depends_on_code
+              end
 
-                if !field_value.nil? && field_value.match?(depends_on_value)
-                  found_dep_value = true if match_type != 'all'
-                else
-                  found_dep_value = false if match_type == 'all'
-                end
+              field_value = get_object_value(results, depends_on_field_key) ||
+                            get_object_value(options, depends_on_field_key) ||
+                            get_object_value(api_params, depends_on_field_key)
+
+              if !field_value.nil? && (depends_on_value.nil? || depends_on_value.empty? || field_value.match?(depends_on_value))
+                found_dep_value = true if match_type != 'all'
+              else
+                found_dep_value = false if match_type == 'all'
               end
             end
             next if !found_dep_value
@@ -237,7 +242,7 @@ module Morpheus
               # I suppose the entered value should take precedence
               # api_params = api_params.merge(options) # this might be good enough
               # dup it
-              value = select_prompt(option_type, api_client, (option_type['noParams'] ? {} : (api_params || {}).merge(results)), options[:no_prompt], nil, paging_enabled)
+              value = select_prompt(option_type, api_client, (option_type['noParams'] ? {} : (api_params || {}).deep_merge(results)), options[:no_prompt], nil, paging_enabled)
               if value && option_type['type'] == 'multiSelect'
                 value = [value]
                 while self.confirm("Add another #{option_type['fieldLabel']}?", {:default => false}) do
@@ -276,7 +281,8 @@ module Morpheus
             value = [value] if !value.nil? && !value.is_a?(Array)
             # parent_context_map[parent_ns] = value
           end
-          context_map[field_name] = value
+          context_map[field_name] = value if !(value.nil? || (value.is_a?(Hash) && value.empty?))
+          parent_context_map.reject! {|k,v| k == parent_ns && (v.nil? || (v.is_a?(Hash) && v.empty?))}
         end
         results
       end
@@ -947,8 +953,9 @@ module Morpheus
         out << "\n"
         out << "#{header}\n"
         out << "#{'=' * header.length}\n"
+
         select_options.each do |option|
-          out << " * #{option['name']} [#{option['value']}]\n"
+          out << (option['isGroup'] ? "- #{option['name']}\n" : " * #{option['name']} [#{option['value']}]\n")
         end
         return out
       end
@@ -985,6 +992,26 @@ module Morpheus
           return option_type['required'] ? '' : ' (optional)'
         end
       end
+
+      def self.get_option_value(obj, option_type, format=false)
+        context = option_type['fieldContext'] == 'config' ? obj['config'] : obj
+        name = option_type['fieldName']
+        tokens = name.split('.')
+
+        if tokens.length > 1
+          tokens.slice(0, tokens.length - 1).each do |token|
+            context = context[name = token]
+          end
+        end
+
+        rtn = context[name]
+
+        if format
+          rtn = (rtn ? 'On' : 'Off') if option_type['type'] == 'checkbox'
+          rtn = rtn.join(', ') if rtn.is_a?(Array)
+        end
+        rtn
+      end
     end
   end
 end

data/lib/morpheus/cli/subnets_command.rb

@@ -350,8 +350,13 @@ class Morpheus::Cli::SubnetsCommand
         if subnet_type_option_types && subnet_type_option_types.size > 0
           # prompt for option types
           subnet_type_params = Morpheus::Cli::OptionTypes.prompt(subnet_type_option_types,options[:options],@api_client, {networkId: network['id'], zoneId: network['zone']['id']})
-          payload['subnet'].deep_merge!(subnet_type_params['subnet'])
-
+          if subnet_type_params['subnet']
+            payload['subnet'].deep_merge!(subnet_type_params['subnet'])
+          end
+          if subnet_type_params['config']
+            payload['subnet']['config'] ||= {}
+            payload['subnet']['config'].deep_merge!(subnet_type_params['config'])
+          end
         else
           # DEFAULT INPUTS