morpheus-cli 9.0.0 → 9.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b224b836c51abacb14e3e75c0cc9d88a59b84932c1550f708ffbae41ea08ad3
-  data.tar.gz: ee787f62e945490b8537dc9bbbf3a027dadbb7dde1272a57492c92b1111d5f39
+  metadata.gz: a1c28da8f1406a4119d87de9b4f0defe5e98ad69d347625c8c8018bcf02f196b
+  data.tar.gz: 65164bb33eb05de4d1627de11a43297316e8bb5a82849a6010d91cfdcb2d5236
 SHA512:
-  metadata.gz: cbe5cf5150058a44b1441ff60de0473af2814390bede4750195bae54973918a828ee5b9a747e4470d1cc084eee45c0d62eff5cad647535a6ccef1d8765335005
-  data.tar.gz: 2edbb553a70619a8e8ac47f14aa7f920949add47dd92beaaea0c8cdc1761e7b8aeafcde6e29a2ad0c1b16c31f37728f47d1f941d9af3f189e238233aa3bac59b
+  metadata.gz: a265975de9ea8d79e23679f035536d6d201929c4133cd3cd4a410ae626597b4931019fed1c354e4ff0e67d8a83506719f10b921580522656aab858ddea23c69e
+  data.tar.gz: 142b6cd4634d72f4636e0d251d0cfd905050ba9cceed13e75acd6091f4ca4f263e03043d30f10b40158ab15962e0a22307e2acdcfae75cfe18a059e8279b0049

data/Dockerfile

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

data/lib/morpheus/api/api_client.rb

@@ -1038,6 +1038,10 @@ class Morpheus::APIClient
     Morpheus::TokensInterface.new(common_interface_options).setopts(@options)
   end
 
+  def virtual_switches
+    Morpheus::VirtualSwitchesInterface.new(common_interface_options).setopts(@options)
+  end
+
   def rest(endpoint)
     Morpheus::RestInterface.new(common_interface_options).setopts(@options.merge({base_path: "#{@base_url}/api/#{endpoint}"}))
   end

data/lib/morpheus/api/clusters_interface.rb

@@ -389,5 +389,77 @@ class Morpheus::ClustersInterface < Morpheus::APIClient
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :delete, url: url, headers: headers)
   end
+
+  def affinity_group_form_options(id, params={})
+    url = "#{base_path}/#{id}/affinity-groups/form-options"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
+
+  def affinity_group_violations(params={})
+    url = "#{@base_url}/api/affinity-groups/violations"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
+
+  def list_host_vm_groups(id, params={})
+    url = "#{base_path}/#{id}/host-vm-groups"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
+
+  def get_host_vm_group(id, host_vm_group_id, params={})
+    url = "#{base_path}/#{id}/host-vm-groups/#{host_vm_group_id}"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
+
+  def create_host_vm_group(id, payload)
+    url = "#{base_path}/#{id}/host-vm-groups"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    execute(method: :post, url: url, headers: headers, payload: payload.to_json)
+  end
+
+  def update_host_vm_group(id, host_vm_group_id, payload)
+    url = "#{base_path}/#{id}/host-vm-groups/#{host_vm_group_id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    execute(method: :put, url: url, headers: headers, payload: payload.to_json)
+  end
+
+  def destroy_host_vm_group(id, host_vm_group_id, params={})
+    url = "#{base_path}/#{id}/host-vm-groups/#{host_vm_group_id}"
+    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    execute(method: :delete, url: url, headers: headers)
+  end
+
+  def host_vm_group_form_options(id, params={})
+    url = "#{base_path}/#{id}/host-vm-groups/form-options"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
+
+  def available_updates(id, params={})
+    url = "#{base_path}/#{id}/available-updates"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
+
+  def list_updates(id, update_id, params={})
+    url = "#{base_path}/#{id}/available-updates"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
+  
+  def get_update(id, update_id, params={})
+    url = "#{base_path}/#{id}/available-updates/#{update_id}"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
+
+  def execute_update(id, payload)
+    url = "#{base_path}/#{id}/execute-update"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    execute(method: :post, url: url, headers: headers, payload: payload.to_json)
+  end
   
 end

data/lib/morpheus/api/instances_interface.rb

@@ -296,7 +296,7 @@ class Morpheus::InstancesInterface < Morpheus::APIClient
   def service_plans(params={})
     url = "#{@base_url}/api/instances/service-plans"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
-    opts = {method: :get, url: url, headers: headers}
+    opts = {method: :get, url: url, headers: headers, timeout: 180}
     execute(opts)
   end
 

data/lib/morpheus/api/options_interface.rb

@@ -12,6 +12,6 @@ class Morpheus::OptionsInterface < Morpheus::APIClient
       url = "#{@base_url}/api/options/#{option_source_type}/#{source}"
     end
     headers = { params: params, authorization: "Bearer #{@access_token}" }
-    execute(method: :get, url: url, headers: headers)
+    execute(method: :get, url: url, headers: headers, timeout: 180)
   end
 end

data/lib/morpheus/api/servers_interface.rb

@@ -219,4 +219,12 @@ class Morpheus::ServersInterface < Morpheus::APIClient
     execute(opts)
   end
 
