morpheus-cli 4.0.0.1 → 4.1.0

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

@@ -21,6 +21,12 @@ module Morpheus::Cli::AccountsHelper
     @users_interface
   end
 
+  def user_groups_interface
+    # @api_client.users
+    raise "#{self.class} has not defined @user_groups_interface" if @user_groups_interface.nil?
+    @user_groups_interface
+  end
+
   def roles_interface
     # @api_client.roles
     raise "#{self.class} has not defined @roles_interface" if @roles_interface.nil?
@@ -179,6 +185,43 @@ module Morpheus::Cli::AccountsHelper
     user_ids
   end
 
+  def find_user_group_by_name_or_id(account_id, val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_user_group_by_id(account_id, val)
+    else
+      return find_user_group_by_name(account_id, val)
+    end
+  end
+
+  def find_user_group_by_id(account_id, id)
+    begin
+      json_response = @user_groups_interface.get(account_id, id.to_i)
+      return json_response['userGroup']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "User Group not found by id #{id}"
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_user_group_by_name(account_id, name)
+    user_groups = @user_groups_interface.list(account_id, {name: name.to_s})['userGroups']
+    if user_groups.empty?
+      print_red_alert "User Group not found by name #{name}"
+      return nil
+    elsif user_groups.size > 1
+      print_red_alert "#{user_groups.size} user groups found by name #{name}"
+      print_user_groups_table(user_groups, {color: red})
+      print_red_alert "Try using ID instead"
+      print reset,"\n"
+      return nil
+    else
+      return user_groups[0]
+    end
+  end
+
   def print_accounts_table(accounts, options={})
     table_color = options.key?(:color) ? options[:color] : cyan
     rows = accounts.collect do |account|

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

@@ -475,9 +475,17 @@ module Morpheus::Cli::PrintHelper
       print out
       return
     end
-    opts[:include] ||= [:memory, :storage, :cpu]
+    opts[:include] ||= [:cpu, :memory, :storage]
+    if opts[:include].include?(:max_cpu)
+      cpu_usage = stats['cpuUsagePeak']
+      out << cyan + "Max CPU".rjust(label_width, ' ') + ": " + generate_usage_bar(cpu_usage.to_f, 100)  + "\n"
+    end
+    if opts[:include].include?(:avg_cpu)
+      cpu_usage = stats['cpuUsageAvg']
+      out << cyan + "Avg. CPU".rjust(label_width, ' ') + ": " + generate_usage_bar(cpu_usage.to_f, 100)  + "\n"
+    end
     if opts[:include].include?(:cpu)
-      cpu_usage = (stats['usedCpu'] || stats['cpuUsage'])
+      cpu_usage = stats['cpuUsage'] || stats['usedCpu']
       out << cyan + "CPU".rjust(label_width, ' ') + ": " + generate_usage_bar(cpu_usage.to_f, 100)  + "\n"
     end
     if opts[:include].include?(:memory)

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

@@ -208,6 +208,46 @@ module Morpheus::Cli::ProvisioningHelper
     return instance
   end
 
+  def find_workflow_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_workflow_by_id(val)
+    else
+      return find_workflow_by_name(val)
+    end
+  end
+
+  def find_workflow_by_id(id)
+    begin
+      json_response = @task_sets_interface.get(id.to_i)
+      return json_response['taskSet']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Workflow not found by id #{id}"
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_workflow_by_name(name)
+    workflows = @task_sets_interface.get({name: name.to_s})['taskSets']
+    if workflows.empty?
+      print_red_alert "Workflow not found by name #{name}"
+      return nil
+    elsif workflows.size > 1
+      print_red_alert "#{workflows.size} workflows by name #{name}"
+      print_workflows_table(workflows, {color: red})
+      print reset,"\n\n"
+      return nil
+    else
+      return workflows[0]
+    end
+  end
+
+  def get_provision_type_for_zone_type(zone_type_id)
+    @clouds_interface.cloud_type(zone_type_id)['zoneType']['provisionTypes'].first rescue nil
+  end
+
   # prompts user for all the configuartion options for a particular instance
   # returns payload of data for a new instance
   def prompt_new_instance(options={})
@@ -387,7 +427,8 @@ module Morpheus::Cli::ProvisioningHelper
     payload['plan'] = {'id' => service_plan["id"], 'code' => service_plan["code"], 'name' => service_plan["name"]}
     payload['instance']['plan'] = {'id' => service_plan["id"], 'code' => service_plan["code"], 'name' => service_plan["name"]}
 
-
+    # determine provision_type
+    # provision_type = (layout && layout['provisionType'] ? layout['provisionType'] : nil) || get_provision_type_for_zone_type(cloud['zoneType']['id'])
 
     # build option types
     option_type_list = []
@@ -410,15 +451,17 @@ module Morpheus::Cli::ProvisioningHelper
 
     # prompt for resource pool
     pool_id = nil
+    resource_pool = nil
     has_zone_pools = layout["provisionType"] && layout["provisionType"]["id"] && layout["provisionType"]["hasZonePools"]
     if has_zone_pools
-      # pluck out the resourcePoolId option type to prompt for..why the heck is this even needed? 
+      # pluck out the resourcePoolId option type to prompt for
       resource_pool_option_type = option_type_list.find {|opt| ['resourcePool','resourcePoolId','azureResourceGroupId'].include?(opt['fieldName']) }
       option_type_list = option_type_list.reject {|opt| ['resourcePool','resourcePoolId','azureResourceGroupId'].include?(opt['fieldName']) }
       resource_pool_option_type ||= {'fieldContext' => 'config', 'fieldName' => 'resourcePoolId', 'type' => 'select', 'fieldLabel' => 'Resource Pool', 'optionSource' => 'zonePools', 'required' => true, 'skipSingleOption' => true, 'description' => 'Select resource pool.'}
       resource_pool_prompt = Morpheus::Cli::OptionTypes.prompt([resource_pool_option_type],options[:options],api_client,{groupId: group_id, siteId: group_id, zoneId: cloud_id, cloudId: cloud_id, instanceTypeId: instance_type['id'], planId: service_plan["id"], layoutId: layout["id"]})
       resource_pool_prompt.deep_compact!
       payload.deep_merge!(resource_pool_prompt)
+      resource_pool = Morpheus::Cli::OptionTypes.get_last_select()
       if resource_pool_option_type['fieldContext'] && resource_pool_prompt[resource_pool_option_type['fieldContext']]
         pool_id = resource_pool_prompt[resource_pool_option_type['fieldContext']][resource_pool_option_type['fieldName']]
       elsif resource_pool_prompt[resource_pool_option_type['fieldName']]
@@ -426,6 +469,13 @@ module Morpheus::Cli::ProvisioningHelper
       end
     end
 
+    # remove host selection for kubernetes
+    if resource_pool && resource_pool['providerType'] == 'kubernetes'
+      option_type_list = option_type_list.reject {|opt|
+        ['provisionServerId'].include?(opt['fieldName'])
+      }
+    end
+
     # plan_info has this property already..
     # has_datastore = layout["provisionType"] && layout["provisionType"]["id"] && layout["provisionType"]["hasDatastore"]
     # service_plan['hasDatastore'] = has_datastore
@@ -628,7 +678,7 @@ module Morpheus::Cli::ProvisioningHelper
     if plan_info['addVolumes']
       volume_index = 1
       has_another_volume = (options[:options] && options[:options]["dataVolume#{volume_index}"]) || (options[:options] && options[:options]['volumes'] && options[:options]['volumes'][volume_index])
-      add_another_volume = has_another_volume || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add data volume?", {:default => false}))
+      add_another_volume = has_another_volume || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add data volume?", {:default => (options[:defaultAddFirstDataVolume] == true && volume_index == 1)}))
       while add_another_volume do
           #puts "Configure Data #{volume_index} Volume"
 

data/lib/morpheus/cli/networks_command.rb

@@ -12,6 +12,11 @@ class Morpheus::Cli::NetworksCommand
 
   register_subcommands :list, :get, :add, :update, :remove #, :generate_pool
   register_subcommands :'types' => :list_types
+  register_subcommands :'get-type' => :get_type
+
+  register_subcommands :list_subnets, :get_subnet, :add_subnet, :update_subnet, :remove_subnet
+  register_subcommands :'subnet-types' => :list_subnet_types
+  register_subcommands :'get-subnet-type' => :get_subnet_type
 
   # set_default_subcommand :list
   
@@ -23,6 +28,8 @@ class Morpheus::Cli::NetworksCommand
     @api_client = establish_remote_appliance_connection(opts)
     @networks_interface = @api_client.networks
     @network_types_interface = @api_client.network_types
+    @network_subnets_interface = @api_client.network_subnets
+    @network_subnet_types_interface = @api_client.network_subnet_types
     @clouds_interface = @api_client.clouds
     @options_interface = @api_client.options
   end
@@ -571,7 +578,8 @@ class Morpheus::Cli::NetworksCommand
       elsif !options[:quiet]
         network = json_response['network']
         print_green_success "Added network #{network['name']}"
-        get([network['id']])
+        get_args = [network['id']] + (options[:remote] ? ["-r",options[:remote]] : [])
+        get(get_args)
       end
       return 0
     rescue RestClient::Exception => e
@@ -903,7 +911,8 @@ class Morpheus::Cli::NetworksCommand
       else
         network = json_response['network']
         print_green_success "Updated network #{network['name']}"
-        get([network['id']])
+        get_args = [network['id']] + (options[:remote] ? ["-r",options[:remote]] : [])
+        get(get_args)
       end
       return 0
     rescue RestClient::Exception => e
@@ -964,7 +973,7 @@ class Morpheus::Cli::NetworksCommand
         options[:cloud] = val
       end
       build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
-      opts.footer = "List host types."
+      opts.footer = "List network types."
     end
     optparse.parse!(args)
     connect(options)
@@ -990,7 +999,7 @@ class Morpheus::Cli::NetworksCommand
 
       network_types = json_response['networkTypes']
 
-      title = "Morpheus network Types"
+      title = "Morpheus Network Types"
       subtitles = []
       subtitles += parse_list_subtitles(options)
       if options[:cloud]
@@ -1022,52 +1031,890 @@ class Morpheus::Cli::NetworksCommand
     end
   end
 
-  private
+  def get_type(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[type]")
+      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "Get details about a network type.\n" +
+                    "[type] is required. This is the id or name of a network type."
+    end
+    optparse.parse!(args)
+    connect(options)
+    begin
+      params = {}
+      @network_types_interface.setopts(options)
+      if options[:dry_run]
+        if args[0].to_s =~ /\A\d{1,}\Z/
+          print_dry_run @network_types_interface.dry.get(args[0].to_i)
+        else
+          print_dry_run @network_types_interface.dry.list({name:args[0]})
+        end
+        return
+      end
 
+      network_type = find_network_type_by_name_or_id(args[0])
+      return 1 if network_type.nil?
+      json_response = {'networkType' => network_type}  # skip redundant request
+      # json_response = @networks_interface.get(network_type['id'])
+      
+      render_result = render_with_format(json_response, options, 'networkType')
+      return 0 if render_result
 
-  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)
+      network_type = json_response['networkType']
+
+      title = "Morpheus Network Type"
+      
+      print_h1 "Morpheus Network Type", [], options
+      
+      print cyan
+      description_cols = {
+        "ID" => 'id',
+        "Name" => 'name',
+        "Code" => 'name',
+        "Description" => 'description',
+        # lots more here
+        "Createable" => lambda {|it| format_boolean(it['creatable']) },
+        "Deletable" => lambda {|it| format_boolean(it['deleteable']) },
+      }
+      print_description_list(description_cols, network_type)
+
+
+      option_types = network_type['optionTypes'] || []
+      option_types = option_types.sort {|x,y| x['displayOrder'] <=> y['displayOrder'] }
+      if !option_types.empty?
+        print_h2 "Config Option Types", [], options
+        option_type_cols = {
+          "Name" => lambda {|it| it['fieldContext'].to_s != '' ? "#{it['fieldContext']}.#{it['fieldName']}" : it['fieldName'] },
+          "Label" => lambda {|it| it['fieldLabel'] },
+          "Type" => lambda {|it| it['type'] },
+        }
+        print cyan
+        print as_pretty_table(option_types, option_type_cols)
+      end
+      
+      print reset,"\n"
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
     end
   end
 
-  def find_network_by_id(id)
+  def list_subnet_types(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage()
+      opts.on( '-c', '--cloud CLOUD', "Cloud Name or ID" ) do |val|
+        options[:cloud] = val
+      end
+      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "List subnet types."
+    end
+    optparse.parse!(args)
+    connect(options)
     begin
-      json_response = @networks_interface.get(id.to_i)
-      return json_response['network']
+      params = {}
+      params.merge!(parse_list_options(options))
+      if options[:cloud]
+        #return network_types_for_cloud(options[:cloud], options)
+        zone = find_zone_by_name_or_id(nil, options[:cloud])
+        #params["zoneTypeId"] = zone['zoneTypeId']
+        params["zoneId"] = zone['id']
+        params["creatable"] = true
+      end
+      @network_subnet_types_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @network_subnet_types_interface.dry.list(params)
+        return
+      end
+      json_response = @network_subnet_types_interface.list(params)
+      
+      render_result = render_with_format(json_response, options, 'subnetTypes')
+      return 0 if render_result
+
+      subnet_types = json_response['subnetTypes']
+
+      title = "Morpheus Subnet Types"
+      subtitles = []
+      subtitles += parse_list_subtitles(options)
+      if options[:cloud]
+        subtitles << "Cloud: #{options[:cloud]}"
+      end
+      print_h1 title, subtitles
+      if subnet_types.empty?
+        print cyan,"No subnet types found.",reset,"\n"
+      else
+        rows = subnet_types.collect do |subnet_type|
+          {
+            id: subnet_type['id'],
+            code: subnet_type['code'],
+            name: subnet_type['name']
+          }
+        end
+        columns = [:id, :name, :code]
+        print cyan
+        print as_pretty_table(rows, columns, options)
+        print reset
+        print_results_pagination(json_response)
+      end
+      print reset,"\n"
+      return 0
+
     rescue RestClient::Exception => e
-      if e.response && e.response.code == 404
-        print_red_alert "Network not found by id #{id}"
-        return nil
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def get_subnet_type(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[type]")
+      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "Get details about a subnet type.\n" +
+                    "[type] is required. This is the id or name of a subnet type."
+    end
+    optparse.parse!(args)
+    connect(options)
+    begin
+      params = {}
+      @network_subnet_types_interface.setopts(options)
+      if options[:dry_run]
+        if args[0].to_s =~ /\A\d{1,}\Z/
+          print_dry_run @network_subnet_types_interface.dry.get(args[0].to_i)
+        else
+          print_dry_run @network_subnet_types_interface.dry.list({name:args[0]})
+        end
+        return
+      end
+
+      subnet_type = find_subnet_type_by_name_or_id(args[0])
+      return 1 if subnet_type.nil?
+      json_response = {'subnetType' => subnet_type}  # skip redundant request
+      # json_response = @networks_interface.get(subnet_type['id'])
+      
+      render_result = render_with_format(json_response, options, 'subnetType')
+      return 0 if render_result
+
+      subnet_type = json_response['subnetType']
+
+      title = "Morpheus Subnet Type"
+      
+      print_h1 "Morpheus Subnet Type", [], options
+      
+      print cyan
+      description_cols = {
+        "ID" => 'id',
+        "Name" => 'name',
+        "Code" => 'name',
+        "Description" => 'description',
+        "Createable" => lambda {|it| format_boolean(it['creatable']) },
+        "Deletable" => lambda {|it| format_boolean(it['deleteable']) },
+      }
+      print_description_list(description_cols, subnet_type)
+
+
+
+      option_types = subnet_type['optionTypes'] || []
+      option_types = option_types.sort {|x,y| x['displayOrder'] <=> y['displayOrder'] }
+      if !option_types.empty?
+        print_h2 "Config Option Types", [], options
+        option_type_cols = {
+          "Name" => lambda {|it| it['fieldContext'].to_s != '' ? "#{it['fieldContext']}.#{it['fieldName']}" : it['fieldName'] },
+          "Label" => lambda {|it| it['fieldLabel'] },
+          "Type" => lambda {|it| it['type'] },
+        }
+        print cyan
+        print as_pretty_table(option_types, option_type_cols)
+      end
+      
+      print reset,"\n"
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+
+  def list_subnets(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[network] [subnet]")
+      build_common_options(opts, options, [:list, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "Get details about a network." + "\n" +
+                    "[network] is required. This is the name or id of a network."
+    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
+      network = find_network_by_name_or_id(args[0])
+      return 1 if network.nil?
+
+      params.merge!(parse_list_options(options))
+      @network_subnets_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @network_subnets_interface.dry.list(network['id'], params)
+        return
+      end
+      json_response = @network_subnets_interface.list(network['id'], params)
+      subnets = json_response["subnets"]
+      if options[:json]
+        puts as_json(json_response, options, "subnets")
+        return 0
+      elsif options[:yaml]
+        puts as_yaml(json_response, options, "subnets")
+        return 0
+      elsif options[:csv]
+        puts records_as_csv(subnets, options)
+        return 0
+      end
+      title = "Morpheus Subnets"
+      subtitles = []
+      subtitles << "Network: #{network['name']}"
+      subtitles += parse_list_subtitles(options)
+      print_h1 title, subtitles
+      
+      if subnets.empty?
+        print cyan,"No subnets found.",reset,"\n"
       else
-        raise e
+        subnet_columns = {
+          "ID" => 'id',
+          "Name" => 'name',
+          #"Description" => 'description',
+          "Type" => lambda {|it| it['type']['name'] rescue it['type'] },
+          "CIDR" => lambda {|it| it['cidr'] },
+          "Visibility" => lambda {|it| it['visibility'].to_s.capitalize },
+          "Tenants" => lambda {|it| it['tenants'] ? it['tenants'].collect {|it| it['name'] }.uniq.join(', ') : '' }
+        }
+        print cyan
+        print as_pretty_table(subnets, subnet_columns)
       end
+      print reset,"\n"
+      return 0
+      
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      return 1
     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}"
-      # print_networks_table(networks, {color: red})
-      rows = networks.collect do |it|
-        {id: it['id'], name: it['name']}
+  def get_subnet(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[network] [subnet]")
+      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "Get details about a subnet." + "\n" +
+                    "[network] is required. This is the name or id of a network." + "\n" +
+                    "[subnet] is required. This is the name or id of a subnet."
+    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)
+    begin
+      network = find_network_by_name_or_id(args[0])
+      return 1 if network.nil?
+
+      @network_subnets_interface.setopts(options)
+      if options[:dry_run]
+        if args[1].to_s =~ /\A\d{1,}\Z/
+          print_dry_run @network_subnets_interface.dry.get(network['id'], args[1].to_i)
+        else
+          print_dry_run @network_subnets_interface.dry.list(network['id'], {name:args[1]})
+        end
+        return
       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']]
+      subnet = find_subnet_by_name_or_id(network['id'], args[1])
+      return 1 if subnet.nil?
+      json_response = {'subnet' => subnet}  # skip redundant request
+      # json_response = @network_subnets_interface.get(network['id'], subnet['id'])
+      subnet = json_response['subnet']
+      if options[:json]
+        puts as_json(json_response, options, "subnet")
+        return 0
+      elsif options[:yaml]
+        puts as_yaml(json_response, options, "subnet")
+        return 0
+      elsif options[:csv]
+        puts records_as_csv([subnet], options)
+        return 0
       end
-      return network
+      print_h1 "Subnet Details", [], options
+      print cyan
+      description_cols = {
+        "ID" => 'id',
+        "Name" => 'name',
+        "Description" => 'description',
+        "Type" => lambda {|it| it['type'] ? it['type']['name'] : '' },
+        "Network" => lambda {|it| network['name'] },
+        "Cloud" => lambda {|it| network['zone'] ? network['zone']['name'] : '' },
+        "CIDR" => 'cidr',
+        "Gateway" => 'gateway',
+        "Netmask" => 'netmask',
+        "Subnet" => 'subnetAddress',
+        "Primary DNS" => 'dnsPrimary',
+        "Secondary DNS" => 'dnsSecondary',
+        "Pool" => lambda {|it| it['pool'] ? it['pool']['name'] : '' },
+        "DHCP" => lambda {|it| format_boolean it['dhcpServer'] },
+        #"Allow IP Override" => lambda {|it| it['allowStaticOverride'] ? 'Yes' : 'No' },
+        "Visibility" => lambda {|it| it['visibility'].to_s.capitalize },
+        "Tenants" => lambda {|it| it['tenants'] ? it['tenants'].collect {|it| it['name'] }.uniq.join(', ') : '' },
+        # "Owner" => lambda {|it| it['owner'] ? it['owner']['name'] : '' },
+      }
+      print_description_list(description_cols, subnet)
+
+      if subnet['resourcePermission'].nil?
+        print "\n", "No group access found", "\n"
+      else
+        print_h2 "Group Access"
+        rows = []
+        if subnet['resourcePermission']['all']
+          rows.push({"name" => 'All'})
+        end
+        if subnet['resourcePermission']['sites']
+          subnet['resourcePermission']['sites'].each do |site|
+            rows.push(site)
+          end
+        end
+        rows = rows.collect do |site|
+          {group: site['name'], default: site['default'] ? 'Yes' : ''}
+        end
+        columns = [:group, :default]
+        print cyan
+        print as_pretty_table(rows, columns)
+      end
+
+      print reset,"\n"
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      return 1
+    end
+  end
+
+  def add_subnet(args)
+    options = {}
+    subnet_type_id = nil
+    tenants = nil
+    group_access_all = nil
+    group_access_list = nil
+    group_defaults_list = nil
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[network]")
+      opts.on('-t', '--type ID', "Subnet Type Name or ID") do |val|
+        subnet_type_id = val
+      end
+      opts.on('--name VALUE', String, "Name for this subnet") do |val|
+        options[:options]['name'] = val
+      end
+      opts.on('--group-access-all [on|off]', String, "Toggle Access for all groups.") do |val|
+        group_access_all = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
+      opts.on('--group-access LIST', Array, "Group Access, comma separated list of group IDs.") do |list|
+        if list.size == 1 && list[0] == 'null' # hacky way to clear it
+          group_access_list = []
+        else
+          group_access_list = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+        end
+      end
+      opts.on('--group-defaults LIST', Array, "Group Default Selection, comma separated list of group IDs") do |list|
+        if list.size == 1 && list[0] == 'null' # hacky way to clear it
+          group_defaults_list = []
+        else
+          group_defaults_list = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+        end
+      end
+      opts.on('--tenants LIST', Array, "Tenant Access, comma separated list of account IDs") do |list|
+        if list.size == 1 && list[0] == 'null' # hacky way to clear it
+          options['tenants'] = []
+        else
+          options['tenants'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+        end
+      end
+      opts.on('--accounts LIST', Array, "alias for --tenants") do |list|
+        if list.size == 1 && list[0] == 'null' # hacky way to clear it
+          options['tenants'] = []
+        else
+          options['tenants'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+        end
+      end
+      opts.on('--visibility [private|public]', String, "Visibility") do |val|
+        options['visibility'] = val
+      end
+      # opts.on('--active [on|off]', String, "Can be used to disable a subnet") do |val|
+      #   options['active'] = val.to_s == 'on' || val.to_s == 'true'
+      # end
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
+      opts.footer = "Create a new subnet." + "\n" +
+                    "[network] is required. This is the name or id of a network." #+ "\n" +
+                    #"[name] is required and can be passed as --name instead."
+    end
+    optparse.parse!(args)
+    # if args.count < 1 || args.count > 2
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1-2 and got (#{args.count}) #{args}\n#{optparse}"
+    end
+    if args[1]
+      options[:options]['name'] = args[1]
+    end
+    connect(options)
+    begin
+      network = find_network_by_name_or_id(args[0])
+      return 1 if network.nil?
+
+      passed_options = (options[:options] || {}).reject {|k,v| k.is_a?(Symbol) }
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+        payload.deep_merge!({'subnet' => passed_options}) unless passed_options.empty?
+        
+      else
+        payload = {'subnet' => {}}
+        payload.deep_merge!({'subnet' => passed_options}) unless passed_options.empty?
+        
+        # Name
+        # v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'description' => 'Name for this subnet.'}], options[:options])
+        # payload['subnet']['name'] = v_prompt['name']
+
+        # Subnet Type
+        if !subnet_type_id
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'fieldLabel' => 'Subnet Type', 'type' => 'select', 'optionSource' => 'subnetTypes', 'required' => true, 'description' => 'Choose a subnet type.'}], options[:options], @api_client, {networkId: network['id']})
+          subnet_type_id = v_prompt['type']
+        end
+        subnet_type = find_subnet_type_by_name_or_id(subnet_type_id)
+        return 1 if subnet_type.nil?
+        payload['subnet']['type'] = {'id' => subnet_type['id'] }
+        #payload['subnet']['type'] = {'code' => subnet_type['code'] }
+
+        subnet_type_option_types = subnet_type['optionTypes']
+        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']})
+          payload['subnet'].deep_merge!(subnet_type_params)
+
+        else
+          # DEFAULT INPUTS
+
+          # CIDR
+          # if options['cidr']
+          #   payload['subnet']['cidr'] = options['cidr']
+          # else
+          #   v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cidr', 'fieldLabel' => 'CIDR', 'type' => 'text', 'required' => false, 'description' => ''}], options)
+          #   payload['subnet']['cidr'] = v_prompt['cidr']
+          # end
+
+        end
+
+        # Group Access
+        # Group Access (default is All)
+        if group_access_all.nil?
+          if payload['resourcePermissions'].nil?
+            payload['resourcePermissions'] ||= {}
+            payload['resourcePermissions']['all'] = true
+          end
+        else
+          payload['resourcePermissions'] ||= {}
+          payload['resourcePermissions']['all'] = group_access_all
+        end
+        if group_access_list != nil
+          payload['resourcePermissions'] ||= {}
+          payload['resourcePermissions']['sites'] = group_access_list.collect do |site_id|
+            site = {"id" => site_id.to_i}
+            if group_defaults_list && group_defaults_list.include?(site_id)
+              site["default"] = true
+            end
+            site
+          end
+        end
+
+        # Tenants
+        if options['tenants']
+          payload['tenantPermissions'] = {}
+          payload['tenantPermissions']['accounts'] = options['tenants']
+        end
+
+        # Active
+        if options['active'] != nil
+          payload['subnet']['active'] = options['active']
+        end
+        
+        # Visibility
+        if options['visibility'] != nil
+          payload['subnet']['visibility'] = options['visibility']
+        end
+
+      end
+
+      @network_subnets_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @network_subnets_interface.dry.create(network['id'], payload)
+        return
+      end
+      json_response = @network_subnets_interface.create(network['id'], payload)
+      if options[:json]
+        puts as_json(json_response, options)
+      elsif !options[:quiet]
+        subnet = json_response['subnet']
+        print_green_success "Added subnet #{subnet['name']}"
+        get_args = [network['id'], subnet['id']] + (options[:remote] ? ["-r",options[:remote]] : [])
+        get_subnet(get_args)
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      return 1
+    end
+  end
+
+
+  def update_subnet(args)
+    options = {}
+    tenants = nil
+    group_access_all = nil
+    group_access_list = nil
+    group_defaults_list = nil
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[network] [subnet]")
+      opts.on('--group-access-all [on|off]', String, "Toggle Access for all groups.") do |val|
+        group_access_all = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
+      opts.on('--group-access LIST', Array, "Group Access, comma separated list of group IDs.") do |list|
+        if list.size == 1 && list[0] == 'null' # hacky way to clear it
+          group_access_list = []
+        else
+          group_access_list = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+        end
+      end
+      opts.on('--group-defaults LIST', Array, "Group Default Selection, comma separated list of group IDs") do |list|
+        if list.size == 1 && list[0] == 'null' # hacky way to clear it
+          group_defaults_list = []
+        else
+          group_defaults_list = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+        end
+      end
+      opts.on('--tenants LIST', Array, "Tenant Access, comma separated list of account IDs") do |list|
+        if list.size == 1 && list[0] == 'null' # hacky way to clear it
+          options['tenants'] = []
+        else
+          options['tenants'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+        end
+      end
+      opts.on('--accounts LIST', Array, "alias for --tenants") do |list|
+        if list.size == 1 && list[0] == 'null' # hacky way to clear it
+          options['tenants'] = []
+        else
+          options['tenants'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
+        end
+      end
+      opts.on('--visibility [private|public]', String, "Visibility") do |val|
+        options['visibility'] = val
+      end
+      # opts.on('--active [on|off]', String, "Can be used to disable a network") do |val|
+      #   options['active'] = val.to_s == 'on' || val.to_s == 'true'
+      # end
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
+      opts.footer = "Update a subnet." + "\n" +
+                    "[network] is required. This is the name or id of a network." + "\n" +
+                    "[subnet] is required. This is the name or id of a subnet."
+    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)
+    begin
+      network = find_network_by_name_or_id(args[0])
+      return 1 if network.nil?
+
+      subnet = find_subnet_by_name_or_id(network['id'], args[1])
+      return 1 if subnet.nil?
+      
+      # merge -O options into normally parsed options
+      options.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+
+      # construct payload
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+      else
+        # prompt for network options
+        payload = {
+          'subnet' => {
+          }
+        }
+        
+        # allow arbitrary -O options
+        payload['subnet'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+
+        # Group Access
+        if group_access_all != nil
+          payload['resourcePermissions'] ||= {}
+          payload['resourcePermissions']['all'] = group_access_all
+        end
+        if group_access_list != nil
+          payload['resourcePermissions'] ||= {}
+          payload['resourcePermissions']['sites'] = group_access_list.collect do |site_id|
+            site = {"id" => site_id.to_i}
+            if group_defaults_list && group_defaults_list.include?(site_id)
+              site["default"] = true
+            end
+            site
+          end
+        end
+
+        # Tenants
+        if options['tenants']
+          payload['tenantPermissions'] = {}
+          payload['tenantPermissions']['accounts'] = options['tenants']
+        end
+
+        # Active
+        if options['active'] != nil
+          payload['subnet']['active'] = options['active']
+        end
+        
+        # Visibility
+        if options['visibility'] != nil
+          payload['subnet']['visibility'] = options['visibility']
+        end
+
+      end
+
+      @network_subnets_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @network_subnets_interface.dry.update(network['id'], subnet['id'], payload)
+        return
+      end
+      json_response = @network_subnets_interface.update(network['id'], subnet['id'], payload)
+      if options[:json]
+        puts as_json(json_response, options)
+      elsif !options[:quiet]
+        subnet = json_response['subnet']
+        print_green_success "Updated subnet #{subnet['name']}"
+        get_args = [network['id'], subnet['id']] + (options[:remote] ? ["-r",options[:remote]] : [])
+        get_subnet(get_args)
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      return 1
+    end
+  end
+
+  def remove_subnet(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[network] [subnet]")
+      build_common_options(opts, options, [:account, :auto_confirm, :json, :dry_run, :remote])
+      opts.footer = "Delete a subnet." + "\n" +
+                    "[network] is required. This is the name or id of a network." + "\n" +
+                    "[subnet] is required. This is the name or id of a subnet."
+    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)
+    begin
+      network = find_network_by_name_or_id(args[0])
+      return 1 if network.nil?
+
+      subnet = find_subnet_by_name_or_id(network['id'], args[1])
+      return 1 if subnet.nil?
+
+      unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the subnet: #{subnet['name']}?")
+        return 9, "aborted command"
+      end
+      @network_subnets_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @network_subnets_interface.dry.destroy(network['id'], subnet['id'])
+        return 0
+      end
+      json_response = @network_subnets_interface.destroy(network['id'], subnet['id'])
+      if options[:json]
+        puts as_json(json_response, options)
+      else
+        print_green_success "Removed subnet #{subnet['name']}"
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      return 1
+    end
+  end
+
+  private
+
+
+  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(network_id, val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_subnet_by_id(network_id, val)
+    else
+      return find_subnet_by_name(network_id, val)
+    end
+  end
+
+  def find_subnet_by_id(network_id, id)
+    begin
+      json_response = @network_subnets_interface.get(network_id, 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(network_id, name)
+    json_response = @network_subnets_interface.list(network_id, {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 = @network_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 = @network_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