morpheus-cli 5.3.4 → 5.4.0

data/lib/morpheus/cli/{network_groups_command.rb → commands/network_groups_command.rb}

@@ -1,8 +1,4 @@
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/infrastructure_helper'
 
 class Morpheus::Cli::NetworkGroupsCommand
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/{network_pool_servers_command.rb → commands/network_pool_servers_command.rb}

@@ -1,8 +1,4 @@
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/infrastructure_helper'
 
 class Morpheus::Cli::NetworkPoolServersCommand
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/{network_pools_command.rb → commands/network_pools_command.rb}

@@ -1,8 +1,4 @@
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/infrastructure_helper'
 
 class Morpheus::Cli::NetworkPoolsCommand
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/{network_proxies_command.rb → commands/network_proxies_command.rb}

@@ -1,8 +1,4 @@
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/infrastructure_helper'
 
 class Morpheus::Cli::NetworkProxiesCommand
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/{network_routers_command.rb → commands/network_routers_command.rb}

@@ -1,8 +1,4 @@
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/infrastructure_helper'
 
 class Morpheus::Cli::NetworkRoutersCommand
   include Morpheus::Cli::CliCommand
@@ -1149,7 +1145,6 @@ class Morpheus::Cli::NetworkRoutersCommand
         api_params = {}
         api_params['networkServerId'] = router['networkServer']['id'] if router['networkServer']
         api_params['zoneId'] = router['zone']['id'] if router['networkServer'].nil?
-        api_params['groupId'] = options[:group] if !options[:group].nil?
         option_result = Morpheus::Cli::OptionTypes.prompt(option_types, options[:options].deep_merge({:context_map => {'rule' => ''}}), @api_client, api_params, nil, true)
         payload = {'rule' => params.deep_merge(option_result)}
       end

data/lib/morpheus/cli/{network_services_command.rb → commands/network_services_command.rb}

@@ -1,8 +1,4 @@
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/infrastructure_helper'
 
 class Morpheus::Cli::NetworkServicesCommand
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/{network_scopes_command.rb → commands/network_transport_zones_command.rb}

@@ -1,15 +1,11 @@
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/infrastructure_helper'
 
-class Morpheus::Cli::NetworkScopesCommand
+class Morpheus::Cli::NetworkTransportZonesCommand
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::ProvisioningHelper
   include Morpheus::Cli::WhoamiHelper
 
-  set_command_name :'network-scopes'
+  set_command_name :'network-transport-zones'
   register_subcommands :list, :get, :add, :update, :remove
 
   def connect(opts)
@@ -27,44 +23,45 @@ class Morpheus::Cli::NetworkScopesCommand
     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."
+      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "List network transport zones." + "\n" +
+        "[server] is optional. This is the name or id of a network server."
     end
 
     optparse.parse!(args)
     connect(options)
 
-    if args.count < 1
-      puts optparse
+    if args.count > 1
+      print_error Morpheus::Terminal.angry_prompt
+      puts_error "wrong number of arguments, expected 0-1 and got (#{args.count}) #{args.inspect}\n#{optparse}"
       return 1
     end
 
-    server = find_network_server(args[0])
-    if server.nil?
-      return 1
-    end
+    server_id = args.count > 0 ? args[0] : Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'networkServer', 'type' => 'select', 'fieldLabel' => 'Network Server', 'selectOptions' => search_network_servers.collect {|it| {'name' => it['name'], 'value' => it['id']}}, 'required' => true, 'description' => 'Select Network Server.'}],options[:options],@api_client,{})['networkServer']
+    server = find_network_server(server_id)
+    return 1 if server.nil?
 
     _list(server, options)
   end
 
   def _list(server, options)
+    params = parse_list_options(options)
     @network_servers_interface.setopts(options)
 
     if options[:dry_run]
-      print_dry_run @network_servers_interface.dry.list_scopes(server['id'])
+      print_dry_run @network_servers_interface.dry.list_scopes(server['id'], params)
       return
     end
 
     if server['type']['hasScopes']
-      json_response = @network_servers_interface.list_scopes(server['id'])
+      json_response = @network_servers_interface.list_scopes(server['id'], params)
       render_response(json_response, options, 'networkScopes') do
-        print_h1 "Network Scopes For: #{server['name']}"
+        print_h1 "Network transport zones For: #{server['name']}"
         print cyan
         print_scopes(server, json_response['networkScopes'])
       end
     else
