morpheus-cli 4.1.6 → 4.1.7

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

@@ -459,13 +459,13 @@ module Morpheus::Cli::InfrastructureHelper
       bad_ids = []
       if record_list && record_list.size > 0
         record_list.each do |it|
-          found_network = nil
+          found_subnet = nil
           begin
-            found_network = find_record_by_name_or_id(it)
+            found_subnet = find_subnet_by_name_or_id(it)
           rescue SystemExit => cmdexit
           end
-          if found_network
-            record_ids << found_network['id']
+          if found_subnet
+            record_ids << found_subnet['id']
           else
             bad_ids << it
           end

data/lib/morpheus/cli/network_groups_command.rb

@@ -75,12 +75,13 @@ class Morpheus::Cli::NetworkGroupsCommand
             # networks: network_group['networks'] ? network_group['networks'].collect {|it| it['name'] }.uniq.join(', ') : '',
             networks: network_group['networks'] ? network_group['networks'].size : 0,
             subnets: network_group['subnets'] ? network_group['subnets'].size : 0,
+            active: format_boolean(network_group['active']),
             visibility: network_group['visibility'].to_s.capitalize,
             tenants: network_group['tenants'] ? network_group['tenants'].collect {|it| it['name'] }.uniq.join(', ') : ''
           }
           row
         }
-        columns = [:id, :name, :description, :networks, :subnets, :visibility, :tenants]
+        columns = [:id, :name, :description, :networks, :subnets, :active, :visibility, :tenants]
         if options[:include_fields]
           columns = options[:include_fields]
         end
@@ -143,9 +144,9 @@ class Morpheus::Cli::NetworkGroupsCommand
         "Description" => 'description',
         "Networks" => lambda {|it| it['networks'].size rescue 'n/a' },
         "Subnets" => lambda {|it| it['subnets'].size rescue 'n/a' },
+        "Active" => lambda {|it| it['active'].to_s.capitalize },
         "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, network_group)
 
@@ -159,8 +160,9 @@ class Morpheus::Cli::NetworkGroupsCommand
           #"Description" => 'description',
           "Type" => lambda {|it| it['type']['name'] rescue it['type'] },
           "CIDR" => lambda {|it| it['cidr'] },
+          "Active" => lambda {|it| it['active'].to_s.capitalize },
           "Visibility" => lambda {|it| it['visibility'].to_s.capitalize },
-          "Tenants" => lambda {|it| it['tenants'] ? it['tenants'].collect {|it| it['name'] }.uniq.join(', ') : '' }
+          "Tenants" => lambda {|it| it['tenants'] ? it['tenants'].collect {|it| it['name'] }.uniq.join(', ') : '' },
         }
         print cyan
         print as_pretty_table(networks, subnet_columns)
@@ -177,8 +179,9 @@ class Morpheus::Cli::NetworkGroupsCommand
           #"Description" => 'description',
           "Type" => lambda {|it| it['type']['name'] rescue it['type'] },
           "CIDR" => lambda {|it| it['cidr'] },
+          "Active" => lambda {|it| it['active'].to_s.capitalize },
           "Visibility" => lambda {|it| it['visibility'].to_s.capitalize },
-          "Tenants" => lambda {|it| it['tenants'] ? it['tenants'].collect {|it| it['name'] }.uniq.join(', ') : '' }
+          "Tenants" => lambda {|it| it['tenants'] ? it['tenants'].collect {|it| it['name'] }.uniq.join(', ') : '' },
         }
         print cyan
         print as_pretty_table(subnets, subnet_columns)
@@ -276,6 +279,9 @@ class Morpheus::Cli::NetworkGroupsCommand
       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 group") do |val|
+        options['active'] = val.to_s == 'on' || val.to_s == 'true'
+      end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
       opts.footer = "Create a new network group." + "\n" +
                     "[name] is required and can be passed as --name instead."
