morpheus-cli 6.1.0 → 6.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57fffe54fd7ee43a1bd35bb15703bb85edca71ec59758374d9556d1743338f90
-  data.tar.gz: 3472c73b3bc3bf91b84e437eb593b367d86cf8aa32439d370eb6c15de40674fb
+  metadata.gz: 683efa948a958a0fb4a6def11cb94ae525bdde8cbde0ba1d1aa313adeef3387d
+  data.tar.gz: c19c0522892a7f96a8398811b89ea4324815f4494011bf6696be1fb362787304
 SHA512:
-  metadata.gz: e87cbd833e3633ddf03129d7eabfdb11b12a2956f6c6f66b43a5d42fd41cbb7a209085b6f1008e89ffbcf98251b8d6fc8e0e0d1b845a952b863c0f6add10386b
-  data.tar.gz: f51460150a7ef907e7c679d75c54830405ef18323c26aa0bcf1bb158c03ff7e05c53114b0e9df2edf4bba337ec6c843871f0fd3bd0ab9ad15ce9ceed836f2bfe
+  metadata.gz: a1b269a981ec0fcbeecbad62a91ba90f6e7429c26593579185a0a513d0ab5ea5e2394ab11d7bf138570314a418059b6a072e47fb04b0393010dc0f66a463db54
+  data.tar.gz: 3c211238b4a2dae07c4da54659be1c43e9f0cf7aaf25f7bbfcf53f0c6a0482b43b87b44db541287dfd7201228902902e80c0a1b4a5b538207f3303174940cff9

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.7.5
 
-RUN gem install morpheus-cli -v 6.1.0
+RUN gem install morpheus-cli -v 6.1.2
 
 ENTRYPOINT ["morpheus"]

data/lib/morpheus/api/api_client.rb

@@ -336,10 +336,6 @@ class Morpheus::APIClient
     }
   end
 
-  def doc
-    Morpheus::DocInterface.new(common_interface_options).setopts(@options)
-  end
-
   def ping
     Morpheus::PingInterface.new(common_interface_options).setopts(@options)
   end
@@ -492,6 +488,10 @@ class Morpheus::APIClient
     Morpheus::LoadBalancerPoolsInterface.new(common_interface_options).setopts(@options)
   end
 
+  def load_balancer_pools_secondary
+    Morpheus::LoadBalancerPoolsSecondaryInterface.new(common_interface_options).setopts(@options)
+  end
+
   def load_balancer_profiles
     Morpheus::LoadBalancerProfilesInterface.new(common_interface_options).setopts(@options)
   end
@@ -500,6 +500,10 @@ class Morpheus::APIClient
     Morpheus::LoadBalancerMonitorsInterface.new(common_interface_options).setopts(@options)
   end
 
+  def load_balancer_pool_nodes
+    Morpheus::LoadBalancerPoolNodesInterface.new(common_interface_options).setopts(@options)
+  end
+
   def tasks
     Morpheus::TasksInterface.new(common_interface_options).setopts(@options)
   end

data/lib/morpheus/api/cypher_interface.rb

@@ -9,7 +9,7 @@ class Morpheus::CypherInterface < Morpheus::APIClient
 
   def get(item_key, params={})
     raise "#{self.class}.get() passed a blank item_key!" if item_key.to_s == ''
-    url = "#{@base_url}#{base_path}/#{item_key}"
+    url = "#{@base_url}#{base_path}/#{escape_item_key(item_key)}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}" }
     execute({method: :get, url: url, headers: headers})
   end
@@ -17,29 +17,35 @@ class Morpheus::CypherInterface < Morpheus::APIClient
   # list url is the same as get but uses $itemKey/?list=true
   # method: 'LIST' would be neat though
   def list(item_key=nil, params={})
-    url = item_key ? "#{@base_url}#{base_path}/#{item_key}" : "#{@base_url}#{base_path}"
+    url = item_key ? "#{@base_url}#{base_path}/#{escape_item_key(item_key)}" : "#{@base_url}#{base_path}"
     params.merge!({list:'true'}) # ditch this probably
     headers = { :params => params, :authorization => "Bearer #{@access_token}" }
     execute({method: :get, url: url, headers: headers})
   end
 
   def create(item_key, params={}, payload={})