-      print_red_alert "Scopes not supported for #{server['type']['name']}"
+      print_red_alert "Transport zones not supported for #{server['type']['name']}"
     end
     print reset
   end
@@ -72,37 +69,40 @@ class Morpheus::Cli::NetworkScopesCommand
   def get(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[server] [scope]")
+      opts.banner = subcommand_usage("[server] [transport zone]")
       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"
+      opts.footer = "Display details on a network transport zone." + "\n" +
+        "[server] is optional. This is the name or id of a network server.\n" +
+        "[transport zone] is optional. This is the id of a network transport zone.\n"
     end
 
     optparse.parse!(args)
     connect(options)
 
-    if args.count < 2
-      puts optparse
+    if args.count > 2
+      print_error Morpheus::Terminal.angry_prompt
+      puts_error "wrong number of arguments, expected 0-2 and got (#{args.count}) #{args.inspect}\n#{optparse}"
       return 1
     end
 
-    server = find_network_server(args[0])
-    if server.nil?
-      return 1
-    end
+    server_id = args.count > 0 ? args[0] : Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'networkServer', 'type' => 'select', 'fieldLabel' => 'Network Server', 'selectOptions' => search_network_servers.collect {|it| {'name' => it['name'], 'value' => it['id']}}, 'required' => true, 'description' => 'Select Network Server.'}],options[:options],@api_client,{})['networkServer']
+    server = find_network_server(server_id)
+    return 1 if server.nil?
+
+    scope_id = args.count > 1 ? args[1] : Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'rule', 'type' => 'select', 'fieldLabel' => 'Firewall Rule', 'selectOptions' => search_scopes(server['id']).collect {|it| {'name' => it['name'], 'value' => it['id']}}, 'required' => true, 'description' => 'Select Firewall Rule.'}],options[:options],@api_client,{})['rule']
 
-    _get(server, args[1], options)
+    _get(server, scope_id, options)
   end
 
   def _get(server, scope_id, options)
+    params = parse_list_options(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)
+        print_dry_run @network_servers_interface.dry.get_scope(server['id'], scope_id.to_i, params)
       else
-        print_dry_run @network_servers_interface.dry.list_scopes(server['id'], {name: scope_id})
+        print_dry_run @network_servers_interface.dry.list_scopes(server['id'], {name: scope_id}, params)
       end
       return
     end
@@ -113,7 +113,7 @@ class Morpheus::Cli::NetworkScopesCommand
       return 1 if scope.nil?
 
       render_response({networkScope: scope}, options, 'networkScope') do
-        print_h1 "Network Scope Details"
+        print_h1 "Network Transport Zone Details"
         print cyan
 
         description_cols = {
@@ -128,13 +128,13 @@ class Morpheus::Cli::NetworkScopesCommand
           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|
+        server['type']['scopeOptionTypes'].reject {|it| it['type'] == 'hidden'}.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']}"
+      print_red_alert "Transport zones not supported for #{server['type']['name']}"
     end
     println reset
   end
@@ -144,32 +144,32 @@ class Morpheus::Cli::NetworkScopesCommand
     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
+      opts.on('-n', '--name VALUE', String, "Name" ) do |val|
+        options[:options]['name'] = val.to_s
       end
-      opts.on("--description [TEXT]", String, "Description") do |val|
-        options[:description] = val.to_s
+      opts.on('-D', '--description VALUE', String, "Description") do |val|
+        options[: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";
+      opts.footer = "Create a network transport zone." + "\n" +
+        "[server] is optional. This is the name or id of a network server.\n";
     end
     optparse.parse!(args)
     connect(options)
-    if args.count < 1
+
+    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}"
+      puts_error "wrong number of arguments, expected 0-1 and got (#{args.count}) #{args.inspect}\n#{optparse}"
       return 1
     end
 
-    server = find_network_server(args[0])
-    if server.nil?
-      return 1
-    end
+    server_id = args.count > 0 ? args[0] : Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'networkServer', 'type' => 'select', 'fieldLabel' => 'Network Server', 'selectOptions' => search_network_servers.collect {|it| {'name' => it['name'], 'value' => it['id']}}, 'required' => true, 'description' => 'Select Network Server.'}],options[:options],@api_client,{})['networkServer']
+    server = find_network_server(server_id)
+    return 1 if server.nil?
 
     if !server['type']['hasScopes']
-      print_red_alert "Scopes not supported for #{server['type']['name']}"
+      print_red_alert "Transport zones not supported for #{server['type']['name']}"
       return 1
     end
 
