morpheus-cli 5.3.0.1 → 5.3.2

data/lib/morpheus/api/tasks_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::TasksInterface < Morpheus::APIClient
-  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil) 
-    @access_token = access_token
-    @refresh_token = refresh_token
-    @base_url = base_url
-    @expires_at = expires_at
-  end
 
   def list(params={})
     url = "#{@base_url}/api/tasks"

data/lib/morpheus/api/user_groups_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::UserGroupsInterface < Morpheus::APIClient
-    def initialize(access_token, refresh_token, expires_at = nil, base_url=nil) 
-    @access_token = access_token
-    @refresh_token = refresh_token
-    @base_url = base_url
-    @expires_at = expires_at
-  end
 
   def get(account_id, id)
     raise "#{self.class}.get() passed a blank id!" if id.to_s == ''

data/lib/morpheus/api/user_settings_interface.rb

@@ -2,31 +2,29 @@ require 'morpheus/api/api_client'
 
 class Morpheus::UserSettingsInterface < Morpheus::APIClient
 
-  def get(params={})
-    url = "#{@base_url}/api/user-settings"
-    headers = { :params => params, authorization: "Bearer #{@access_token}"}
-    opts = {method: :get, url: url, headers: headers}
-    execute(opts)
+  def base_path
+    "/api/user-settings"
   end
 
-  def update(params, payload)
-    url = "#{@base_url}/api/user-settings"
-    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json'}
-    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
-    execute(opts)
+  def get(params={}, headers={})
+    execute(method: :get, url: "#{base_path}", params: params, headers: headers)
   end
 
-  # NOT json, download file as attachment
+  def update(payload, params={}, headers={})
+    execute(method: :put, url: "#{base_path}", params: params, payload: payload, headers: headers)
+  end
+
+  # download file as attachment
   def download_avatar(params, outfile)
-    url = "#{@base_url}/api/user-settings/avatar"
+    url = "#{base_path}/avatar"
     headers = { :params => params, :authorization => "Bearer #{@access_token}"}
     opts = {method: :get, url: url, headers: headers, payload: payload}
     execute(opts)
   end
 
-  # NOT json, multipart file upload
+  # multipart file upload
   def update_avatar(avatar_file, params={})
-    url = "#{@base_url}/api/user-settings/avatar"
+    url = "#{base_path}/avatar"
     headers = { :params => params, :authorization => "Bearer #{@access_token}"}
     payload = {}
     #payload['user'] ||= {}
@@ -38,7 +36,29 @@ class Morpheus::UserSettingsInterface < Morpheus::APIClient
   end
 
   def remove_avatar(params={})
-    url = "#{@base_url}/api/user-settings/avatar"
+    url = "#{base_path}/avatar"
+    headers = { :params => params, :authorization => "Bearer #{@access_token}"}
+    # POST empty payload will do
+    payload = {}
+    opts = {method: :delete, url: url, headers: headers, payload: payload}
+    execute(opts)
+  end
+
+  # multipart file upload
+  def update_desktop_background(desktop_background_file, params={})
+    url = "#{base_path}/desktop-background"
+    headers = { :params => params, :authorization => "Bearer #{@access_token}"}
+    payload = {}
+    #payload['user'] ||= {}
+    #payload['user']['desktopBackground'] = desktop_background_file
+    payload['user.desktopBackground'] = desktop_background_file
+    payload[:multipart] = true
+    opts = {method: :post, url: url, headers: headers, payload: payload}
+    execute(opts)
+  end
+
+  def remove_desktop_background(params={})
+    url = "#{base_path}/desktop-background"
     headers = { :params => params, :authorization => "Bearer #{@access_token}"}
     # POST empty payload will do
     payload = {}
@@ -47,21 +67,21 @@ class Morpheus::UserSettingsInterface < Morpheus::APIClient
   end
 
   def regenerate_access_token(params, payload={})
-    url = "#{@base_url}/api/user-settings/regenerate-access-token"
+    url = "#{base_path}/regenerate-access-token"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json'}
     opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
   def clear_access_token(params, payload={})
