morpheus-cli 6.0.2 → 6.1.1

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

@@ -0,0 +1,87 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::LoadBalancerPoolNodes
+  include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::RestCommand
+  include Morpheus::Cli::SecondaryRestCommand
+  include Morpheus::Cli::LoadBalancersHelper
+
+  set_command_description "View and manage load balancer pool member nodes."
+  set_command_name :'load-balancer-pool-nodes'
+
+  set_rest_key :load_balancer_node
+  set_rest_parent_name :load_balancer_pools
+  set_rest_option_context_map({'loadBalancerNode' => ''})
+
+  register_subcommands :list, :get, :add, :update, :remove
+  register_interfaces :load_balancer_types, :load_balancer_pools
+
+  protected
+
+  def load_balancer_node_list_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Status" => 'status',
+      "Name" => 'name',
+      "IP Address" => 'ipAddress',
+      "Port" => 'port'
+    }
+  end
+
+  def load_balancer_node_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Description" => 'description',
+      "State" => lambda {|it| it['config']['adminState']},
+      "IP Address" => 'ipAddress',
+      "Port" => 'port',
+      "Weight" => 'weight',
+      "Backup Member" => lambda {|it| format_boolean it['config']['backupMember']},
+      "Max Concurrent Connections" => lambda {|it| it['config']['maxConcurrentConnections']}
+    }
+  end
+
+  def load_balancer_node_object_key
+    'loadBalancerNode'
+  end
+
+  def load_balancer_node_list_key
+    'loadBalancerNodes'
+  end
+
+  def load_balancer_node_label
+    'Load Balancer Node'
+  end
+
+  def load_balancer_node_label_plural
+    'Load Balancer Nodes'
+  end
+
+  def format_load_balancer_pool_status(record, return_color=cyan)
+    out = ""
+    status_string = record['status']
+    if status_string.nil? || status_string.empty? || status_string == "unknown"
+      out << "#{white}UNKNOWN#{return_color}"
+    elsif status_string == 'ok'
+      out << "#{green}#{status_string.upcase}#{return_color}"
+    elsif status_string == 'warning'
+      out << "#{yellow}#{status_string.upcase}#{return_color}"
+    else
+      out << "#{red}#{status_string ? status_string.upcase : 'N/A'}#{record['statusMessage'] ? "#{return_color} - #{record['statusMessage']}" : ''}#{return_color}"
+    end
+    out
+  end
+
+  def load_option_types_for_load_balancer_node(type_record, parent_record)
+    load_balancer_pool = parent_record
+    load_balancer_type = find_by_id(:load_balancer_type, load_balancer_pool['loadBalancer']['type']['id'])
+    load_balancer_type['nodeOptionTypes']
+  end
+
+  def find_load_balancer_node_by_name_or_id(parent_id, val)
+    (@load_balancer_pool_nodes_interface.get(parent_id, val)['loadBalancerNode']) rescue nil
+  end
+  ## using CliCommand's generic find_by methods
+
+end

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

@@ -8,12 +8,14 @@ class Morpheus::Cli::LoadBalancerPools
 
   set_command_description "View and manage load balancer pools."
   set_command_name :'load-balancer-pools'
-  register_subcommands :list, :get, :add, :update, :remove
-  register_interfaces :load_balancer_pools,
-                      :load_balancers, :load_balancer_types
 
+  set_rest_interface_name :load_balancer_pools_secondary
   set_rest_parent_name :load_balancers
 
+  register_subcommands :list, :get, :add, :update, :remove
+  register_interfaces :load_balancers, :load_balancer_types
+
+
   # set_rest_interface_name :load_balancer_pools
   # set_parent_rest_interface_name :load_balancers
   
@@ -30,6 +32,7 @@ class Morpheus::Cli::LoadBalancerPools
       "Name" => 'name',
       #"Load Balancer" => lambda {|it| it['loadBalancer'] ? it['loadBalancer']['name'] : '' },
       "Balancer Mode" => lambda {|it| it['vipBalance'] },