@@ -199,7 +199,7 @@ class Morpheus::Cli::NetworkScopesCommand
 
     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"
+      print_green_success "\nAdded Network Transport Zone #{json_response['id']}\n"
       _get(server, json_response['id'], options)
     end
   end
@@ -208,36 +208,36 @@ class Morpheus::Cli::NetworkScopesCommand
     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
+      opts.banner = subcommand_usage("[server] [transport zone]")
+      opts.on('-n', '--name VALUE', String, "Name" ) do |val|
+        options[:options]['name'] = val.to_s
       end
-      opts.on("--description [TEXT]", String, "Description") do |val|
-        params['description'] = val.to_s
+      opts.on('-D', '--description VALUE', String, "Description") do |val|
+        options[: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 = "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."
+      opts.footer = "Update a network transport zone.\n" +
+        "[server] is optional. This is the name or id of an existing network server.\n" +
+        "[transport zone] is optional. This is the name or id of an existing network transport zone."
     end
     optparse.parse!(args)
-    if args.count != 2
-      raise_command_error "wrong number of arguments, expected 2 and got (#{args.count}) #{args}\n#{optparse}"
+    if args.count > 2
+      raise_command_error "wrong number of arguments, expected 0-2 and got (#{args.count}) #{args}\n#{optparse}"
     end
     connect(options)
 
-    server = find_network_server(args[0])
-    if server.nil?
-      return 1
-    end
+    server_id = args.count > 0 ? args[0] : Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'networkServer', 'type' => 'select', 'fieldLabel' => 'Network Server', 'selectOptions' => search_network_servers.collect {|it| {'name' => it['name'], 'value' => it['id']}}, 'required' => true, 'description' => 'Select Network Server.'}],options[:options],@api_client,{})['networkServer']
+    server = find_network_server(server_id)
+    return 1 if server.nil?
 
     if !server['type']['hasScopes']
-      print_red_alert "Scopes not supported for #{server['type']['name']}"
+      print_red_alert "Transport zones not supported for #{server['type']['name']}"
       return 1
     end
 
-    scope = find_scope(server['id'], args[1])
+    scope_id = args.count > 1 ? args[1] : Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'scope', 'type' => 'select', 'fieldLabel' => 'Firewall Rule', 'selectOptions' => search_scopes(server['id']).collect {|it| {'name' => it['name'], 'value' => it['id']}}, 'required' => true, 'description' => 'Select Transport Zone.'}],options[:options],@api_client,{})['scope']
+    scope = find_scope(server['id'], scope_id)
     return 1 if scope.nil?
 
     payload = parse_payload(options) || {'networkScope' => params}
@@ -254,10 +254,14 @@ class Morpheus::Cli::NetworkScopesCommand
       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"}
-      )
+      edit_option_types = option_types.reject {|it| !it['editable'] || !it['showOnEdit']}
+
+      if edit_option_types.count > 0
+        print Morpheus::Cli::OptionTypes.display_option_types_help(
+          option_types,
+          {:include_context => true, :context_map => {'scope' => ''}, :color => cyan, :title => "Available Transport Zone Options"}
+        )
+      end
       exit 1
     end
 
@@ -272,7 +276,7 @@ class Morpheus::Cli::NetworkScopesCommand
 
     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"
+      print_green_success "\nUpdated Network Transport Zone #{scope['id']}\n"
       _get(server, scope['id'], options)
     end
   end
@@ -280,32 +284,32 @@ class Morpheus::Cli::NetworkScopesCommand
   def remove(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[server] [scope]")
+      opts.banner = subcommand_usage("[server] [transport zone]")
       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."
+      opts.footer = "Delete a network transport zone.\n" +
+        "[server] is optional. This is the name or id of an existing network server.\n" +
+        "[transport zone] is optional. This is the name or id of an existing network transport zone."
     end
     optparse.parse!(args)
-    if args.count != 2
-      raise_command_error "wrong number of arguments, expected 2 and got (#{args.count}) #{args}\n#{optparse}"
+    if args.count > 2
+      raise_command_error "wrong number of arguments, expected 0-2 and got (#{args.count}) #{args}\n#{optparse}"
     end
     connect(options)
 
-    server = find_network_server(args[0])
-    if server.nil?
-      return 1
-    end
+    server_id = args.count > 0 ? args[0] : Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'networkServer', 'type' => 'select', 'fieldLabel' => 'Network Server', 'selectOptions' => search_network_servers.collect {|it| {'name' => it['name'], 'value' => it['id']}}, 'required' => true, 'description' => 'Select Network Server.'}],options[:options],@api_client,{})['networkServer']
+    server = find_network_server(server_id)
+    return 1 if server.nil?
 
     if !server['type']['hasScopes']