@@ -379,6 +385,11 @@ class Morpheus::Cli::NetworkGroupsCommand
           payload['networkGroup']['visibility'] = options['visibility']
         end
 
+        # Active
+        if options['active'] != nil
+          payload['networkGroup']['active'] = options['active']
+        end
+
       end
 
       @network_groups_interface.setopts(options)
@@ -464,6 +475,9 @@ class Morpheus::Cli::NetworkGroupsCommand
       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 group") 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 network group." + "\n" +
                     "[network-group] is required. This is the id of a network group."
@@ -560,6 +574,11 @@ class Morpheus::Cli::NetworkGroupsCommand
           payload['networkGroup']['visibility'] = options['visibility']
         end
 
+        # Active
+        if options['active'] != nil
+          payload['networkGroup']['active'] = options['active']
+        end
+        
       end
       @network_groups_interface.setopts(options)
       if options[:dry_run]

data/lib/morpheus/cli/networks_command.rb

@@ -14,7 +14,7 @@ class Morpheus::Cli::NetworksCommand
   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 :list_subnets, # :get_subnet, :add_subnet, :update_subnet, :remove_subnet
   
   def initialize()
     # @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
@@ -39,7 +39,7 @@ class Morpheus::Cli::NetworksCommand
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
-      opts.on( '-c', '--cloud CLOUD', "Cloud" ) do |val|
+      opts.on( '-c', '--cloud CLOUD', "Filter by Cloud" ) do |val|
         options[:cloud] = val
       end
       opts.on('--cidr VALUE', String, "Filter by cidr, matches beginning of value.") do |val|
@@ -103,6 +103,7 @@ class Morpheus::Cli::NetworksCommand
             dhcp: network['dhcpServer'] ? 'Yes' : 'No',
             subnets: (network['subnets'].size rescue 'n/a'),
             visibility: network['visibility'].to_s.capitalize,
+            active: format_boolean(network['active']),
             tenants: network['tenants'] ? network['tenants'].collect {|it| it['name'] }.uniq.join(', ') : ''
           }
           rows << row
@@ -118,13 +119,14 @@ class Morpheus::Cli::NetworksCommand
                 pool: subnet['pool'] ? subnet['pool']['name'] : '',
                 dhcp: subnet['dhcpServer'] ? 'Yes' : 'No',
                 visibility: subnet['visibility'].to_s.capitalize,
+                active: format_boolean(network['active']),
                 tenants: subnet['tenants'] ? subnet['tenants'].collect {|it| it['name'] }.uniq.join(', ') : ''
               }
               rows << subnet_row
             end
           end
         end
-        columns = [:id, :name, :type, :cloud, :cidr, :pool, :dhcp, :subnets, :visibility, :tenants]
+        columns = [:id, :name, :type, :cloud, :cidr, :pool, :dhcp, :subnets, :active, :visibility, :tenants]
         if options[:include_fields]
           columns = options[:include_fields]
         end
@@ -198,10 +200,10 @@ class Morpheus::Cli::NetworksCommand
         "Pool" => lambda {|it| it['pool'] ? it['pool']['name'] : '' },
         "VPC" => lambda {|it| it['zonePool'] ? it['zonePool']['name'] : '' },
         "DHCP" => lambda {|it| it['dhcpServer'] ? 'Yes' : 'No' },
+        "Active" => lambda {|it| format_boolean(it['active']) },
         "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, network)
 
@@ -243,10 +245,11 @@ class Morpheus::Cli::NetworksCommand
             pool: subnet['pool'] ? subnet['pool']['name'] : '',
             dhcp: subnet['dhcpServer'] ? 'Yes' : 'No',
             visibility: subnet['visibility'].to_s.capitalize,
+            active: format_boolean(subnet['active']),
             tenants: subnet['tenants'] ? subnet['tenants'].collect {|it| it['name'] }.uniq.join(', ') : ''
           }
         }
