morpheus-cli 6.2.2 → 6.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a11e083645c99cce105a6ee0a38ba60904debd213c3223f07e84a335a755b6a
-  data.tar.gz: 318bbfa3ecfa0b2533e29de1a8b773389cac8c7e36c4b75b71316bc1b860aef8
+  metadata.gz: a5930c4f23cd2074b678db885c77f067ca32b305371cb93875a372b22a91fd18
+  data.tar.gz: 036f912c60e1f86ba302dc240cc1a485722ef0716752d934a352e54d797fd5d4
 SHA512:
-  metadata.gz: 79c6bd2a41bbd7c5fc79dfecd769db385626eea40bcf1ca19d6d4021f0cc57404c8eab74bfc831013f55b0668a1cbce86b909d11b71723a9bfc1587b29beb6c4
-  data.tar.gz: 21973cfd06571448876862f243895dc2334f19f5c20355cff9224d4d1c319911776a7d60c93196b1d79e5e16c65b66b1179476b89816931b181bad7e98bbd3dc
+  metadata.gz: c93378cfb509b11873be3d183f69bc5662fd5afb6888ea759271347e84f87443a73c9eb80a12572b1c196f1afe8ebf40068d00290053ebad398df5ee320d8446
+  data.tar.gz: 1c277dd0ff9b918b3c2dfd9fc7bc0c4ed662e59ba3fa10a4abf3d037ffc08211e0f0c7a040917ca1322dbc06610391f676560ec195ddd794ff50d2098658235b

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.7.5
 
-RUN gem install morpheus-cli -v 6.2.2
+RUN gem install morpheus-cli -v 6.2.3
 
 ENTRYPOINT ["morpheus"]

data/lib/morpheus/api/api_client.rb

@@ -674,10 +674,18 @@ class Morpheus::APIClient
     Morpheus::NetworkServicesInterface.new(common_interface_options).setopts(@options)
   end
 
+  # def network_service_types
+  #   Morpheus::NetworkServiceTypesInterface.new(common_interface_options).setopts(@options)
+  # end
+
   def network_security_servers
     Morpheus::NetworkSecurityServersInterface.new(common_interface_options).setopts(@options)
   end
 
+  def network_security_server_types
+    Morpheus::NetworkSecurityServerTypesInterface.new(common_interface_options).setopts(@options)
+  end
+
   def network_pool_servers
     Morpheus::NetworkPoolServersInterface.new(common_interface_options).setopts(@options)
   end
@@ -918,6 +926,10 @@ class Morpheus::APIClient
     Morpheus::NetworkServersInterface.new(common_interface_options).setopts(@options)
   end
 
+  def network_server_types
+    Morpheus::NetworkServerTypesInterface.new(common_interface_options).setopts(@options)
+  end
+
   def network_server_groups
     Morpheus::NetworkServerGroupsInterface.new(common_interface_options).setopts(@options)
   end

data/lib/morpheus/api/clusters_interface.rb

@@ -313,4 +313,11 @@ class Morpheus::ClustersInterface < Morpheus::APIClient
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :post, url: url, headers: headers, payload: payload.to_json)
   end
+
+  def refresh(id)
+    url = "#{@base_url}/api/clusters/#{id}/refresh"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
 end

data/lib/morpheus/api/network_security_server_types_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/read_interface'
+
+class Morpheus::NetworkSecurityServerTypesInterface < Morpheus::ReadInterface
+
+  def base_path
+    "/api/networks/security-server-types"
+  end
+
+end

data/lib/morpheus/api/network_server_types_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/read_interface'
+
+class Morpheus::NetworkServerTypesInterface < Morpheus::ReadInterface
+
+  def base_path
+    "/api/networks/server-types"
+  end
+
+end

data/lib/morpheus/api/network_servers_interface.rb

@@ -6,6 +6,10 @@ class Morpheus::NetworkServersInterface < Morpheus::RestInterface
     "/api/networks/servers"
   end
 
+  def refresh(id, params={}, payload={}, headers={})
+    execute(method: :post, url: "#{base_path}/#{id}/refresh", params: params, payload: payload, headers: headers)
+  end
+
   def list_scopes(server_id, params={}, headers={})
     validate_id!(server_id)
     execute(method: :get, url: "#{base_path}/#{server_id}/scopes", params: params, headers: headers)

data/lib/morpheus/cli/cli_command.rb