-    url = "#{@base_url}#{base_path}/#{item_key}"
+    url = "#{@base_url}#{base_path}/#{escape_item_key(item_key)}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute({method: :post, url: url, headers: headers, payload: payload.to_json})
   end
 
   # update is not even needed I don't think, same as POST
   def update(item_key, params={}, payload={})
-    url = "#{@base_url}#{base_path}/#{item_key}"
+    url = "#{@base_url}#{base_path}/#{escape_item_key(item_key)}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute({method: :put, url: url, headers: headers, payload: payload.to_json})
   end
 
   def destroy(item_key, params={})
-    url = "#{@base_url}#{base_path}/#{item_key}"
+    url = "#{@base_url}#{base_path}/#{escape_item_key(item_key)}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute({method: :delete, url: url, headers: headers})
   end
 
+  protected 
+
+  def escape_item_key(item_key)
+    item_key.to_s.split("/").collect {|i| CGI::escape(i.to_s) }.join("/")
+  end
+
 end

data/lib/morpheus/api/load_balancer_pool_nodes_interface.rb

@@ -0,0 +1,8 @@
+require 'morpheus/api/secondary_rest_interface'
+
+class Morpheus::LoadBalancerPoolNodesInterface < Morpheus::SecondaryRestInterface
+
+  def base_path(pool_id)
+    "/api/load-balancer-pools/#{pool_id}/nodes"
+  end
+end

data/lib/morpheus/api/load_balancer_pools_interface.rb

@@ -1,9 +1,9 @@
-require 'morpheus/api/secondary_rest_interface'
+require 'morpheus/api/rest_interface'
 
-class Morpheus::LoadBalancerPoolsInterface < Morpheus::SecondaryRestInterface
+class Morpheus::LoadBalancerPoolsInterface < Morpheus::RestInterface
 
-  def base_path(load_balancer_id)
-    "/api/load-balancers/#{load_balancer_id}/pools"
+  def base_path
+    "/api/load-balancer-pools"
   end
 
 end

data/lib/morpheus/api/load_balancer_pools_secondary_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/secondary_rest_interface'
+
+class Morpheus::LoadBalancerPoolsSecondaryInterface < Morpheus::SecondaryRestInterface
+
+  def base_path(load_balancer_id)
+    "/api/load-balancers/#{load_balancer_id}/pools"
+  end
+
+end

data/lib/morpheus/api/roles_interface.rb

@@ -2,10 +2,10 @@ require 'morpheus/api/api_client'
 
 class Morpheus::RolesInterface < Morpheus::APIClient
 
-  def get(account_id, id)
+  def get(account_id, id, params={})
     raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
     url = build_url(account_id, id)
-    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
@@ -21,24 +21,24 @@ class Morpheus::RolesInterface < Morpheus::APIClient
     execute(method: :get, url: url, headers: headers)
   end
 
-  def create(account_id, options)
+  def create(account_id, options, params={})
     url = build_url(account_id)
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     payload = options
-    execute(method: :post, url: url, headers: headers, payload: payload.to_json)
+    execute(method: :post, url: url, headers: headers, payload: payload.to_json, params: params)
   end
 
-  def update(account_id, id, options)
+  def update(account_id, id, options, params={})
     url = build_url(account_id, id)
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     payload = options
-    execute(method: :put, url: url, headers: headers, payload: payload.to_json)
+    execute(method: :put, url: url, headers: headers, payload: payload.to_json, params: params)
   end
 
-  def destroy(account_id, id)
+  def destroy(account_id, id, params={})
     url = build_url(account_id, id)
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    execute(method: :delete, url: url, headers: headers)
+    execute(method: :delete, url: url, headers: headers, params: params)
   end
 
   def update_permission(account_id, id, options)

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

