morpheus-cli 5.3.0.3 → 5.3.2.1

data/lib/morpheus/api/security_group_rules_interface.rb

@@ -1,13 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::SecurityGroupRulesInterface < 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(security_group_id, options=nil)
     url = "#{@base_url}/api/security-groups/#{security_group_id}/rules"

data/lib/morpheus/api/security_groups_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::SecurityGroupsInterface < 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/security-groups"

data/lib/morpheus/api/server_types_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::ServerTypesInterface < 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 id!" if id.to_s == ''

data/lib/morpheus/api/servers_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::ServersInterface < 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(options=nil)
     url = "#{@base_url}/api/servers"
@@ -183,4 +177,11 @@ class Morpheus::ServersInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def software_sync(id, payload={}, params={})
+    url = "#{@base_url}/api/servers/#{id}/software/sync"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :put, url: url, headers: headers}
+    execute(opts)
+  end
+
 end

data/lib/morpheus/api/service_plans_interface.rb

@@ -1,58 +1,55 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::ServicePlansInterface < 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
-    @api_url = "#{@base_url}/api/service-plans"
-    @expires_at = expires_at
+
+  def base_path
+    "/api/service-plans"
   end
 
   def list(params={})
-    url = @api_url
+    url = base_path
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
   def get(id, params={})
-    url = "#{@api_url}/#{id}"
+    url = "#{base_path}/#{id}"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
   def create(payload)
-    url = @api_url
+    url = base_path
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :post, url: url, headers: headers, payload: payload.to_json)
   end
 
   def update(id, payload)
-    url = "#{@api_url}/#{id}"
+    url = "#{base_path}/#{id}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :put, url: url, headers: headers, payload: payload.to_json)
   end
 
   def activate(id, params={})
-    url = "#{@api_url}/#{id}/activate"
+    url = "#{base_path}/#{id}/activate"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :put, url: url, headers: headers)
   end
 
   def deactivate(id, params={})
-    url = "#{@api_url}/#{id}/deactivate"
+    url = "#{base_path}/#{id}/deactivate"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     execute(method: :put, url: url, headers: headers)
   end
 
   def provision_types(params={})
-    url = "#{@api_url}/provision-types"
+    url = "#{base_path}/provision-types"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
   def price_sets(params={})
-    url = "#{@api_url}/price-sets"
+    url = "#{base_path}/price-sets"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end

data/lib/morpheus/api/storage_providers_interface.rb

@@ -1,13 +1,6 @@
 require 'morpheus/api/api_client'
-require 'uri'
 
 class Morpheus::StorageProvidersInterface < 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 id!" if id.to_s == ''
@@ -49,7 +42,7 @@ class Morpheus::StorageProvidersInterface < Morpheus::APIClient
     if file_path.to_s.strip == "/"
       file_path = ""
     end
-    url = "#{@base_url}/api/storage/buckets/#{URI.escape(id.to_s)}" + "/files/#{URI.escape(file_path)}".squeeze('/')
+    url = "#{@base_url}/api/storage/buckets/#{CGI::escape(id.to_s)}" + "/files/#{CGI::escape(file_path)}".squeeze('/')
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts)
@@ -68,13 +61,13 @@ class Morpheus::StorageProvidersInterface < Morpheus::APIClient
     end
     path_chunks = path.split("/")
     filename = path_chunks.pop
-    safe_dirname = path_chunks.collect {|it| URI.escape(it) }.join("/")
+    safe_dirname = path_chunks.collect {|it| CGI::escape(it) }.join("/")
     # filename = File.basename(destination)
     # dirname = File.dirname(destination)
     # if filename == "" || filename == "/"
     #   filename = File.basename(local_file)
     # end
-    url = "#{@base_url}/api/storage/buckets/#{URI.escape(id.to_s)}" + "/files/#{safe_dirname}".squeeze('/')
+    url = "#{@base_url}/api/storage/buckets/#{CGI::escape(id.to_s)}" + "/files/#{safe_dirname}".squeeze('/')
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/octet-stream'}
     headers[:params][:filename] = filename # File.basename(destination)
     if !local_file.kind_of?(File)
@@ -88,8 +81,8 @@ class Morpheus::StorageProvidersInterface < Morpheus::APIClient
   def download_file(id, file_path, params={})
     raise "#{self.class}.download_file() passed a blank id!" if id.to_s == ''
     raise "#{self.class}.download_file() passed a blank file path!" if file_path.to_s == ''
-    escaped_file_path = file_path.split("/").collect {|it| URI.escape(it) }.join("/")
-    url = "#{@base_url}/api/storage/buckets/#{URI.escape(id.to_s)}" + "/download-file/#{escaped_file_path}".squeeze('/')
+    escaped_file_path = file_path.split("/").collect {|it| CGI::escape(it) }.join("/")
+    url = "#{@base_url}/api/storage/buckets/#{CGI::escape(id.to_s)}" + "/download-file/#{escaped_file_path}".squeeze('/')
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts, false)
@@ -98,8 +91,8 @@ class Morpheus::StorageProvidersInterface < Morpheus::APIClient
   def download_file_chunked(id, file_path, outfile, params={})
     raise "#{self.class}.download_file() passed a blank id!" if id.to_s == ''
     raise "#{self.class}.download_file() passed a blank file path!" if file_path.to_s == ''
-    escaped_file_path = file_path.split("/").collect {|it| URI.escape(it) }.join("/")
-    url = "#{@base_url}/api/storage/buckets/#{URI.escape(id.to_s)}" + "/download-file/#{escaped_file_path}".squeeze('/')
+    escaped_file_path = file_path.split("/").collect {|it| CGI::escape(it) }.join("/")
+    url = "#{@base_url}/api/storage/buckets/#{CGI::escape(id.to_s)}" + "/download-file/#{escaped_file_path}".squeeze('/')
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     # execute(opts, false)
@@ -127,8 +120,8 @@ class Morpheus::StorageProvidersInterface < Morpheus::APIClient
   end
 
   def download_zip_chunked(id, outfile, params={})
-    #url = "#{@base_url}/api/storage/buckets/#{URI.escape(id.to_s)}" + ".zip"
-    url = "#{@base_url}/api/storage/buckets/#{URI.escape(id.to_s)}/download-zip"
+    #url = "#{@base_url}/api/storage/buckets/#{CGI::escape(id.to_s)}" + ".zip"
+    url = "#{@base_url}/api/storage/buckets/#{CGI::escape(id.to_s)}/download-zip"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     # execute(opts, false)

data/lib/morpheus/api/subnet_types_interface.rb

@@ -1,14 +1,8 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::SubnetTypesInterface < 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={})
+  def get(id, params={})
     raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
     url = "#{@base_url}/api/subnet-types/#{id}"
     headers = { params: params, authorization: "Bearer #{@access_token}" }

data/lib/morpheus/api/subnets_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::SubnetsInterface < 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 id!" if id.to_s == ''

data/lib/morpheus/api/task_sets_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::TaskSetsInterface < 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/task-sets"

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