@@ -19,6 +19,7 @@ module Morpheus
 
       def self.included(base)
         base.send :include, Morpheus::Cli::PrintHelper
+        base.send :include, Morpheus::Cli::PromptHelper
         base.send :include, Morpheus::Benchmarking::HasBenchmarking
         base.extend ClassMethods
         Morpheus::Cli::CliRegistry.add(base, base.command_name)

data/lib/morpheus/cli/commands/clouds.rb

@@ -5,7 +5,10 @@ class Morpheus::Cli::Clouds
   include Morpheus::Cli::InfrastructureHelper
   include Morpheus::Cli::ProvisioningHelper
 
-  register_subcommands :list, :count, :get, :add, :update, :remove, :refresh, :security_groups, :apply_security_groups, :types => :list_cloud_types
+  register_subcommands :list, :count, :get, :add, :update, :remove, :refresh, :security_groups, :apply_security_groups
+  register_subcommands :types, :type
+  alias_subcommand :'list-types', :types
+  alias_subcommand :'get-type', :type
   register_subcommands :wiki, :update_wiki
   register_subcommands({:'update-logo' => :update_logo,:'update-dark-logo' => :update_dark_logo})
   #register_subcommands :firewall_disable, :firewall_enable
@@ -182,10 +185,12 @@ class Morpheus::Cli::Clouds
         #"Owner" => lambda {|it| it['owner'].instance_of?(Hash) ? it['owner']['name'] : it['ownerId'] },
         "Tenant" => lambda {|it| it['account'].instance_of?(Hash) ? it['account']['name'] : it['accountId'] },
         "Enabled" => lambda {|it| format_boolean(it['enabled']) },
-        "Status" => lambda {|it| format_cloud_status(it) }
+        "Last Sync" => lambda {|it| format_local_dt(it['lastSync']) },
+        "Sync Duration" => lambda {|it| format_duration_milliseconds(it['lastSyncDuration']).to_s },
+        "Status" => lambda {|it| format_cloud_status(it) },
       }
       print_description_list(description_cols, cloud)
-      
+
       print_h2 "Cloud Servers"
       print cyan
       if server_counts
@@ -722,36 +727,35 @@ class Morpheus::Cli::Clouds
     end
   end
 
-  def list_cloud_types(args)
+  def types(args)
     options={}
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.banner = subcommand_usage("[search]")
+      build_standard_list_options(opts, options)
+      opts.footer = <<-EOT
+List cloud types.
+EOT
     end
     optparse.parse!(args)
     connect(options)
-    begin
-      params.merge!(parse_list_options(options))
-      @clouds_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @clouds_interface.dry.cloud_types({})
-        return 0
-      end
-      json_response = @clouds_interface.cloud_types(params)
-      
-      render_result = render_with_format(json_response, options, 'zoneTypes')
-      return 0 if render_result
 
-      #cloud_types = get_available_cloud_types()
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
+    params.merge!(parse_list_options(options))
+    @clouds_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @clouds_interface.dry.cloud_types({})
+      return 0
+    end
+    json_response = @clouds_interface.cloud_types(params)
+      
+    render_response(json_response, options, 'zoneTypes') do
       cloud_types = json_response['zoneTypes']
-
-      title = "Morpheus Cloud Types"
-      subtitles = []
-        
+      subtitles = []        
       subtitles += parse_list_subtitles(options)
-      print_h1 title, subtitles
-
+      print_h1 "Morpheus Cloud Types", subtitles, options
       if cloud_types.empty?
         print cyan,"No cloud types found.",reset,"\n"
       else
@@ -767,10 +771,79 @@ class Morpheus::Cli::Clouds
         print_results_pagination(json_response)
         print reset,"\n"
       end
+    end
+  end
+
+  def type(args)
+    options={}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[type]")
+      build_standard_get_options(opts, options)
+            opts.footer = <<-EOT
+Get details about a cloud type.
+[type] is required. This is the name or id of cloud type.
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    # construct request
+    params.merge!(parse_query_options(options))
+    id = args[0]
+    cloud_type = nil
+    if id.to_s !~ /\A\d{1,}\Z/
+      cloud_type = cloud_type_for_name_or_id(id)
+      if cloud_type.nil?
+        raise_command_error "cloud type not found for name or code '#{id}'"
+      end
+      id = cloud_type['id']
+    end
+    # execute request
+    @clouds_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @clouds_interface.dry.cloud_type(id.to_i)
       return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