-      print_red_alert "Scopes not supported for #{server['type']['name']}"
+      print_red_alert "Transport zones not supported for #{server['type']['name']}"
       return 1
     end
 
-    scope = find_scope(server['id'], args[1])
+    scope_id = args.count > 1 ? args[1] : Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'scope', 'type' => 'select', 'fieldLabel' => 'Firewall Rule', 'selectOptions' => search_scopes(server['id']).collect {|it| {'name' => it['name'], 'value' => it['id']}}, 'required' => true, 'description' => 'Select Transport Zone.'}],options[:options],@api_client,{})['scope']
+    scope = find_scope(server['id'], scope_id)
     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)
+    unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to remove the network transport zone '#{scope['name']}' from server '#{server['name']}'?", options)
       return 9, "aborted command"
     end
 
@@ -317,7 +321,7 @@ class Morpheus::Cli::NetworkScopesCommand
     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"
+      print_green_success "\nDeleted Network Transport Zone #{scope['name']}\n"
       _list(server, options)
     end
   end
@@ -351,7 +355,7 @@ class Morpheus::Cli::NetworkScopesCommand
       end
       puts as_pretty_table(rows, cols)
     else
-      println "No Scopes\n"
+      println "No transport zones\n"
     end
   end
 
@@ -380,8 +384,7 @@ class Morpheus::Cli::NetworkScopesCommand
   end
 
   def find_network_server_by_name(name)
-    json_response = @network_servers_interface.list({phrase: name.to_s})
-    servers = json_response['networkServers']
+    servers = search_network_servers
     if servers.empty?
       print_red_alert "Network Server not found by name #{name}"
       return nil
@@ -397,6 +400,10 @@ class Morpheus::Cli::NetworkScopesCommand
     end
   end
 
+  def search_network_servers(phrase = nil)
+    @network_servers_interface.list(phrase ? {phrase: phrase.to_s} : {})['networkServers']
+  end
+
   def find_scope(server_id, val)
     if val.to_s =~ /\A\d{1,}\Z/
       return find_scope_by_id(server_id, val)
@@ -413,7 +420,7 @@ class Morpheus::Cli::NetworkScopesCommand
       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}"
+        print_red_alert "Network transport zone not found by id #{scope_id}"
         return nil
       else
         raise e
@@ -422,13 +429,12 @@ class Morpheus::Cli::NetworkScopesCommand
   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']
+    scopes = search_scopes(server_id, name)
     if scopes.empty?
-      print_red_alert "Network Scope not found by name #{name}"
+      print_red_alert "Network transport zone not found by name #{name}"
       return nil
     elsif scopes.size > 1
-      print_red_alert "#{scopes.size} network scopes found by name #{name}"
+      print_red_alert "#{scopes.size} network transport zones found by name #{name}"
       rows = scopes.collect do |it|
         {id: it['id'], name: it['name']}
       end
@@ -439,4 +445,8 @@ class Morpheus::Cli::NetworkScopesCommand
     end
   end
 
+  def search_scopes(server_id, phrase = nil)
+    @network_servers_interface.list_scopes(server_id, phrase ? {phrase: phrase.to_s} : {})['networkScopes']
+  end
+
 end

data/lib/morpheus/cli/{networks_command.rb → commands/networks_command.rb}

@@ -1,8 +1,4 @@
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/infrastructure_helper'
 
 class Morpheus::Cli::NetworksCommand
   include Morpheus::Cli::CliCommand
@@ -510,7 +506,7 @@ class Morpheus::Cli::NetworksCommand
           print_red_alert "Network Type not found by id '#{network_type_id}'"
           return 1
         end
-
+        
         if network_type['hasNetworkServer']
           api_params = {networkType: {id: network_type['id']}}
 
@@ -628,7 +624,7 @@ class Morpheus::Cli::NetworksCommand
         end
 
         # Active
-        if options['active'].nil?
+        if options['active'].nil? && payload['network']['active'].nil?
           v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'active', 'fieldLabel' => 'Active', 'type' => 'checkbox', 'required' => false, 'description' => '', 'defaultValue' => true}], options)
           payload['network']['active'] = v_prompt['active']
         else