-        columns = [:id, :name, :cidr, :dhcp, :visibility]
+        columns = [:id, :name, :cidr, :dhcp, :active, :visibility]
         print cyan
         print as_pretty_table(subnet_rows, columns, options)
         print reset
@@ -451,7 +454,7 @@ class Morpheus::Cli::NetworksCommand
             # if option_type['fieldContext'] == 'domain'
             #   option_type['fieldContext'] = 'network'
             # end
-            option_type['fieldContext'] = nil
+            #option_type['fieldContext'] = nil
           end
           network_type_params = Morpheus::Cli::OptionTypes.prompt(network_type_option_types,options[:options],@api_client, {zoneId: cloud['id']})
           payload['network'].deep_merge!(network_type_params)
@@ -1199,8 +1202,9 @@ class Morpheus::Cli::NetworksCommand
           #"Description" => 'description',
           "Type" => lambda {|it| it['type']['name'] rescue it['type'] },
           "CIDR" => lambda {|it| it['cidr'] },
+          "Active" => lambda {|it| format_boolean(it['active']) },
           "Visibility" => lambda {|it| it['visibility'].to_s.capitalize },
-          "Tenants" => lambda {|it| it['tenants'] ? it['tenants'].collect {|it| it['name'] }.uniq.join(', ') : '' }
+          "Tenants" => lambda {|it| it['tenants'] ? it['tenants'].collect {|it| it['name'] }.uniq.join(', ') : '' },
         }
         print cyan
         print as_pretty_table(subnets, subnet_columns)

data/lib/morpheus/cli/security_groups.rb

@@ -154,11 +154,35 @@ class Morpheus::Cli::SecurityGroups
         "Name" => 'name',
         "Description" => 'description',
         "Scoped Cloud" => lambda {|it| it['zone'] ? it['zone']['name'] : 'All' },
-        "Source" => lambda {|it| it['syncSource'] == 'external' ? 'SYNCED' : 'CREATED' }
+        "Source" => lambda {|it| it['syncSource'] == 'external' ? 'SYNCED' : 'CREATED' },
+        # "Active" => lambda {|it| format_boolean(it['active']) },
+        "Visibility" => 'visibility',
+        "Tenants" => lambda {|it| it['tenants'] ? it['tenants'].collect {|it| it['name'] }.uniq.sort.join(', ') : '' },
       }
       print_description_list(description_cols, security_group)
       # print reset,"\n"
 