+    end
+    json_response = @clouds_interface.cloud_type(id.to_i)
+    # render response
+    render_response(json_response, options, 'zoneType') do
+      cloud_type = json_response['zoneType']
+      print_h1 "Cloud Type", [], options
+      print cyan
+      #columns = rest_type_column_definitions(options)
+      columns = {
+        "ID" => 'id',
+        "Name" => 'name',
+        "Code" => 'code',
+        "Enabled" => lambda {|it| format_boolean it['enabled'] },
+        "Provision" => lambda {|it| format_boolean it['provision'] },
+        "Auto Capacity" => lambda {|it| format_boolean it['autoCapacity'] },
+        # "Migration Target" => lambda {|it| format_boolean it['migrationTarget'] },
+        "Datastores" => lambda {|it| format_boolean it['hasDatastores'] },
+        "Networks" => lambda {|it| format_boolean it['hasNetworks'] },
+        "Resource Pools" => lambda {|it| format_boolean it['hasResourcePools'] },
+        "Security Groups" => lambda {|it| format_boolean it['hasSecurityGroups'] },
+        "Containers" => lambda {|it| format_boolean it['hasContainers'] },
+        "Bare Metal" => lambda {|it| format_boolean it['hasBareMetal'] },
+        "Services" => lambda {|it| format_boolean it['hasServices'] },
+        "Functions" => lambda {|it| format_boolean it['hasFunctions'] },
+        "Jobs" => lambda {|it| format_boolean it['hasJobs'] },
+        "Discovery" => lambda {|it| format_boolean it['hasDiscovery'] },
+        "Cloud Init" => lambda {|it| format_boolean it['hasCloudInit'] },
+        "Folders" => lambda {|it| format_boolean it['hasFolders'] },
+        "Floating Ips" => lambda {|it| format_boolean it['hasFloatingIps'] },
+        # "Marketplace" => lambda {|it| format_boolean it['hasMarketplace'] },
+        "Public Cloud" => lambda {|it| format_boolean(it['cloud'] == 'public') },
+      }
+      print_description_list(columns, cloud_type, options)
+      # Option Types
+      option_types = cloud_type['optionTypes']
+      if option_types && option_types.size > 0
+        print_h2 "Option Types", options
+        print format_option_types_table(option_types, options, "zone")
+      end
+      print reset,"\n"
     end
   end
 
@@ -1136,7 +1209,7 @@ EOT
       out << "#{white}UNKNOWN#{return_color}"
     elsif status_string == 'ok'
       out << "#{green}#{status_string.upcase}#{return_color}"
-    elsif status_string == 'syncing'
+    elsif status_string == 'syncing' || status_string == 'initializing' || status_string == 'removing'
       out << "#{yellow}#{status_string.upcase}#{return_color}"
     else
       out << "#{red}#{status_string ? status_string.upcase : 'N/A'}#{cloud['statusMessage'] ? "#{return_color} - #{cloud['statusMessage']}" : ''}#{return_color}"

data/lib/morpheus/cli/commands/clouds_types.rb