-    url = "#{@base_url}/api/user-settings/clear-access-token"
+    url = "#{base_path}/clear-access-token"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json'}
     opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
   def available_clients(params={})
-    url = "#{@base_url}/api/user-settings/api-clients"
+    url = "#{base_path}/api-clients"
     headers = { :params => params, authorization: "Bearer #{@access_token}"}
     opts = {method: :get, url: url, headers: headers}
     execute(opts)

data/lib/morpheus/api/user_sources_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::UserSourcesInterface < Morpheus::APIClient
-    def initialize(access_token, refresh_token, expires_at = nil, base_url=nil) 
-    @access_token = access_token
-    @refresh_token = refresh_token
-    @base_url = base_url
-    @expires_at = expires_at
-  end
 
   def get(account_id, id)
     raise "#{self.class}.get() passed a blank id!" if id.to_s == ''

data/lib/morpheus/api/users_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::UsersInterface < Morpheus::APIClient
-    def initialize(access_token, refresh_token, expires_at = nil, base_url=nil) 
-    @access_token = access_token
-    @refresh_token = refresh_token
-    @base_url = base_url
-    @expires_at = expires_at
-  end
 
   def get(account_id, id, params={})
     raise "#{self.class}.get() passed a blank id!" if id.to_s == ''

data/lib/morpheus/api/vdi_allocations_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/read_interface'
+
+class Morpheus::VdiAllocationsInterface < Morpheus::ReadInterface
+
+  def base_path
+    "/api/vdi-allocations"
+  end
+
+end

data/lib/morpheus/api/vdi_apps_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/rest_interface'
+
+class Morpheus::VdiAppsInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/vdi-apps"
+  end
+
+end

data/lib/morpheus/api/vdi_gateways_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/rest_interface'
+
+class Morpheus::VdiGatewaysInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/vdi-gateways"
+  end
+
+end

data/lib/morpheus/api/vdi_interface.rb

@@ -0,0 +1,28 @@
+require 'morpheus/api/api_client'
+
+# Interface for VDI Persona that provides viewing and allocating virtual desktops (VDI pools)
+class Morpheus::VdiInterface < Morpheus::APIClient
+
+  def base_path
+    "/api/vdi"
+  end
+
+  # def dashboard(params={})
+  #   execute(method: :get, url: "#{base_path}/dashboard", params: params)
+  # end
+
+  def list(params={})
+    execute(method: :get, url: "#{base_path}", params: params)
+  end
+
+  def get(id, params={})
+    validate_id!(id)
+    execute(method: :get, url: "#{base_path}/#{id}", params: params)
+  end
+
+  def allocate(id, payload, params={})
+    validate_id!(id)
+    execute(method: :post, url: "#{base_path}/#{id}/allocate", params: params, payload: payload.to_json)
+  end
+
+end

data/lib/morpheus/api/vdi_pools_interface.rb

@@ -0,0 +1,19 @@
+require 'morpheus/api/rest_interface'
+
+class Morpheus::VdiPoolsInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/vdi-pools"
+  end
+
+  # NOT json, multipart file upload
+  def update_logo(id, logo_file)
+    url = "#{base_path}/#{id}/update-logo"
+    headers = { :params => {}, :authorization => "Bearer #{@access_token}"}
+    payload = {}
+    payload[:logo] = logo_file
+    payload[:multipart] = true
+    execute(method: :post, url: url, headers: headers, payload: payload)
+  end
+
+end

data/lib/morpheus/api/virtual_images_interface.rb

@@ -4,12 +4,6 @@ require 'zlib'
 require 'forwardable'
 
 class Morpheus::VirtualImagesInterface < Morpheus::APIClient
-  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil) 
-    @access_token = access_token
-    @refresh_token = refresh_token
-    @base_url = base_url
-    @expires_at = expires_at
-  end
 
   def virtual_image_types(options={})
     url = "#{@base_url}/api/virtual-image-types"

