morpheus-cli 5.5.1.4 → 5.5.2

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

@@ -51,11 +51,20 @@ class Morpheus::Cli::NetworksCommand
       opts.on('--subnets', '--subnets', "Display subnets as rows under each network found.") do
         options[:show_subnets] = true
       end
+      opts.on('-l', '--labels LABEL', String, "Filter by labels, can match any of the values") do |val|
+        add_query_parameter(params, 'labels', parse_labels(val))
+      end
+      opts.on('--all-labels LABEL', String, "Filter by labels, must match all of the values") do |val|
+        add_query_parameter(params, 'allLabels', parse_labels(val))
+      end
       build_common_options(opts, options, [:list, :json, :yaml, :csv, :fields, :json, :dry_run, :remote])
       opts.footer = "List networks."
     end
     optparse.parse!(args)
     connect(options)
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
     begin
       params.merge!(parse_list_options(options))
       cloud = nil
@@ -96,6 +105,7 @@ class Morpheus::Cli::NetworksCommand
           row = {
             id: network['id'],
             name: network['displayName'] || network['name'],
+            labels: format_list(network['labels'], '', 3),
             type: network['type'] ? network['type']['name'] : '',
             group: network['group'] ? network['group']['name'] : 'Shared',
             cloud: network['zone'] ? network['zone']['name'] : '',
@@ -113,6 +123,7 @@ class Morpheus::Cli::NetworksCommand
               subnet_row = {
                 id: subnet['id'],
                 name: "  #{subnet['displayName'] || subnet['name']}",
+                labels: format_list(subnet['labels'], '', 3),
                 # type: subnet['type'] ? subnet['type']['name'] : '',
                 type: "Subnet",
                 group: network['group'] ? network['group']['name'] : 'Shared',
@@ -128,7 +139,7 @@ class Morpheus::Cli::NetworksCommand
             end
           end
         end
-        columns = [:id, :name, :type, :group, :cloud, :cidr, :pool, :dhcp, :subnets, :active, :visibility, :tenants]
+        columns = [:id, :name, :labels, :type, :group, :cloud, :cidr, :pool, :dhcp, :subnets, :active, :visibility, :tenants]
         if options[:include_fields]
           columns = options[:include_fields]
         end
@@ -190,16 +201,26 @@ class Morpheus::Cli::NetworksCommand
       description_cols = {
         "ID" => 'id',
         "Name" => lambda {|it| it['displayName'] ? it['displayName'] : it['name'] },
+        "Labels" => lambda {|it| format_list(it['labels']) rescue '' },
         "Description" => 'description',
         "Type" => lambda {|it| it['type'] ? it['type']['name'] : '' },
         "Group" => lambda {|it| it['group'] ? it['group']['name'] : 'Shared' },
         "Cloud" => lambda {|it| it['zone'] ? it['zone']['name'] : '' },
+        "IPv4 Enabled" => 'ipv4Enabled',
+        "IPv6 Enabled" => 'ipv6Enabled',
         "CIDR" => 'cidr',
         "Gateway" => 'gateway',
         "Netmask" => 'netmask',
         "Subnet" => 'subnetAddress',
         "Primary DNS" => 'dnsPrimary',
         "Secondary DNS" => 'dnsSecondary',
+        "IPv6 CIDR" => 'cidrIPv6',
+        "IPv6 Gateway" => 'gatewayIPv6',
+        "IPv6 Netmask" => 'netmaskIPv6',
+        "IPv6 Primary DNS" => 'dnsPrimaryIPv6',
+        "IPv6 Secondary DNS" => 'dnsSecondaryIPv6',
+        "Domain" => lambda {|it| it['networkDomain'] ? it['networkDomain']['name'] : '' },
+        "Search Domains" => lambda {|it| it['searchDomains'] },
         "Pool" => lambda {|it| it['pool'] ? it['pool']['name'] : '' },
         "VPC" => lambda {|it| it['zonePool'] ? it['zonePool']['name'] : '' },
         "DHCP" => lambda {|it| it['dhcpServer'] ? 'Yes' : 'No' },
@@ -208,6 +229,8 @@ class Morpheus::Cli::NetworksCommand
         "Visibility" => lambda {|it| it['visibility'].to_s.capitalize },
         "Tenants" => lambda {|it| it['tenants'] ? it['tenants'].collect {|it| it['name'] }.uniq.join(', ') : '' },
       }
+      description_cols.delete("Domain") if network['networkDomain'].nil?
+      description_cols.delete("Search Domains") if network['searchDomains'].to_s.empty?
       print_description_list(description_cols, network)
 
       if network["group"]
@@ -243,10 +266,12 @@ class Morpheus::Cli::NetworksCommand
           {
             id: subnet['id'],
             name: "  #{subnet['displayName'] || subnet['name']}",
+            labels: format_list(subnet['labels'], '', 3),
             # type: subnet['type'] ? subnet['type']['name'] : '',
             type: "Subnet",
             cloud: network['zone'] ? network['zone']['name'] : '',
             cidr: subnet['cidr'],
+            cidrIPv6: subnet['cidrIPv6'],
             pool: subnet['pool'] ? subnet['pool']['name'] : '',
             dhcp: subnet['dhcpServer'] ? 'Yes' : 'No',
             visibility: subnet['visibility'].to_s.capitalize,
@@ -254,7 +279,7 @@ class Morpheus::Cli::NetworksCommand
             tenants: subnet['tenants'] ? subnet['tenants'].collect {|it| it['name'] }.uniq.join(', ') : ''
           }
         }
-        columns = [:id, :name, :cidr, :dhcp, :active, :visibility]
+        columns = [:id, :name, :labels, :cidr, :cidrIPv6, :dhcp, :active, :visibility]
         print cyan
         print as_pretty_table(subnet_rows, columns, options)
         print reset
@@ -295,9 +320,18 @@ class Morpheus::Cli::NetworksCommand
       opts.on('--display-name VALUE', String, "Display name for this network") do |val|
         options['displayName'] = val
       end
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        options['labels'] = parse_labels(val)
+      end
       opts.on('--description VALUE', String, "Description of network") do |val|
         options['description'] = val
       end
+      opts.on('--ipv4Enabled [on|off]', String, "ipv4Enabled") do |val|
+        options['ipv4Enabled'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
+      opts.on('--ipv6Enabled [on|off]', String, "ipv6Enabled") do |val|
+        options['ipv6Enabled'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
       opts.on('--gateway VALUE', String, "Gateway") do |val|
         options['gateway'] = val
       end
@@ -310,6 +344,34 @@ class Morpheus::Cli::NetworksCommand
       opts.on('--cidr VALUE', String, "CIDR") do |val|
         options['cidr'] = val
       end
+      opts.on('--gateway-ipv6 VALUE', String, "IPv6 Gateway") do |val|
+        options['gatewayIPv6'] = val
+      end
+      opts.on('--gatewayIPv6 VALUE', String, "IPv6 Gateway") do |val|
+        options['gatewayIPv6'] = val
+      end
+      opts.add_hidden_option('--gatewayIPv6')
+      opts.on('--dns-primary-ipv6 VALUE', String, "IPv6 DNS Primary") do |val|
+        options['dnsPrimaryIPv6'] = val
+      end
+      opts.on('--dns-primaryIPv6 VALUE', String, "IPv6 DNS Primary") do |val|
+        options['dnsPrimaryIPv6'] = val
+      end
+      opts.add_hidden_option('--dns-primaryIPv6')
+      opts.on('--dns-secondary-ipv6 VALUE', String, "IPv6 DNS Secondary") do |val|
+        options['dnsSecondaryIPv6'] = val
+      end
+      opts.on('--dns-secondaryIPv6 VALUE', String, "IPv6 DNS Secondary") do |val|
+        options['dnsSecondaryIPv6'] = val
+      end
+      opts.add_hidden_option('--dns-secondaryIPv6')
+      opts.on('--cidr-ipv6 VALUE', String, "IPv6 CIDR") do |val|
+        options['cidrIPv6'] = val
+      end
+      opts.on('--cidrIPv6 VALUE', String, "IPv6 CIDR") do |val|
+        options['cidrIPv6'] = val
+      end
+      opts.add_hidden_option('--cidrIPv6')
       opts.on('--vlan-id VALUE', String, "VLAN ID") do |val|
         options['vlanId'] = val.to_i
       end
@@ -322,12 +384,15 @@ class Morpheus::Cli::NetworksCommand
       opts.on('--allow-ip-override [on|off]', String, "Allow IP Override") do |val|
         options['allowStaticOverride'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
       end
-      opts.on('--domain VALUE', String, "Network Domain ID") do |val|
+      opts.on('--domain [VALUE]', String, "Network Domain ID") do |val|
         options['domain'] = val
       end
-      opts.on('--scan [on|off]', String, "Scan Network") do |val|
-        options['scanNetwork'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      opts.on('--search-domains [VALUE]', String, "Search Domains") do |val|
+        options['searchDomains'] = val
       end
+      # opts.on('--scan [on|off]', String, "Scan Network") do |val|
+      #   options['scanNetwork'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      # end
       opts.on('--proxy VALUE', String, "Network Proxy ID") do |val|
         options['proxy'] = val
       end
@@ -436,6 +501,11 @@ class Morpheus::Cli::NetworksCommand
           payload['network']['displayName'] = v_prompt['displayName']
         end
 
+        # Labels
+        if options['labels']
+          payload['network']['labels'] = options['labels']
+        end
+
         # Description
         if options['description']
           payload['network']['description'] = options['description']
@@ -561,43 +631,102 @@ class Morpheus::Cli::NetworksCommand
           payload['network']['zone'] = {'id' => cloud['id']}
         end
 
-        # CIDR
-        if network_type['hasCidr'] && network_type['cidrEditable']
-          if options['cidr']
-            payload['network']['cidr'] = options['cidr']
-          else
-            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cidr', 'fieldLabel' => network_type['code'] == 'nsxtLogicalSwitch' ? 'Gateway CIDR' : 'CIDR', 'type' => 'text', 'required' => network_type['cidrRequired'], 'description' => ''}], options)
-            payload['network']['cidr'] = v_prompt['cidr']
-          end
+        if options['ipv4Enabled'].nil? && payload['network']['ipv4Enabled'].nil?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'ipv4Enabled', 'fieldLabel' => 'IPv4 Enabled', 'type' => 'checkbox', 'required' => false, 'description' => '', 'defaultValue' => true}], options)
+          val = v_prompt['ipv4Enabled']
+          payload['network']['ipv4Enabled'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+        else
+          payload['network']['ipv4Enabled'] = options['ipv4Enabled']
         end
 
-        # Gateway
-        if network_type['gatewayEditable']
-          if options['gateway']
-            payload['network']['gateway'] = options['gateway']
-          else
-            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'gateway', 'fieldLabel' => 'Gateway', 'type' => 'text', 'required' => false, 'description' => ''}], options)
-            payload['network']['gateway'] = v_prompt['gateway']
+        if payload['network']['ipv4Enabled'] 
+          # CIDR
+          if network_type['hasCidr'] && network_type['cidrEditable']
+            if options['cidr']
+              payload['network']['cidr'] = options['cidr']
+            else
+              v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cidr', 'fieldLabel' => network_type['code'] == 'nsxtLogicalSwitch' ? 'Gateway CIDR' : 'CIDR', 'type' => 'text', 'required' => network_type['cidrRequired'], 'description' => ''}], options)
+              payload['network']['cidr'] = v_prompt['cidr']
+            end
+          end
+
+          # Gateway
+          if network_type['gatewayEditable']
+            if options['gateway']
+              payload['network']['gateway'] = options['gateway']
+            else
+              v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'gateway', 'fieldLabel' => 'Gateway', 'type' => 'text', 'required' => false, 'description' => ''}], options)
+              payload['network']['gateway'] = v_prompt['gateway']
+            end
+          end
+
+          # DNS
+          if network_type['dnsEditable']
+            if options['dnsPrimary']
+              payload['network']['dnsPrimary'] = options['dnsPrimary']
+            else
+              v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'dnsPrimary', 'fieldLabel' => 'DNS Primary', 'type' => 'text', 'required' => false, 'description' => ''}], options)
+              payload['network']['dnsPrimary'] = v_prompt['dnsPrimary']
+            end
+
+            if options['dnsSecondary']
+              payload['network']['dnsSecondary'] = options['dnsSecondary']
+            else
+              v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'dnsSecondary', 'fieldLabel' => 'DNS Secondary', 'type' => 'text', 'required' => false, 'description' => ''}], options)
+              payload['network']['dnsSecondary'] = v_prompt['dnsSecondary']
+            end
           end
         end
 