@@ -0,0 +1,141 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::CloudTypes
+  include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::InfrastructureHelper
+
+  register_subcommands :list, :get
+
+  # hidden in favor of get-type and list-types
+  set_command_hidden
+
+  def connect(opts)
+    @api_client = establish_remote_appliance_connection(opts)
+    @clouds_interface = @api_client.clouds
+  end
+
+  def handle(args)
+    handle_subcommand(args)
+  end
+
+  def list(args)
+    options={}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[search]")
+      build_standard_list_options(opts, options)
+      opts.footer = <<-EOT
+List cloud types.
+EOT
+    end
+    optparse.parse!(args)
+    connect(options)
+
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
+    params.merge!(parse_list_options(options))
+    @clouds_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @clouds_interface.dry.cloud_types({})
+      return 0
+    end
+    json_response = @clouds_interface.cloud_types(params)
+      
+    render_response(json_response, options, 'zoneTypes') do
+      cloud_types = json_response['zoneTypes']
+      subtitles = []        
+      subtitles += parse_list_subtitles(options)
+      print_h1 "Morpheus Cloud Types", subtitles, options
+      if cloud_types.empty?
+        print cyan,"No cloud types found.",reset,"\n"
+      else
+        print cyan
+        cloud_types = cloud_types.select {|it| it['enabled'] }
+        rows = cloud_types.collect do |cloud_type|
+          {id: cloud_type['id'], name: cloud_type['name'], code: cloud_type['code']}
+        end
+        #print "\n"
+        columns = [:id, :name, :code]
+        columns = options[:include_fields] if options[:include_fields]
+        print as_pretty_table(rows, columns, options)
+        print_results_pagination(json_response)
+        print reset,"\n"
+      end
+    end
+  end
+
+  def get(args)
+    options={}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[type]")
+      build_standard_get_options(opts, options)
+            opts.footer = <<-EOT
+Get details about a cloud type.
+[type] is required. This is the name or id of cloud type.
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    # construct request
+    params.merge!(parse_query_options(options))
+    id = args[0]
+    cloud_type = nil
+    if id.to_s !~ /\A\d{1,}\Z/
+      cloud_type = cloud_type_for_name_or_id(id)
+      if cloud_type.nil?
+        raise_command_error "cloud type not found for name or code '#{id}'"
+      end
+      id = cloud_type['id']
+    end
+    # execute request
+    @clouds_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @clouds_interface.dry.cloud_type(id.to_i)
+      return 0
+    end
+    json_response = @clouds_interface.cloud_type(id.to_i)
+    # render response
+    render_response(json_response, options, 'zoneType') do
+      cloud_type = json_response['zoneType']
+      print_h1 "Cloud Type", [], options
+      print cyan
+      #columns = rest_type_column_definitions(options)
+      columns = {
+        "ID" => 'id',
+        "Name" => 'name',
+        "Code" => 'code',
+        "Enabled" => lambda {|it| format_boolean it['enabled'] },
+        "Provision" => lambda {|it| format_boolean it['provision'] },
+        "Auto Capacity" => lambda {|it| format_boolean it['autoCapacity'] },
+        # "Migration Target" => lambda {|it| format_boolean it['migrationTarget'] },
+        "Datastores" => lambda {|it| format_boolean it['hasDatastores'] },
+        "Networks" => lambda {|it| format_boolean it['hasNetworks'] },
+        "Resource Pools" => lambda {|it| format_boolean it['hasResourcePools'] },
+        "Security Groups" => lambda {|it| format_boolean it['hasSecurityGroups'] },
+        "Containers" => lambda {|it| format_boolean it['hasContainers'] },
+        "Bare Metal" => lambda {|it| format_boolean it['hasBareMetal'] },
+        "Services" => lambda {|it| format_boolean it['hasServices'] },
+        "Functions" => lambda {|it| format_boolean it['hasFunctions'] },
+        "Jobs" => lambda {|it| format_boolean it['hasJobs'] },
+        "Discovery" => lambda {|it| format_boolean it['hasDiscovery'] },
+        "Cloud Init" => lambda {|it| format_boolean it['hasCloudInit'] },
+        "Folders" => lambda {|it| format_boolean it['hasFolders'] },
+        "Floating Ips" => lambda {|it| format_boolean it['hasFloatingIps'] },
+        # "Marketplace" => lambda {|it| format_boolean it['hasMarketplace'] },
+        "Public Cloud" => lambda {|it| format_boolean(it['cloud'] == 'public') },
+      }
+      print_description_list(columns, cloud_type, options)
+      # Option Types
+      option_types = cloud_type['optionTypes']
+      if option_types && option_types.size > 0
+        print_h2 "Option Types", options
+        print format_option_types_table(option_types, options, "zone")
+      end
+      print reset,"\n"
+    end
+  end
+
+end

data/lib/morpheus/cli/commands/clusters.rb

@@ -24,6 +24,7 @@ class Morpheus::Cli::Clusters
   register_subcommands :api_config, :view_api_token, :view_kube_config
   register_subcommands :wiki, :update_wiki
   register_subcommands :apply_template
+  register_subcommands :refresh
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
@@ -728,6 +729,15 @@ class Morpheus::Cli::Clusters
         server_payload['networkDomain'] = options[:domain] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'networkDomain', 'fieldLabel' => 'Network Domain', 'type' => 'select', 'required' => false, 'optionSource' => 'networkDomains'}], options[:options], @api_client, api_params)['networkDomain']
         server_payload['hostname'] = options[:hostname] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'hostname', 'fieldLabel' => 'Hostname', 'type' => 'text', 'required' => true, 'description' => 'Hostname', 'defaultValue' => resourceName}], options[:options], @api_client, api_params)['hostname']
 