@@ -636,7 +632,7 @@ class Morpheus::Cli::NetworksCommand
         end
 
         # DHCP Server
-        if network_type['dhcpServerEditable']
+        if network_type['dhcpServerEditable'] && payload['network']['dhcpServer'].nil?
           if options['dhcpServer'] != nil
             payload['network']['dhcpServer'] = options['dhcpServer']
           else
@@ -646,17 +642,19 @@ class Morpheus::Cli::NetworksCommand
         end
 
         # Allow IP Override
-        if options['allowStaticOverride'] != nil
-          payload['network']['allowStaticOverride'] = options['allowStaticOverride']
-        else
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'allowStaticOverride', 'fieldLabel' => 'Allow IP Override', 'type' => 'checkbox', 'required' => false, 'description' => ''}], options)
-          payload['network']['allowStaticOverride'] = v_prompt['allowStaticOverride']
+        if network_type['staticOverrideEditable'] && payload['network']['allowStaticOverride'].nil?
+          if options['allowStaticOverride'] != nil
+            payload['network']['allowStaticOverride'] = options['allowStaticOverride']
+          else
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'allowStaticOverride', 'fieldLabel' => 'Allow IP Override', 'type' => 'checkbox', 'required' => false, 'description' => ''}], options)
+            payload['network']['allowStaticOverride'] = v_prompt['allowStaticOverride']
+          end
         end
 
         ## IPAM Options
 
         # Network Pool
-        if network_type['canAssignPool']
+        if network_type['canAssignPool'] && payload['network']['pool'].nil?
           if options['pool']
             payload['network']['pool'] = options['pool'].to_i
           else
@@ -669,11 +667,13 @@ class Morpheus::Cli::NetworksCommand
         ## Advanced Options
 
         # Network Domain
-        if options['domain']
-          payload['network']['networkDomain'] = {'id' => options['domain'].to_i}
-        else
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'domain', 'fieldLabel' => 'Network Domain', 'type' => 'select', 'optionSource' => 'networkDomains', 'required' => false, 'description' => ''}], options, @api_client)
-          payload['network']['networkDomain'] = {'id' => v_prompt['domain'].to_i} unless v_prompt['domain'].to_s.empty?
+        if network_type['networkDomainEditable'] && payload['network']['networkDomain'].nil?
+          if options['domain']
+            payload['network']['networkDomain'] = {'id' => options['domain'].to_i}
+          else
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'domain', 'fieldLabel' => 'Network Domain', 'type' => 'select', 'optionSource' => 'networkDomains', 'required' => false, 'description' => ''}], options, @api_client)
+            payload['network']['networkDomain'] = {'id' => v_prompt['domain'].to_i} unless v_prompt['domain'].to_s.empty?
+          end
         end
 
         # Search Domains

data/lib/morpheus/cli/{packages_command.rb → commands/packages_command.rb}

@@ -1,6 +1,4 @@
-require 'fileutils'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/library_helper'
 require 'morpheus/morpkg'
 
 class Morpheus::Cli::PackagesCommand

data/lib/morpheus/cli/{ping.rb → commands/ping.rb}

@@ -1,11 +1,4 @@
-# require 'yaml'
-require 'io/console'
-require 'rest_client'
-require 'optparse'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/whoami_helper'
-require 'morpheus/cli/mixins/accounts_helper'
-require 'json'
 
 class Morpheus::Cli::Ping
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/{policies_command.rb → commands/policies_command.rb}

@@ -1,11 +1,4 @@
-require 'json'
-require 'yaml'
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/infrastructure_helper'
-require 'morpheus/cli/mixins/accounts_helper'
 
 class Morpheus::Cli::PoliciesCommand
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/{preseed_scripts_command.rb → commands/preseed_scripts_command.rb}

@@ -1,6 +1,3 @@
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::PreseedScriptsCommand

data/lib/morpheus/cli/{processes_command.rb → commands/processes_command.rb}

@@ -1,5 +1,4 @@
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/processes_helper'
 
 class Morpheus::Cli::Processes
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/{remote.rb → commands/remote.rb}

@@ -1,11 +1,5 @@
-require 'fileutils'
-require 'ostruct'
-require 'yaml'
-require 'io/console'
-require 'rest_client'
-require 'net/https'
-require 'optparse'
 require 'morpheus/cli/cli_command'
+require 'net/https' # needed?
 
 
 class Morpheus::Cli::Remote