+
+  def create_linked_clone(id, snapshot_id, payload={})
+    url = "#{@base_url}/api/servers/#{id}/linked-clone/#{snapshot_id}"
+    headers = {:authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
 end

data/lib/morpheus/api/storage_volumes_interface.rb

@@ -13,4 +13,12 @@ class Morpheus::StorageVolumesInterface < Morpheus::RestInterface
     execute(opts)
   end
 
+  # Transfer ownership of a storage volume to another tenant.
+  # The server expects { "storageVolume": { "tenant": { "id": <id> } } }
+  # and handles all authorization and business-rule validation.
+  def update_tenant(id, payload, params={}, headers={})
+    validate_id!(id)
+    execute(method: :put, url: "#{base_path}/#{CGI::escape(id.to_s)}", params: params, payload: payload, headers: headers)
+  end
+
 end

data/lib/morpheus/api/virtual_images_interface.rb

@@ -117,7 +117,11 @@ class Morpheus::VirtualImagesInterface < Morpheus::APIClient
          gz.close
       }
       http_opts[:body] = Morpheus::BodyIO.new(rd)
-      response = http.post(url, http_opts)
+      if Gem::Version.new(HTTP::VERSION) >= Gem::Version.new("6.0.0")
+        response = http.post(url, **http_opts)
+      else
+        response = http.post(url, http_opts)
+      end
     else
       if @dry_run
         return {method: :post, url: url, headers: headers, params: query_params, payload: payload}
@@ -126,7 +130,11 @@ class Morpheus::VirtualImagesInterface < Morpheus::APIClient
       http = HTTP.headers(headers)
       http_opts[:params] = query_params
       http_opts[:body] = payload
-      response = http.post(url, http_opts)
+      if Gem::Version.new(HTTP::VERSION) >= Gem::Version.new("6.0.0")
+        response = http.post(url, **http_opts)
+      else
+        response = http.post(url, http_opts)
+      end
     end
     # puts "Took #{Time.now.to_i - start_time.to_i}"
     # return response

data/lib/morpheus/api/virtual_switches_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/rest_interface'
+
+class Morpheus::VirtualSwitchesInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/virtual-switches"
+  end
+
+end

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

@@ -96,6 +96,8 @@ EOT
       print_h1 "Backup Details", [], options
       print cyan
       columns = backup_column_definitions
+      columns.delete("Backup Provider") if backup['backupProvider'].nil?
+      columns.delete("Storage Provider") if backup['storageProvider'].nil?
       columns.delete("Instance") if backup['instance'].nil?
       columns.delete("Container ID") if backup['containerId'].nil?
       columns.delete("Host") if backup['server'].nil?
@@ -185,6 +187,17 @@ EOT
           params['backupType'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'backupType', 'fieldLabel' => 'Backup Type', 'type' => 'select', 'selectOptions' => avail_backup_types, 'defaultValue' => avail_backup_types[0] ? avail_backup_types[0]['name'] : nil, 'required' => true}], options[:options], @api_client)['backupType']  
         end
 
+        # Plugin optionTypes
+        plugin_option_type_inputs = @options_interface.options_for_source('backupOptionTypes', {'backupTypeCode' => params['backupType']} )['data']['optionTypes']
+        plugin_opt_parser = Morpheus::Cli::OptionParser.new do |opts|
+          build_option_type_options(opts, options, plugin_option_type_inputs)
+        end
+
+        plugin_opt_parser.parse!(args)
+        v_prompt = Morpheus::Cli::OptionTypes.prompt(plugin_option_type_inputs, options[:options].deep_merge({:context_map => {'domain' => 'backup'}}), @api_client)
+        v_prompt.deep_compact!.booleanize! # remove empty values and convert checkbox "on" and "off" to true and false
+        params.merge!(v_prompt.delete('backup'))
+
         # Job / Schedule
         params['jobAction'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'jobAction', 'fieldLabel' => 'Backup Job Type', 'type' => 'select', 'optionSource' => 'backupJobActions', 'required' => true, 'defaultValue' => 'new'}], options[:options], @api_client)['jobAction']
         if params['jobAction'] == 'new'
@@ -541,8 +554,9 @@ EOT
     {
       "ID" => 'id',
       "Name" => 'name',
-      "Backup Type" => lambda {|it| format_backup_type_tag(it) },
-      "Backup Location" => lambda {|it| format_backup_location_tag(it) },
+      "Backup Type" => lambda {|it| (it['backupType'] && it['backupType']['name']) ? it['backupType']['name'] : format_backup_type_tag(it) },
+      "Backup Provider" => lambda {|it| it['backupProvider']['name'] rescue '' },
+      "Storage Provider" => lambda {|it| it['storageProvider']['name'] rescue '' },
       "Location Type" => lambda {|it| 
         if it['locationType'] == "instance"
           "Instance"
@@ -610,11 +624,11 @@ EOT
   def format_backup_location_tag(backup)
     # check storage provider or backup provider indicating remote storage
     if backup['storageProvider'] && backup['storageProvider']['id']
-      provider_type = backup['storageProvider']['type'] || backup['storageProvider']['providerType'] || ''
-      "#{green}REMOTE#{reset} (#{provider_type})"
+      provider_label = backup['storageProvider']['type'] || backup['storageProvider']['providerType'] || backup['storageProvider']['name'] || ''
+      "#{green}REMOTE#{reset} (#{provider_label})"
     elsif backup['backupProvider'] && backup['backupProvider']['id']
-      provider_type = backup['backupProvider']['type'] || backup['backupProvider']['providerType'] || ''
-      "#{green}REMOTE#{reset} (#{provider_type})"
+      provider_label = backup['backupProvider']['type'] || backup['backupProvider']['providerType'] || backup['backupProvider']['name'] || ''
+      "#{green}REMOTE#{reset} (#{provider_label})"
     else
       "#{blue}LOCAL#{reset}"
     end