data/lib/morpheus/api/whitelabel_settings_interface.rb

@@ -1,41 +1,38 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::WhitelabelSettingsInterface < Morpheus::APIClient
-  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil, api='whitelabel-settings')
-    @access_token = access_token
-    @refresh_token = refresh_token
-    @base_url = base_url
-    @api_url = "#{base_url}/api/#{api}"
-    @expires_at = expires_at
+
+  def base_path
+    "/api/whitelabel-settings"
   end
 
   def get(params={})
-    url = @api_url
+    url = base_path
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
   def update(payload, params={})
-    url = @api_url
+    url = base_path
     headers = { params: params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :put, url: url, headers: headers, payload: payload.to_json)
   end
 
   def update_images(payload, params={})
-    url = "#{@api_url}/images"
+    url = "#{base_path}/images"
     headers = { params: params, :authorization => "Bearer #{@access_token}" }
     payload[:multipart] = true
     execute(method: :post, url: url, headers: headers, payload: payload)
   end
 
   def reset_image(image_type, params={})
-    url = "#{@api_url}/images/#{image_type}"
+    url = "#{base_path}/images/#{image_type}"
     headers = { params: params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :delete, url: url, headers: headers)
   end
 
   def download_image(image_type, outfile, params={})
-    url = "#{@api_url}/images/#{image_type}"
+    url = "#{base_path}/images/#{image_type}"
     headers = { params: params, :authorization => "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers, timeout: 172800}
 

data/lib/morpheus/api/wiki_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::WikiInterface < Morpheus::APIClient
-  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil) 
-    @access_token = access_token
-    @refresh_token = refresh_token
-    @base_url = base_url
-    @expires_at = expires_at
-  end
 
   def get(id, params={})
     raise "#{self.class}.get() passed a blank name!" if id.to_s == ''

data/lib/morpheus/cli.rb

@@ -46,6 +46,7 @@ module Morpheus
       # load interfaces
       require 'morpheus/api/api_client.rb'
       require 'morpheus/api/rest_interface.rb'
+      require 'morpheus/api/read_interface.rb'
       Dir[File.dirname(__FILE__)  + "/api/**/*.rb"].each {|file| load file }
 
       # load mixins
@@ -175,9 +176,15 @@ module Morpheus
       load 'morpheus/cli/projects_command.rb'
       load 'morpheus/cli/backups_command.rb'
       load 'morpheus/cli/backup_jobs_command.rb'
-      load 'morpheus/cli/catalog_item_types_command.rb' # catalog-types
-      load 'morpheus/cli/service_catalog_command.rb' # catalog
+      load 'morpheus/cli/catalog_item_types_command.rb' # self-service
+      load 'morpheus/cli/service_catalog_command.rb' # catalog (Service Catalog persona)
       load 'morpheus/cli/usage_command.rb'
+      load 'morpheus/cli/vdi_pools_command.rb'
+      load 'morpheus/cli/vdi_allocations_command.rb'
+      load 'morpheus/cli/vdi_apps_command.rb'
+      load 'morpheus/cli/vdi_gateways_command.rb'
+      load 'morpheus/cli/vdi_command.rb' # (VDI persona)
+      load 'morpheus/cli/certificates_command.rb' # (VDI persona)
       # add new commands here...
 
     end

data/lib/morpheus/cli/access_token_command.rb

@@ -156,7 +156,7 @@ class Morpheus::Cli::AccessTokenCommand
       end
     end
     if options[:dry_run]
-      print_dry_run Morpheus::AuthInterface.new({url:@appliance_url}).setopts(options).use_refresh_token(refresh_token_value)
+      print_dry_run @api_client.auth.dry.use_refresh_token(refresh_token_value)
       return 0
     end
     unless options[:quiet]

data/lib/morpheus/cli/account_groups_command.rb

@@ -28,11 +28,11 @@ class Morpheus::Cli::AccountGroupsCommand
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @account_groups_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).account_groups
-    @accounts_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).accounts
+    @account_groups_interface = @api_client.account_groups
+    @accounts_interface = @api_client.accounts
 