+      if security_group['resourcePermission'].nil?
+        #print "\n", "No group access found", "\n"
+      else
+        print_h2 "Group Access"
+        rows = []
+        if security_group['resourcePermission']['all']
+          rows.push({"name" => 'All'})
+        end
+        if security_group['resourcePermission']['sites']
+          security_group['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
+
       if security_group_locations && security_group_locations.size > 0
         print_h2 "Locations"
         print cyan
@@ -225,6 +249,10 @@ class Morpheus::Cli::SecurityGroups
     params = {}
     options = {:options => {}}
     cloud_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("[name] [options]")
       opts.on( '--name Name', String, "Name of the security group" ) do |val|
@@ -236,6 +264,33 @@ class Morpheus::Cli::SecurityGroups
       opts.on( '-c', '--cloud CLOUD', "Scoped Cloud Name or ID" ) do |val|
         cloud_id = 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('--visibility [private|public]', String, "Visibility") do |val|
+        options['visibility'] = val
+      end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
       opts.footer = "Create a security group." + "\n" +
                     "[name] is required. This is the name of the security group."
@@ -303,6 +358,38 @@ class Morpheus::Cli::SecurityGroups
           print yellow,"Failed to determine the available scoped clouds.",reset,"\n"
         end
 
+        # 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
+
+        # Visibility
+        if options['visibility'] != nil
+          payload['securityGroup']['visibility'] = options['visibility']
+        end
+
+        # Active
+        if options['active'] != nil
+          payload['securityGroup']['active'] = options['active']
+        end
+
       end
 
       @security_groups_interface.setopts(options)
@@ -326,6 +413,10 @@ class Morpheus::Cli::SecurityGroups
   def update(args)
     params = {}
     options = {: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("[security-group] [options]")
       opts.on( '--name Name', String, "Name of the security group" ) do |val|
@@ -334,6 +425,33 @@ class Morpheus::Cli::SecurityGroups
       opts.on( '--description Description', String, "Description of the security group" ) do |val|
         options[:options]['description'] = 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('--visibility [private|public]', String, "Visibility") do |val|
+        options['visibility'] = val
+      end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
       opts.footer = "Update a security group." + "\n" +
                     "[security-group] is required. This is the name or id of the security group."
@@ -362,7 +480,39 @@ class Morpheus::Cli::SecurityGroups
         # allow arbitrary -O options
         payload['securityGroup'].deep_merge!(passed_options)  unless passed_options.empty?
         
-        if passed_options.empty?
+        # 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
+
+        # Visibility
+        if options['visibility'] != nil
+          payload['securityGroup']['visibility'] = options['visibility']
+        end
+
+        # Active
+        if options['active'] != nil
+          payload['securityGroup']['active'] = options['active']
+        end
+
+        if payload['securityGroup'].empty? && payload['tenantPermissions'].nil? && payload['resourcePermissions'].nil?
           raise_command_error "Specify at least one option to update.\n#{optparse}"
         end
 

data/lib/morpheus/cli/subnets_command.rb

@@ -41,7 +41,10 @@ class Morpheus::Cli::SubnetsCommand
     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.on( '--network NETWORK', '--network NETWORK', "Filter results to a specific network" ) do |val|
+      opts.on( '-c', '--cloud CLOUD', "Filter by Cloud" ) do |val|
+        options[:cloud] = val
+      end
+      opts.on( '--network NETWORK', '--network NETWORK', "Filter by Network" ) do |val|
         options[:network] = val
       end
       opts.footer = "List subnets."
@@ -61,8 +64,17 @@ class Morpheus::Cli::SubnetsCommand
       else
         return 1, "Network not found"
       end
-      # params['networksId'] = params.delete('networkId')
     end
+    cloud = nil
+    if options[:cloud]
+      cloud = find_cloud_by_name_or_id(options[:cloud])
+      if cloud
+        params['zoneId'] = cloud['id']
+      else
+        return 1, "Cloud not found"
+      end
+    end
+    
 
     exit_code, err = 0, nil
 
@@ -82,6 +94,9 @@ class Morpheus::Cli::SubnetsCommand
     if network
       subtitles << "Network: #{network['name']}"
     end
+    if cloud
+      subtitles << "Cloud: #{cloud['name']}"
+    end
     subtitles += parse_list_subtitles(options)
     print_h1 title, subtitles
     
@@ -97,8 +112,9 @@ class Morpheus::Cli::SubnetsCommand
         "Cloud" => lambda {|it| it['zone']['name'] rescue it['zone'] },
         "CIDR" => lambda {|it| it['cidr'] },
         "DHCP" => lambda {|it| format_boolean(it['dhcpServer']) },
+        "Active" => lambda {|it| format_boolean(it['active']) },
         "Visibility" => lambda {|it| it['visibility'].to_s.capitalize },
-        "Tenants" => lambda {|it| it['tenants'] ? it['tenants'].collect {|it| it['name'] }.uniq.join(', ') : '' }
+        "Tenants" => lambda {|it| it['tenants'] ? it['tenants'].collect {|it| it['name'] }.uniq.join(', ') : '' },
       }
       print cyan
       print as_pretty_table(subnets, subnet_columns)
@@ -113,7 +129,7 @@ class Morpheus::Cli::SubnetsCommand
   def get(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[network] [subnet]")
+      opts.banner = subcommand_usage("[subnet]")
       build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "Get details about a subnet." + "\n" +
                     "[subnet] is required. This is the name or id of a subnet."
@@ -123,6 +139,7 @@ class Morpheus::Cli::SubnetsCommand
       raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args}\n#{optparse}"
     end
     connect(options)
+    exit_code, err = 0, nil
     begin
       subnet_id = nil
       if args[0].to_s =~ /\A\d{1,}\Z/
@@ -170,9 +187,9 @@ class Morpheus::Cli::SubnetsCommand
         "Pool" => lambda {|it| it['pool'] ? it['pool']['name'] : '' },
         "DHCP" => lambda {|it| format_boolean it['dhcpServer'] },
         #"Allow IP Override" => lambda {|it| it['allowStaticOverride'] ? 'Yes' : 'No' },
+        "Active" => lambda {|it| format_boolean(it['active']) },
         "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)
 
@@ -265,9 +282,9 @@ class Morpheus::Cli::SubnetsCommand
       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
+      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" +
@@ -278,8 +295,9 @@ class Morpheus::Cli::SubnetsCommand
     if args.count > 1
       raise_command_error "wrong number of arguments, expected 0-1 and got (#{args.count}) #{args}\n#{optparse}"
     end
-    if args[1]
+    if args[0]
       options[:options]['name'] = args[1]
+      options[:options].deep_merge!({'config' => {'subnetName' => args[0]}})
     end
     connect(options)
     begin
@@ -312,6 +330,9 @@ class Morpheus::Cli::SubnetsCommand
         end
         subnet_type = find_subnet_type_by_name_or_id(subnet_type_id)
         return 1 if subnet_type.nil?
+        if subnet_type['creatable'] == false
+          raise_command_error "Subnet Type cannot be created: #{subnet_type['name']}"
+        end
         payload['subnet']['type'] = {'id' => subnet_type['id'] }
         #payload['subnet']['type'] = {'code' => subnet_type['code'] }
 
@@ -385,7 +406,7 @@ class Morpheus::Cli::SubnetsCommand
       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_args = [subnet['id']] + (options[:remote] ? ["-r",options[:remote]] : [])
         get(get_args)
       end
       return 0
@@ -438,9 +459,9 @@ class Morpheus::Cli::SubnetsCommand
       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
+      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 = "Update a subnet." + "\n" +
                     "[subnet] is required. This is the name or id of a subnet."
@@ -451,10 +472,10 @@ class Morpheus::Cli::SubnetsCommand
     end
     connect(options)
     begin
-      network = find_network_by_name_or_id(args[0])
-      return 1 if network.nil?
+      # 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])
+      subnet = find_subnet_by_name_or_id(args[0])
       return 1 if subnet.nil?
       
       # merge -O options into normally parsed options
@@ -510,16 +531,16 @@ class Morpheus::Cli::SubnetsCommand
 
       @subnets_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @subnets_interface.dry.update(network['id'], subnet['id'], payload)
+        print_dry_run @subnets_interface.dry.update(subnet['id'], payload)
         return
       end
-      json_response = @subnets_interface.update(network['id'], subnet['id'], payload)
+      json_response = @subnets_interface.update(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_args = [subnet['id']] + (options[:remote] ? ["-r",options[:remote]] : [])
         get(get_args)
       end
       return 0
@@ -546,6 +567,12 @@ class Morpheus::Cli::SubnetsCommand
       subnet = find_subnet_by_name_or_id(args[0])
       return 1 if subnet.nil?
 
+      subnet_type = find_subnet_type_by_name_or_id(subnet['type']['id'])
+      return 1 if subnet_type.nil?
+      if subnet_type['deletable'] == false
+        raise_command_error "Subnet Type cannot be deleted: #{subnet_type['name']}"
+      end
+
       unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the subnet: #{subnet['name']}?")
         return 9, "aborted command"
       end