+        # Kube Default Repo
+        if cluster_payload['type'] == 'kubernetes-cluster' && (layout['clusterVersion'] == '1.28.x' || layout['clusterVersion'] == '1.27.x')
+          default_repo = options[:default_repo] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'defaultRepoAccount', 'fieldLabel' => 'Cluster Repo Account', 'type' => 'select', 'required' => false, 'optionSource' => 'dockerHubRegistries'}], options[:options], @api_client, api_params)['defaultRepoAccount']
+          if default_repo != ""
+            server_payload['config']['defaultRepoAccount'] = default_repo
+          end
+        end
+
+
         # Workflow / Automation
         if provision_type['code'] != 'manual' && controller_type && controller_type['hasAutomation']
           task_set_id = options[:taskSetId] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'taskSet', 'fieldLabel' => 'Workflow', 'type' => 'select', 'required' => false, 'optionSource' => 'taskSets'}], options[:options], @api_client, api_params.merge({'phase' => 'postProvision'}))['taskSet']
@@ -4407,4 +4417,38 @@ class Morpheus::Cli::Clusters
     end
     out
   end
+
+  def refresh(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[id]")
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
+      opts.footer = "Refresh cluster."
+    end
+    optparse.parse!(args)
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args}\n#{optparse}"
+    end
+    connect(options)
+    begin
+      cluster = find_cluster_by_name_or_id(args[0])
+      return 1 if cluster.nil?
+      json_response = nil
+
+      if options[:dry_run]
+          print_dry_run @clusters_interface.dry.refresh(args[0].to_i)
+        return
+      end
+      json_response = @clusters_interface.refresh(cluster['id'])
+      if options[:json]
+        puts as_json(json_response, options)
+      else
+        print_green_success "Refreshing cluster #{cluster['name']}..."
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
 end

data/lib/morpheus/cli/commands/instances.rb

@@ -466,6 +466,7 @@ class Morpheus::Cli::Instances
     optparse.parse!(args)
     connect(options)
 
+
     if args.count > 1
       print_error Morpheus::Terminal.angry_prompt
       puts_error  "#{command_name} add has just 1 (optional) argument: [name].  Got #{args.count} arguments: #{args.join(' ')}\n#{optparse}"

data/lib/morpheus/cli/commands/network_dhcp_relays_command.rb

@@ -2,6 +2,7 @@ require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::NetworkDhcpRelaysCommand
   include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::NetworksHelper
   include Morpheus::Cli::ProvisioningHelper
   include Morpheus::Cli::WhoamiHelper
 
@@ -329,48 +330,6 @@ class Morpheus::Cli::NetworkDhcpRelaysCommand
     println reset
   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_dhcp_relay(server_id, val)
     if val.to_s =~ /\A\d{1,}\Z/
       return find_dhcp_relay_by_id(server_id, val)

data/lib/morpheus/cli/commands/network_dhcp_servers_command.rb

@@ -2,8 +2,9 @@ require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::NetworkDhcpServersCommand
   include Morpheus::Cli::CliCommand
-  include Morpheus::Cli::ProvisioningHelper
-  include Morpheus::Cli::WhoamiHelper
+  include Morpheus::Cli::NetworksHelper
+  include Morpheus::Cli::ProvisioningHelper # needed?
+  include Morpheus::Cli::WhoamiHelper # needed?
 
   set_command_name :'network-dhcp-servers'
   register_subcommands :list, :get, :add, :remove, :update
@@ -320,48 +321,6 @@ class Morpheus::Cli::NetworkDhcpServersCommand
     println reset
   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_dhcp_server(server_id, val)
     if val.to_s =~ /\A\d{1,}\Z/
       return find_dhcp_server_by_id(server_id, val)

data/lib/morpheus/cli/commands/network_edge_clusters_command.rb

@@ -2,6 +2,7 @@ require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::NetworkEdgeClustersCommand
   include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::NetworksHelper
   include Morpheus::Cli::ProvisioningHelper
   include Morpheus::Cli::WhoamiHelper
 
@@ -242,48 +243,6 @@ class Morpheus::Cli::NetworkEdgeClustersCommand
     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_edge_cluster(server_id, val)
     if val.to_s =~ /\A\d{1,}\Z/
       return find_edge_cluster_by_id(server_id, val)