-    @groups_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).groups
-    @clouds_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).clouds
+    @groups_interface = @api_client.groups
+    @clouds_interface = @api_client.clouds
   end
 
   def handle(args)

data/lib/morpheus/cli/apps.rb

@@ -37,15 +37,15 @@ class Morpheus::Cli::Apps
     @api_client = establish_remote_appliance_connection(opts)
     @accounts_interface = @api_client.accounts
     @users_interface = @api_client.users
-    @apps_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).apps
-    @blueprints_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).blueprints
-    @instance_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).instance_types
-    @library_layouts_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).library_layouts
-    @instances_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).instances
-    @options_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).options
-    @groups_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).groups
-    @clouds_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).clouds
-    @logs_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).logs
+    @apps_interface = @api_client.apps
+    @blueprints_interface = @api_client.blueprints
+    @instance_types_interface = @api_client.instance_types
+    @library_layouts_interface = @api_client.library_layouts
+    @instances_interface = @api_client.instances
+    @options_interface = @api_client.options
+    @groups_interface = @api_client.groups
+    @clouds_interface = @api_client.clouds
+    @logs_interface = @api_client.logs
     @processes_interface = @api_client.processes
     @active_group_id = Morpheus::Cli::Groups.active_groups[@appliance_name]
   end
@@ -88,7 +88,7 @@ class Morpheus::Cli::Apps
       opts.on('-a', '--details', "Display all details: memory and storage usage used / max values." ) do
         options[:details] = true
       end
-      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      build_standard_list_options(opts, options)
       opts.footer = "List apps."
     end
     optparse.parse!(args)
@@ -97,64 +97,53 @@ class Morpheus::Cli::Apps
       options[:phrase] = args.join(" ")
     end
     connect(options)
-    begin
-      if options[:type]
-        params['type'] = [options[:type]].flatten.collect {|it| it.to_s.strip.split(",") }.flatten.collect {|it| it.to_s.strip }
-      end
-      if options[:blueprint]
-        blueprint_ids = [options[:blueprint]].flatten.collect {|it| it.to_s.strip.split(",") }.flatten.collect {|it| it.to_s.strip }
-        params['blueprintId'] = blueprint_ids.collect do |blueprint_id|
-          if blueprint_id.to_s =~ /\A\d{1,}\Z/
-            return blueprint_id
-          else
-            blueprint = find_blueprint_by_name_or_id(blueprint_id)
-            return 1 if blueprint.nil?
-            blueprint['id']
-          end
+    
+    if options[:type]
+      params['type'] = [options[:type]].flatten.collect {|it| it.to_s.strip.split(",") }.flatten.collect {|it| it.to_s.strip }
+    end
+    if options[:blueprint]
+      blueprint_ids = [options[:blueprint]].flatten.collect {|it| it.to_s.strip.split(",") }.flatten.collect {|it| it.to_s.strip }
+      params['blueprintId'] = blueprint_ids.collect do |blueprint_id|
+        if blueprint_id.to_s =~ /\A\d{1,}\Z/
+          return blueprint_id
+        else
+          blueprint = find_blueprint_by_name_or_id(blueprint_id)
+          return 1 if blueprint.nil?
+          blueprint['id']
         end
       end
-      if options[:owner]
-        owner_ids = [options[:owner]].flatten.collect {|it| it.to_s.strip.split(",") }.flatten.collect {|it| it.to_s.strip }
-        params['ownerId'] = owner_ids.collect do |owner_id|
-          if owner_id.to_s =~ /\A\d{1,}\Z/
-            return owner_id
-          else
-            user = find_available_user_option(owner_id)
-            return 1 if user.nil?
-            user['id']
-          end
+    end
+    if options[:owner]
+      owner_ids = [options[:owner]].flatten.collect {|it| it.to_s.strip.split(",") }.flatten.collect {|it| it.to_s.strip }
+      params['ownerId'] = owner_ids.collect do |owner_id|
+        if owner_id.to_s =~ /\A\d{1,}\Z/
+          return owner_id
+        else
+          user = find_available_user_option(owner_id)
+          return 1 if user.nil?
+          user['id']
         end
       end