+      "Status" => lambda {|it| format_load_balancer_pool_status(it) }
     }
   end
 
@@ -68,7 +71,7 @@ class Morpheus::Cli::LoadBalancerPools
     status_string = record['status']
     if status_string.nil? || status_string.empty? || status_string == "unknown"
       out << "#{white}UNKNOWN#{return_color}"
-    elsif status_string == 'ok'
+    elsif status_string == 'online' || status_string == 'ok'
       out << "#{green}#{status_string.upcase}#{return_color}"
     elsif status_string == 'syncing'
       out << "#{yellow}#{status_string.upcase}#{return_color}"

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

@@ -222,8 +222,10 @@ class Morpheus::Cli::NetworksCommand
         "Domain" => lambda {|it| it['networkDomain'] ? it['networkDomain']['name'] : '' },
         "Search Domains" => lambda {|it| it['searchDomains'] },
         "Pool" => lambda {|it| it['pool'] ? it['pool']['name'] : '' },
+        "IPv6 Pool" => lambda {|it| it['poolIPv6'] ? it['poolIPv6']['name'] : '' },
         "VPC" => lambda {|it| it['zonePool'] ? it['zonePool']['name'] : '' },
         "DHCP" => lambda {|it| it['dhcpServer'] ? 'Yes' : 'No' },
+        "IPv6 DHCP" => lambda {|it| it['dhcpServerIPv6'] ? '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 },
@@ -381,6 +383,12 @@ class Morpheus::Cli::NetworksCommand
       opts.on('--dhcp-server [on|off]', String, "DHCP Server") do |val|
         options['dhcpServer'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
       end
+      opts.on('--dhcp-serverIPv6 [on|off]', String, "IPv6 DHCP Server") do |val|
+        options['dhcpServerIPv6'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
+      opts.on('--dhcp-server-ipv6 [on|off]', String, "IPv6 DHCP Server") do |val|
+        options['dhcpServerIPv6'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
       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
@@ -723,6 +731,15 @@ class Morpheus::Cli::NetworksCommand
               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
+                    # DHCP Server
+          if network_type['dhcpServerEditable'] && payload['network']['dhcpServerIPv6'].nil?
+            if options['dhcpServerIPv6'] != nil
+              payload['network']['dhcpServerIPv6'] = options['dhcpServerIPv6']
+            else
+              v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'dhcpServerIPv6', 'fieldLabel' => 'IPv6 DHCP Server', 'type' => 'checkbox', 'required' => false, 'description' => ''}], options)
+              payload['network']['dhcpServerIPv6'] = v_prompt['dhcpServerIPv6']
+            end
           end
         end
 
@@ -1003,6 +1020,12 @@ class Morpheus::Cli::NetworksCommand
       opts.on('--dhcp-server [on|off]', String, "DHCP Server") do |val|
         options['dhcpServer'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
       end
+      opts.on('--dhcp-serverIPv6 [on|off]', String, "IPv6 DHCP Server") do |val|
+        options['dhcpServerIPv6'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
+      opts.on('--dhcp-server-ipv6 [on|off]', String, "IPv6 DHCP Server") do |val|
+        options['dhcpServerIPv6'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
       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
@@ -1244,6 +1267,14 @@ class Morpheus::Cli::NetworksCommand
           # payload['network']['dhcpServer'] = v_prompt['dhcpServer']
         end
 
+        # IPv6 DHCP Server
+        if options['dhcpServerIPv6'] != nil
+          payload['network']['dhcpServerIPv6'] = options['dhcpServerIPv6']
+        else
+          # v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'dhcpServerIPv6', 'fieldLabel' => 'IPv6 DHCP Server', 'type' => 'checkbox', 'required' => false, 'description' => ''}], options)
+          # payload['network']['dhcpServerIPv6'] = v_prompt['dhcpServerIPv6']
+        end
+
         # Allow IP Override
         if options['allowStaticOverride'] != nil
           payload['network']['allowStaticOverride'] = options['allowStaticOverride']