-        # DNS
-        if network_type['dnsEditable']
-          if options['dnsPrimary']
-            payload['network']['dnsPrimary'] = options['dnsPrimary']
-          else
-            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'dnsPrimary', 'fieldLabel' => 'DNS Primary', 'type' => 'text', 'required' => false, 'description' => ''}], options)
-            payload['network']['dnsPrimary'] = v_prompt['dnsPrimary']
+        if options['ipv6Enabled'].nil? && payload['network']['ipv6Enabled'].nil?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'ipv6Enabled', 'fieldLabel' => 'IPv6 Enabled', 'type' => 'checkbox', 'required' => false, 'description' => '', 'defaultValue' => false}], options)
+          val = v_prompt['ipv6Enabled']
+          payload['network']['ipv6Enabled'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+        else
+          payload['network']['ipv6Enabled'] = options['ipv6Enabled']
+        end
+
+        if payload['network']['ipv6Enabled'] 
+          #IPv6 Options
+          # CIDR
+          if network_type['hasCidr'] && network_type['cidrEditable']
+            if options['cidrIPv6']
+              payload['network']['cidrIPv6'] = options['cidr']
+            else
+              v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cidrIPv6', 'fieldLabel' => 'IPv6 CIDR', 'type' => 'text', 'required' => false, 'description' => ''}], options)
+              payload['network']['cidrIPv6'] = v_prompt['cidrIPv6']
+            end
           end
 
-          if options['dnsSecondary']
-            payload['network']['dnsSecondary'] = options['dnsSecondary']
-          else
-            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'dnsSecondary', 'fieldLabel' => 'DNS Secondary', 'type' => 'text', 'required' => false, 'description' => ''}], options)
-            payload['network']['dnsSecondary'] = v_prompt['dnsSecondary']
+          # Gateway
+          if network_type['gatewayEditable']
+            if options['gatewayIPv6']
+              payload['network']['gatewayIPv6'] = options['gatewayIPv6']
+            else
+              v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'gatewayIPv6', 'fieldLabel' => 'IPv6 Gateway', 'type' => 'text', 'required' => false, 'description' => ''}], options)
+              payload['network']['gatewayIPv6'] = v_prompt['gatewayIPv6']
+            end
+          end
+
+          # DNS
+          if network_type['dnsEditable']
+            if options['dnsPrimaryIPv6']
+              payload['network']['dnsPrimaryIPv6'] = options['dnsPrimaryIPv6']
+            else
+              v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'dnsPrimaryIPv6', 'fieldLabel' => 'IPv6 DNS Primary', 'type' => 'text', 'required' => false, 'description' => ''}], options)
+              payload['network']['dnsPrimaryIPv6'] = v_prompt['dnsPrimaryIPv6']
+            end
+
+            if options['dnsSecondary']
+              payload['network']['dnsSecondaryIPv6'] = options['dnsSecondaryIPv6']
+            else
+              v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'dnsSecondaryIPv6', 'fieldLabel' => 'IPv6 DNS Secondary', 'type' => 'text', 'required' => false, 'description' => ''}], options)
+              payload['network']['dnsSecondaryIPv6'] = v_prompt['dnsSecondaryIPv6']
+            end
           end
         end
 