@@ -599,6 +599,9 @@ class Morpheus::Cli::Instances
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[instance]")
       opts.on('--name VALUE', String, "Name") do |val|
+        params['name'] = val
+      end
+      opts.on('--displayName VALUE', String, "Name") do |val|
         params['displayName'] = val
       end
       opts.on('--description VALUE', String, "Description") do |val|
@@ -1400,6 +1403,7 @@ class Morpheus::Cli::Instances
       description_cols = {
         "ID" => 'id',
         "Name" => 'name',
+        "Display Name" => 'displayName',
         "Description" => 'description',
         "Group" => lambda {|it| it['group'] ? it['group']['name'] : '' },
         "Cloud" => lambda {|it| it['cloud'] ? it['cloud']['name'] : '' },
@@ -5423,6 +5427,7 @@ private
   def add_instance_schedule_option_types()
     [
       {'code' => 'scheduleType', 'fieldName' => 'scheduleType', 'fieldLabel' => 'Schedule Type', 'type' => 'select', 'selectOptions' => [{'name'=>'Day Of Week', 'value'=>'dayOfWeek'},{'name'=>'Exact', 'value'=>'exact'}], 'description' => "Schedule type  can be recurring day of the week str or exact start and end timestamp", 'required' => true, 'defaultValue' => 'dayOfWeek'},
+      {'dependsOnCode' => 'scheduleType:dayOfWeek', 'fieldName' => 'scheduleTimezone', 'fieldLabel' => 'Timezone', 'type' => 'select', 'optionSource' => 'timezones' , 'description' => "The timezone", 'defaultValue' => "UTC", 'required' => false},
       {'dependsOnCode' => 'scheduleType:dayOfWeek', 'fieldName' => 'startDayOfWeek', 'fieldLabel' => 'Start Day Of Week', 'type' => 'select', 'selectOptions' => day_of_week_dropdown, 'description' => "Start day of the week Sunday-Saturday (1-7)", 'defaultValue' => "Sunday", 'required' => true},
       {'dependsOnCode' => 'scheduleType:dayOfWeek', 'fieldName' => 'startTime', 'fieldLabel' => 'Start Time (HH:MM)', 'type' => 'text', 'description' => "Start time in HH:MM 24-hour format", 'placeHolder' => 'HH:MM', 'defaultValue' => "01:00", 'required' => true},
       {'dependsOnCode' => 'scheduleType:dayOfWeek', 'fieldName' => 'endDayOfWeek', 'fieldLabel' => 'End Day Of Week', 'type' => 'select', 'selectOptions' => day_of_week_dropdown, 'description' => "End day of the week Sunday-Saturday (1-7)", 'defaultValue' => "Sunday", 'required' => true},

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_balancer_pools_secondary, :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}"
@@ -87,4 +90,40 @@ class Morpheus::Cli::LoadBalancerPools
 
   ## using CliCommand's generic find_by methods
 
+  def find_load_balancer_pool_by_name_or_id(load_balancer_pool_id, val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_load_balancer_pool_by_id(load_balancer_pool_id, val)
+    else
+      return find_load_balancer_pool_by_name(load_balancer_pool_id, val)
+    end
+  end
+
+  def find_load_balancer_pool_by_id(load_balancer_pool_id, id)
+    begin
+      json_response = @load_balancer_pools_secondary_interface.get(load_balancer_pool_id, id.to_i)
+      return json_response[load_balancer_pool_object_key]
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Load Balancer Pool not found by id #{id}"
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_load_balancer_pool_by_name(load_balancer_pool_id, name)
+    lbs = @load_balancer_pools_secondary_interface.list(load_balancer_pool_id, {name: name.to_s})[load_balancer_pool_list_key]
+    if lbs.empty?
+      print_red_alert "Load Balancer Pool not found by name #{name}"
+      return nil
+    elsif lbs.size > 1
+      print_red_alert "#{lbs.size} load balancer pools found by name #{name}"
+      #print_lbs_table(lbs, {color: red})
+      print reset,"\n\n"
+      return nil
+    else
+      return lbs[0]
+    end
+  end
+
 end