-      params.merge!(parse_list_options(options))
-      account = nil
-      if options[:owner]
-        created_by_ids = find_all_user_ids(account ? account['id'] : nil, options[:owner])
-        return if created_by_ids.nil?
-        params['createdBy'] = created_by_ids
-        # params['ownerId'] = created_by_ids # 4.2.1+
-      end
-
-      params['showDeleted'] = options[:showDeleted] if options.key?(:showDeleted)
-      params['deleted'] = options[:deleted] if options.key?(:deleted)
+    end
+    params.merge!(parse_list_options(options))
+    account = nil
+    if options[:owner]
+      created_by_ids = find_all_user_ids(account ? account['id'] : nil, options[:owner])
+      return if created_by_ids.nil?
+      params['createdBy'] = created_by_ids
+      # params['ownerId'] = created_by_ids # 4.2.1+
+    end
 
-      @apps_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @apps_interface.dry.list(params)
-        return
-      end
+    params['showDeleted'] = options[:showDeleted] if options.key?(:showDeleted)
+    params['deleted'] = options[:deleted] if options.key?(:deleted)
 
-      json_response = @apps_interface.list(params)
-      if options[:json]
-        puts as_json(json_response, options, "apps")
-        return 0
-      elsif options[:yaml]
-        puts as_yaml(json_response, options, "apps")
-        return 0
-      elsif options[:csv]
-        puts records_as_csv(json_response['apps'], options)
-        return 0
-      end
-      
+    @apps_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @apps_interface.dry.list(params)
+      return
+    end
+    json_response = @apps_interface.list(params)
+    render_response(json_response, options, "apps") do
       apps = json_response['apps']
       title = "Morpheus Apps"
       subtitles = []
@@ -167,10 +156,8 @@ class Morpheus::Cli::Apps
         print_results_pagination(json_response)
       end
      print reset,"\n"
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
     end
+    return 0, nil
   end
 
   def count(args)
@@ -645,7 +632,7 @@ class Morpheus::Cli::Apps
       opts.on('--refresh-until STATUS', String, "Refresh until a specified status is reached.") do |val|
         options[:refresh_until_status] = val.to_s.downcase
       end
-      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :outfile, :dry_run, :remote])
+      build_standard_get_options(opts, options)
       opts.footer = "Get details about an app.\n" +
                     "[app] is required. This is the name or id of an app. Supports 1-N [app] arguments."
     end
@@ -665,19 +652,19 @@ class Morpheus::Cli::Apps
     
   end
 
-  def _get(arg, options={})
-    begin
-      app = find_app_by_name_or_id(arg)
-      @apps_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @apps_interface.dry.get(app['id'])
-        return
-      end
-      json_response = @apps_interface.get(app['id'])
-
-      render_result = render_with_format(json_response, options, 'blueprint')
-      return 0 if render_result
-
+  def _get(id, options={})
+    app = nil
+    if id.to_s !~ /\A\d{1,}\Z/
+      app = find_app_by_name_or_id(id)
+      id = app['id']
+    end
+    @apps_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @apps_interface.dry.get(id)
+      return
+    end
+    json_response = @apps_interface.get(id.to_i)
+    render_response(json_response, options, 'app') do
       app = json_response['app']
       app_tiers = app['appTiers']
       print_h1 "App Details", [], options
@@ -799,14 +786,11 @@ class Morpheus::Cli::Apps
           print cyan, "Refreshing in #{options[:refresh_interval] > 1 ? options[:refresh_interval].to_i : options[:refresh_interval]} seconds"
           sleep_with_dots(options[:refresh_interval])
           print "\n"
-          _get(arg, options)
+          _get(app['id'], options)
         end
       end
-
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
     end
+    return 0, nil
   end
 
   def update(args)