+
         # VLAN ID
         if network_type['vlanIdEditable']
           if options['vlanId']
@@ -668,16 +797,19 @@ class Morpheus::Cli::NetworksCommand
 
         # Network Domain
         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?
+          if options.key?('domain')
+            if options['domain'].to_s.empty?  # clear it?
+              payload['network']['networkDomain'] = {'id' => nil}
+            else
+              # always prompt to handle value as name instead of id...
+              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
         end
 
         # Search Domains
-        if options['searchDomains'] != nil
+        if options.key?('searchDomains')
           payload['network']['searchDomains'] = options['searchDomains']
         else
           v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'searchDomains', 'fieldLabel' => 'Search Domains', 'type' => 'text', 'required' => false, 'description' => ''}], options)
@@ -807,12 +939,21 @@ class Morpheus::Cli::NetworksCommand
       opts.on('--name VALUE', String, "Name for this network") do |val|
         options['name'] = val
       end
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        options['labels'] = parse_labels(val)
+      end
       opts.on('--description VALUE', String, "Description of network") do |val|
         options['description'] = val
       end
       opts.on('--display-name VALUE', String, "Display name for this network") do |val|
         options['displayName'] = val
       end
+      opts.on('--ipv4Enabled [on|off]', String, "ipv4Enabled") do |val|
+        options['ipv4Enabled'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
+      opts.on('--ipv6Enabled [on|off]', String, "ipv6Enabled") do |val|
+        options['ipv6Enabled'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
       opts.on('--gateway VALUE', String, "Gateway") do |val|
         options['gateway'] = val
       end
@@ -825,6 +966,34 @@ class Morpheus::Cli::NetworksCommand
       opts.on('--cidr VALUE', String, "CIDR") do |val|
         options['cidr'] = val
       end
+      opts.on('--gateway-ipv6 VALUE', String, "IPv6 Gateway") do |val|
+        options['gatewayIPv6'] = val
+      end
+      opts.on('--gatewayIPv6 VALUE', String, "IPv6 Gateway") do |val|
+        options['gatewayIPv6'] = val
+      end
+      opts.add_hidden_option('--gatewayIPv6')
+      opts.on('--dns-primary-ipv6 VALUE', String, "IPv6 DNS Primary") do |val|
+        options['dnsPrimaryIPv6'] = val
+      end
+      opts.on('--dns-primaryIPv6 VALUE', String, "IPv6 DNS Primary") do |val|
+        options['dnsPrimaryIPv6'] = val
+      end
+      opts.add_hidden_option('--dns-primaryIPv6')
+      opts.on('--dns-secondary-ipv6 VALUE', String, "IPv6 DNS Secondary") do |val|
+        options['dnsSecondaryIPv6'] = val
+      end
+      opts.on('--dns-secondaryIPv6 VALUE', String, "IPv6 DNS Secondary") do |val|
+        options['dnsSecondaryIPv6'] = val
+      end
+      opts.add_hidden_option('--dns-secondaryIPv6')
+      opts.on('--cidr-ipv6 VALUE', String, "IPv6 CIDR") do |val|
+        options['cidrIPv6'] = val
+      end
+      opts.on('--cidrIPv6 VALUE', String, "IPv6 CIDR") do |val|
+        options['cidrIPv6'] = val
+      end
+      opts.add_hidden_option('--cidrIPv6')
       opts.on('--vlan-id VALUE', String, "VLAN ID") do |val|
         options['vlanId'] = val.to_i
       end
@@ -837,12 +1006,15 @@ class Morpheus::Cli::NetworksCommand
       opts.on('--allow-ip-override [on|off]', String, "Allow IP Override") do |val|
         options['allowStaticOverride'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
       end
-      opts.on('--domain VALUE', String, "Network Domain ID") do |val|
+      opts.on('--domain [VALUE]', String, "Network Domain ID") do |val|
         options['domain'] = val
       end
-      opts.on('--scan [on|off]', String, "Scan Network") do |val|
-        options['scanNetwork'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      opts.on('--search-domains [VALUE]', String, "Search Domains") do |val|
+        options['searchDomains'] = val
       end
+      # opts.on('--scan [on|off]', String, "Scan Network") do |val|
+      #   options['scanNetwork'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      # end
       opts.on('--proxy VALUE', String, "Network Proxy ID") do |val|
         options['proxy'] = val
       end
@@ -972,6 +1144,11 @@ class Morpheus::Cli::NetworksCommand
           payload['network']['displayName'] = options['displayName']
         end
 
+        # Labels
+        if options['labels']
+          payload['network']['labels'] = options['labels']
+        end
+
         # Description
         if options['description']
           payload['network']['description'] = options['description']
@@ -980,6 +1157,15 @@ class Morpheus::Cli::NetworksCommand
           # payload['network']['description'] = v_prompt['description']
         end
 
+        # IP Types Enabled
+        if options['ipv4Enabled'] != nil
+          payload['network']['ipv4Enabled'] = options['ipv4Enabled']
+        end
+
+        if options['ipv6Enabled'] != nil
+          payload['network']['ipv6Enabled'] = options['ipv6Enabled']
+        end
+
         # Gateway
         if options['gateway']
           payload['network']['gateway'] = options['gateway']
@@ -1012,6 +1198,26 @@ class Morpheus::Cli::NetworksCommand
           # payload['network']['cidr'] = v_prompt['cidr']
         end
 
+        # IPv6 Gateway
+        if options['gatewayIPv6']
+          payload['network']['gatewayIPv6'] = options['gatewayIPv6']
+        end
+
+        # IPv6 DNS Primary
+        if options['dnsPrimaryIPv6']
+          payload['network']['dnsPrimarIPv6y'] = options['dnsPrimaryIPv6']
+        end
+
+        # IPv6 DNS Secondary
+        if options['dnsSecondaryIPv6']
+          payload['network']['dnsSecondaryIPv6'] = options['dnsSecondaryIPv6']
+        end
+
+        # IPv6 CIDR
+        if options['cidrIPv6']
+          payload['network']['cidrIPv6'] = options['cidrIPv6']
+        end
+
         # VLAN ID
         if options['vlanId']
           payload['network']['vlanId'] = options['vlanId']
@@ -1047,11 +1253,22 @@ class Morpheus::Cli::NetworksCommand
         end
         
         # Network Domain
-        if options['domain']
-          payload['network']['networkDomain'] = {'id' => options['domain'].to_i}
+        if options.key?('domain')
+          if options['domain'].to_s.empty?  # clear it?
+            payload['network']['networkDomain'] = {'id' => nil}
+          else
+            # always prompt to handle value as name instead of id...
+            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
+        if options.key?('searchDomains')
+          payload['network']['searchDomains'] = options['searchDomains']
         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?
+          # v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'searchDomains', 'fieldLabel' => 'Search Domains', 'type' => 'text', 'required' => false, 'description' => ''}], options)
+          # payload['network']['searchDomains'] = v_prompt['searchDomains']
         end
 
         # Scan Network