morpheus-cli 5.5.2.1 → 5.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: daf8c90febcbbae18fffbd020d9e9c0ba18fc99f12d9d51cf5a631e72a469b01
-  data.tar.gz: 322f650e4cd9500706e9b55953e9ca2050c52b3442f45c634a3bde71408f3410
+  metadata.gz: 52fcaca1c4feaa6a3b07b3ed8772a6765cac55ccbac1b8d79eba9525a859829a
+  data.tar.gz: 868ccdde25b11e328c5c275ed61374922f5a287a5d662e5d3901c0218c863808
 SHA512:
-  metadata.gz: 8b814666d55c2e34c14ae59f8adb6f1eb11ef762250c4d666594cc6cc90c0b781499f1345c13cf18b31faf637ca27c41943f2aa1592b9c977bd82ffc52ba9e96
-  data.tar.gz: b63386cecaf56429f275affe452f803b7d8c285e30c3556023f2afbccb5fcd24e17f373506ab2a02069beb37cf1b4dfab533865e99ce62928fd66f99d8aa0793
+  metadata.gz: 1bff4307ff46a0940add6895b3fa16ac23da050e60ddc9d200d3c1d196eb29d1a3aa82025f203abb12b9f1950dd9fe7e7bf082bc13c797c91494bcf5092990ed
+  data.tar.gz: 874cfa21f6d6af7360c13dc504a453f3f7fb1539120c0b91af13a640727b6a19418b7c80912eb18b22dff4b4c94f8dea6f4372ba382ec7153c8936481de1131c

data/.gitignore

@@ -21,4 +21,5 @@ tmp
 *.a
 mkmf.log
 .DS_Store
-.idea
+.idea
+test_config.yaml

data/Dockerfile

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

data/README.md

@@ -13,15 +13,21 @@ This library is a Ruby gem that provides a command line interface for interactin
 
 Install it using rubygems
 
-    $ gem install morpheus-cli
+```shell
+gem install morpheus-cli
+```
 
 Or add this line to your application's Gemfile:
 
-    gem 'morpheus-cli'
+```ruby
+gem 'morpheus-cli'
+```
 
 And then execute:
 
-    $ bundle install
+```shell
+bundle install
+```
 
 ## Usage
 
@@ -29,7 +35,7 @@ And then execute:
 
 This gem installs the [morpheus](https://github.com/gomorpheus/morpheus-cli/wiki/CLI-Manual) binary for running commands in your terminal shell. 
 
-```sh
+```shell
 morpheus remote add
 morpheus instances list
 ```
@@ -39,3 +45,50 @@ morpheus instances list
 If you are interested in interfacing with the Morpheus appliance in ruby directly, you can use [Morpheus::APIClient](https://github.com/gomorpheus/morpheus-cli/wiki/APIClient) or [Morpheus::Terminal](https://github.com/gomorpheus/morpheus-cli/wiki/Terminal).
 
 For more detailed usage information, visit the [Morpheus CLI Wiki](https://github.com/gomorpheus/morpheus-cli/wiki).
+
+
+## Development
+
+New API interfaces get added under the library directory: `lib/morpheus/api/`.
+New CLI commands get added under the library directory: `lib/morpheus/cli/commands/`.
+
+While developing, you can quickly reload your code changes in a morpheus shell while developing:
+
+```shell
+morpheus shell
+```
+
+Then to reload changes without restarting the morpheus shell (and the ruby process), use:
+
+```shell
+reload
+```
+
+Don't forget to add unit tests for your new commands under the directory: `test/`.
+
+## Testing
+
+To run the CLI unit tests, first create a `test_config.yaml` and then run `rake test`.
+
+### Prepare Test Environment
+
+Create a `test_config.yaml` like this:
+
+```shell
+touch test_config.yaml
+```
+
+Enter your test environment url and credentials in `test_config.yaml` like so:
+
+```yaml
+url: 'http://localhost:8080'
+username: testrunner
+password: 'SecretPassword123$' 
+```
+
+### Run Tests
+
+```shell
+rake test
+```
+

data/Rakefile

@@ -1,2 +1,11 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList['test/**/*_test.rb']
+end
+
+#task :default => :test
 

data/bin/morpheus

@@ -1,20 +1,20 @@
 #!/usr/bin/env ruby
-require 'morpheus/terminal'
+require 'morpheus'
 
 # arguments
 args = ARGV
 
 # input pipe
 # append piped data as arguments
-if !STDIN.tty?
-  pipe_data = STDIN.read
+if !$stdin.tty?
+  pipe_data = $stdin.read
   if pipe_data
     args += pipe_data.split
   end
 end
 
 # output pipe
-# if !STDOUT.tty?
+# if !$stdout.tty?
 
 # end
 

data/lib/morpheus/api/api_client.rb

@@ -9,7 +9,6 @@ class Morpheus::APIClient
 
   CLIENT_ID = 'morph-cli' unless defined?(CLIENT_ID)
 
-  attr_accessor :client_id
   # Initialize a new APIClient
   #   client = APIClient.new(url:"https://morpheus.yourcompany.com", verify_ssl:false)
   # This old method signature is being deprecated:
@@ -40,9 +39,11 @@ class Morpheus::APIClient
     end
     @base_url = @base_url.chomp("/")
     # todo: validate URI
+    @expires_at = nil
     if expires_in != nil
       @expires_at = Time.now + expires_in
     end
+    @dry_run = false
     set_ssl_verification_enabled(verify_ssl)
     setopts(options)
   end
@@ -956,7 +957,12 @@ class Morpheus::APIClient
   protected
 
   def validate_id!(id, param_name='id')
-    raise "#{self.class} passed a blank #{param_name}!" if id.to_s.strip.empty?
+    if !(id.is_a?(String) || id.is_a?(Integer))
+      raise "#{self.class} passed an invalid #{param_name}! Expected String or Integer and got (#{id.class}) #{id.inspect}"
+    elsif id.to_s.strip.empty?
+      raise "#{self.class} passed a blank #{param_name}!"
+    end
+    return true
   end
 
 end

data/lib/morpheus/api/archive_buckets_interface.rb

@@ -83,7 +83,7 @@ class Morpheus::ArchiveBucketsInterface < Morpheus::APIClient
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers, timeout: 172800}
     # execute(opts, {parse_json:false})
-    if Dir.exists?(outfile)
+    if Dir.exist?(outfile)
       raise "outfile is invalid. It is the name of an existing directory: #{outfile}"
     end
     # if @verify_ssl == false

data/lib/morpheus/api/archive_files_interface.rb

@@ -24,7 +24,7 @@ class Morpheus::ArchiveFilesInterface < Morpheus::APIClient
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers, timeout: 172800}
     # execute(opts, {parse_json: false})
-    if Dir.exists?(outfile)
+    if Dir.exist?(outfile)
       raise "outfile is invalid. It is the name of an existing directory: #{outfile}"
     end
     # if @verify_ssl == false
@@ -53,7 +53,7 @@ class Morpheus::ArchiveFilesInterface < Morpheus::APIClient
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers, timeout: 172800}
     # execute(opts, {parse_json: false})
-    if Dir.exists?(outfile)
+    if Dir.exist?(outfile)
       raise "outfile is invalid. It is the name of an existing directory: #{outfile}"
     end
     # if @verify_ssl == false
@@ -83,7 +83,7 @@ class Morpheus::ArchiveFilesInterface < Morpheus::APIClient
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers, timeout: 172800}
     # execute(opts, {parse_json: false})
-    if Dir.exists?(outfile)
+    if Dir.exist?(outfile)
       raise "outfile is invalid. It is the name of an existing directory: #{outfile}"
     end
     # if @verify_ssl == false

data/lib/morpheus/api/clients_interface.rb

@@ -10,14 +10,14 @@ class Morpheus::ClientsInterface < Morpheus::APIClient
   end
 
   def get(id, params={})
-     raise "#{self.class}.get() passed a blank name!" if id.to_s == ''
+    raise "#{self.class}.get() passed a blank name!" if id.to_s == ''
     url = "#{@base_url}/api/clients/#{id}"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts)
   end
 
-   def create(payload)
+  def create(payload)
     url = "#{@base_url}/api/clients"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :post, url: url, headers: headers, payload: payload.to_json}

data/lib/morpheus/api/clusters_interface.rb

@@ -113,7 +113,7 @@ class Morpheus::ClustersInterface < Morpheus::APIClient
     url = "#{base_path}/#{id}/upgrade-cluster"
     headers = { params: params, authorization: "Bearer #{@access_token}", 'Content-Type' => 'application/json'  }
     execute(method: :post, url: url, headers: headers)
-    end
+  end
 
   def list_services(id, params={})
     url = "#{base_path}/#{id}/services"
@@ -306,4 +306,11 @@ class Morpheus::ClustersInterface < Morpheus::APIClient
     execute(opts)
   end
 
+
+  def apply_template(id, payload={})
+    url = "#{@base_url}/api/clusters/#{id}/apply-template"
+    
+    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/containers_interface.rb

@@ -4,18 +4,21 @@ require 'morpheus/api/api_client'
 # All of the PUT methods support passing an array of IDs.
 class Morpheus::ContainersInterface < Morpheus::APIClient
 
+  def base_path
+    "/api/containers"
+  end
   # not used atm.. index api needs some work, we should implement it 
   # so it just paginates all containers. 
   # right now you can to pass params as {:ids => [1,2,3]}
   def list(params={})
-    url = "#{@base_url}/api/containers"
+    url = "#{base_path}"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts)
   end
 
   def get(container_id)
-    url = "#{@base_url}/api/containers/#{container_id}"
+    url = "#{base_path}/#{container_id}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :get, url: url, headers: headers}
     execute(opts)
@@ -24,10 +27,10 @@ class Morpheus::ContainersInterface < Morpheus::APIClient
   def stop(container_id, payload={})
     url, params = "", {}
     if container_id.is_a?(Array)
-      url = "#{@base_url}/api/containers/stop"
+      url = "#{base_path}/stop"
       params = {ids: container_id}
     else
-      url = "#{@base_url}/api/containers/#{container_id}/stop"
+      url = "#{base_path}/#{container_id}/stop"
       params = {}
     end
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
@@ -38,10 +41,10 @@ class Morpheus::ContainersInterface < Morpheus::APIClient
   def start(container_id, payload={})
     url, params = "", {}
     if container_id.is_a?(Array)
-      url = "#{@base_url}/api/containers/start"
+      url = "#{base_path}/start"
       params = {ids: container_id}
     else
-      url = "#{@base_url}/api/containers/#{container_id}/start"
+      url = "#{base_path}/#{container_id}/start"
       params = {}
     end
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
@@ -52,10 +55,10 @@ class Morpheus::ContainersInterface < Morpheus::APIClient
   def restart(container_id, payload={})
     url, params = "", {}
     if container_id.is_a?(Array)
-      url = "#{@base_url}/api/containers/restart"
+      url = "#{base_path}/restart"
       params = {ids: container_id}
     else
-      url = "#{@base_url}/api/containers/#{container_id}/restart"
+      url = "#{base_path}/#{container_id}/restart"
       params = {}
     end
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
@@ -66,10 +69,10 @@ class Morpheus::ContainersInterface < Morpheus::APIClient
   def suspend(container_id, payload={})
     url, params = "", {}
     if container_id.is_a?(Array)
-      url = "#{@base_url}/api/containers/suspend"
+      url = "#{base_path}/suspend"
       params = {ids: container_id}
     else
-      url = "#{@base_url}/api/containers/#{container_id}/suspend"
+      url = "#{base_path}/#{container_id}/suspend"
       params = {}
     end
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
@@ -80,10 +83,10 @@ class Morpheus::ContainersInterface < Morpheus::APIClient
   def eject(container_id, payload={})
     url, params = "", {}
     if container_id.is_a?(Array)
-      url = "#{@base_url}/api/containers/eject"
+      url = "#{base_path}/eject"
       params = {ids: container_id}
     else
-      url = "#{@base_url}/api/containers/#{container_id}/eject"
+      url = "#{base_path}/#{container_id}/eject"
       params = {}
     end
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
@@ -94,10 +97,10 @@ class Morpheus::ContainersInterface < Morpheus::APIClient
   def available_actions(container_id)
     url, params = "", {}
     if container_id.is_a?(Array)
-      url = "#{@base_url}/api/containers/actions"
+      url = "#{base_path}/actions"
       params = {ids: container_id}
     else
-      url = "#{@base_url}/api/containers/#{container_id}/actions"
+      url = "#{base_path}/#{container_id}/actions"
       params = {}
     end
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
@@ -108,10 +111,10 @@ class Morpheus::ContainersInterface < Morpheus::APIClient
   def action(container_id, action_code, payload={})
     url, params = "", {}
     if container_id.is_a?(Array)
-      url = "#{@base_url}/api/containers/action"
+      url = "#{base_path}/action"
       params = {ids: container_id, code: action_code}
     else
-      url = "#{@base_url}/api/containers/#{container_id}/action"
+      url = "#{base_path}/#{container_id}/action"
       params = {code: action_code}
     end
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
@@ -119,4 +122,14 @@ class Morpheus::ContainersInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def import(container_id, payload={}, headers={})
+    validate_id!(container_id)
+    execute(method: :put, url: "#{base_path}/#{container_id}/import", payload: payload, headers: headers)
+  end
+
+  def clone_image(container_id, payload={}, headers={})
+    validate_id!(container_id)
+    execute(method: :put, url: "#{base_path}/#{container_id}/clone-image", payload: payload, headers: headers)
+  end
+
 end

data/lib/morpheus/api/custom_instance_types_interface.rb

@@ -73,7 +73,6 @@ class Morpheus::CustomInstanceTypesInterface < Morpheus::APIClient
   def destroy_version(instance_type_id, id)
     url = "#{@base_url}/api/custom-instance-types/#{instance_type_id}/versions/#{id}"
     headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json'}
-    payload = options
     execute(method: :delete, url: url, headers: headers)
   end
 
@@ -94,7 +93,6 @@ class Morpheus::CustomInstanceTypesInterface < Morpheus::APIClient
   def destroy_upgrade(instance_type_id, id)
     url = "#{@base_url}/api/custom-instance-types/#{instance_type_id}/upgrades/#{id}"
     headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json'}
-    payload = options
     execute(method: :delete, url: url, headers: headers)
   end
 

data/lib/morpheus/api/doc_interface.rb

@@ -13,9 +13,8 @@ class Morpheus::DocInterface < Morpheus::APIClient
     execute(method: :get, url: url, headers: headers)
   end
 
-  def swagger(params={})
-    url = "/api/doc/swagger"
-    # prefer /swagger.yml instead of /swagger?format=yml
+  def openapi(params={})
+    url = "/api/doc/openapi"
     fmt = params.delete('format')
     if fmt
       url = url + "." + fmt
@@ -25,10 +24,11 @@ class Morpheus::DocInterface < Morpheus::APIClient
     execute(method: :get, url: url, headers: headers, timeout: 172800, parse_json: !is_yaml)
   end
 
-  def download_swagger(outfile, params={})
+  alias :swagger :openapi
+
+  def download_openapi(outfile, params={})
     # note that RestClient.execute still requires the full path with base_url
-    url = "#{@base_url}/api/doc/swagger"
-    # prefer /swagger.yml instead of /swagger?format=yml
+    url = "#{@base_url}/api/doc/openapi"
     fmt = params.delete('format')
     if fmt
       url = url + "." + fmt
@@ -54,4 +54,6 @@ class Morpheus::DocInterface < Morpheus::APIClient
     http_response
   end
 
+  alias :swagger :download_openapi
+
 end

data/lib/morpheus/api/file_copy_request_interface.rb

@@ -42,7 +42,7 @@ class Morpheus::FileCopyRequestInterface < Morpheus::APIClient
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     # execute(opts, {parse_json: false})
-    if Dir.exists?(outfile)
+    if Dir.exist?(outfile)
       raise "outfile is invalid. It is the name of an existing directory: #{outfile}"
     end
     # if @verify_ssl == false

data/lib/morpheus/api/health_interface.rb

@@ -68,7 +68,7 @@ class Morpheus::HealthInterface < Morpheus::APIClient
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     # execute(opts, {parse_json: false})
-    if Dir.exists?(outfile)
+    if Dir.exist?(outfile)
       raise "outfile is invalid. It is the name of an existing directory: #{outfile}"
     end
     # if @verify_ssl == false

data/lib/morpheus/api/image_builder_interface.rb

@@ -1,7 +1,7 @@
 require 'morpheus/api/api_client'
-require 'morpheus/api/image_builder_image_builds_interface'
-require 'morpheus/api/image_builder_preseed_scripts_interface'
-require 'morpheus/api/image_builder_boot_scripts_interface'
+# require 'morpheus/api/image_builder_image_builds_interface'
+# require 'morpheus/api/image_builder_preseed_scripts_interface'
+# require 'morpheus/api/image_builder_boot_scripts_interface'
 
 class Morpheus::ImageBuilderInterface < Morpheus::APIClient
 

data/lib/morpheus/api/instances_interface.rb

@@ -318,6 +318,31 @@ class Morpheus::InstancesInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def list_schedules(id, params={}, headers={})
+    validate_id!(id)
+    execute(method: :get, url: "#{base_path}/#{id}/schedules", params: params, headers: headers)
+  end
+
+  def get_schedule(id, schedule_id, params={}, headers={})
+    validate_id!(id) && validate_id!(schedule_id, 'schedule_id')
+    execute(method: :get, url: "#{base_path}/#{id}/schedules/#{schedule_id}", params: params, headers: headers)
+  end
+
+  def create_schedule(id, payload, params={}, headers={})
+    validate_id!(id)
+    execute(method: :post, url: "#{base_path}/#{id}/schedules", params: params, payload: payload, headers: headers)
+  end
+
+  def update_schedule(id, schedule_id, payload, params={}, headers={})
+    validate_id!(id) && validate_id!(schedule_id, 'schedule_id')
+    execute(method: :put, url: "#{base_path}/#{id}/schedules/#{schedule_id}", params: params, payload: payload, headers: headers)
+  end
+
+  def destroy_schedule(id, schedule_id, params = {}, headers={})
+    validate_id!(id) && validate_id!(schedule_id, 'schedule_id')
+    execute(method: :delete, url: "#{base_path}/#{id}/schedules/#{schedule_id}", params: params, headers: headers)
+  end
+
   def update_load_balancer(id, payload)
     url = "#{@base_url}/api/instances/#{id}/load-balancer"
     headers = {authorization: "Bearer #{@access_token}", 'Content-Type' => 'application/json' }

data/lib/morpheus/api/logs_interface.rb

@@ -4,7 +4,6 @@ class Morpheus::LogsInterface < Morpheus::APIClient
 
   def list(params={})
     url = "#{@base_url}/api/logs"
-    # old versions expected containers[]
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute({method: :get, url: url, headers: headers})
   end
@@ -12,14 +11,13 @@ class Morpheus::LogsInterface < Morpheus::APIClient
   def container_logs(containers=[], params={})
     url = "#{@base_url}/api/logs"
     # old versions expected containers[]
-    headers = { params: {'containers' => containers, 'containers[]' => containers}.merge(params), authorization: "Bearer #{@access_token}" }
+    headers = { params: {'containers' => containers}.merge(params), authorization: "Bearer #{@access_token}" }
     execute({method: :get, url: url, headers: headers})
   end
 
   def server_logs(servers=[], params={})
     url = "#{@base_url}/api/logs"
-    # old versions expected containers[]
-    headers = { params: {'servers' => servers, 'servers[]' => servers}.merge(params), authorization: "Bearer #{@access_token}" }
+    headers = { params: {'servers' => servers}.merge(params), authorization: "Bearer #{@access_token}" }
     execute({method: :get, url: url, headers: headers})
   end
 

data/lib/morpheus/api/monitoring_interface.rb

@@ -1,10 +1,10 @@
 require 'morpheus/api/api_client'
-require 'morpheus/api/monitoring_checks_interface'
-require 'morpheus/api/monitoring_groups_interface'
-require 'morpheus/api/monitoring_apps_interface'
-require 'morpheus/api/monitoring_incidents_interface'
-require 'morpheus/api/monitoring_contacts_interface'
-require 'morpheus/api/monitoring_alerts_interface'
+# require 'morpheus/api/monitoring_checks_interface'
+# require 'morpheus/api/monitoring_groups_interface'
+# require 'morpheus/api/monitoring_apps_interface'
+# require 'morpheus/api/monitoring_incidents_interface'
+# require 'morpheus/api/monitoring_contacts_interface'
+# require 'morpheus/api/monitoring_alerts_interface'
 
 class Morpheus::MonitoringInterface < Morpheus::APIClient
 

data/lib/morpheus/api/packages_interface.rb

@@ -79,7 +79,7 @@ class Morpheus::PackagesInterface < Morpheus::APIClient
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :post, url: url, headers: headers}
     # execute(opts, {parse_json: false})
-    if Dir.exists?(outfile)
+    if Dir.exist?(outfile)
       raise "outfile is invalid. It is the name of an existing directory: #{outfile}"
     end
     # if @verify_ssl == false

data/lib/morpheus/api/reports_interface.rb

@@ -44,7 +44,7 @@ class Morpheus::ReportsInterface < Morpheus::APIClient
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers, timeout: 172800}
     # execute(opts, {parse_json: false})
-    if Dir.exists?(outfile)
+    if Dir.exist?(outfile)
       raise "outfile is invalid. It is the name of an existing directory: #{outfile}"
     end
     # if @verify_ssl == false

data/lib/morpheus/api/servers_interface.rb

@@ -55,6 +55,14 @@ class Morpheus::ServersInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def restart(serverId,payload = {}, params = {})
+    url = "#{@base_url}/api/servers/#{serverId}/restart"
+
+    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 make_managed(serverId,payload = {})
     url = "#{@base_url}/api/servers/#{serverId}/install-agent"
     #url = "#{@base_url}/api/servers/#{serverId}/make-managed" # added in 4.1
@@ -176,7 +184,7 @@ class Morpheus::ServersInterface < Morpheus::APIClient
     execute(opts)
   end
 
-    def update_network_label(network_id, server_id, payload)
+  def update_network_label(network_id, server_id, payload)
     url = "#{@base_url}/api/servers/#{server_id}/networkInterfaces/#{network_id}"
     headers = {authorization: "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :put, url: url, headers: headers, payload: payload.to_json}

data/lib/morpheus/api/storage_providers_interface.rb

@@ -96,7 +96,7 @@ class Morpheus::StorageProvidersInterface < Morpheus::APIClient
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     # execute(opts, false)
-    if Dir.exists?(outfile)
+    if Dir.exist?(outfile)
       raise "outfile is invalid. It is the name of an existing directory: #{outfile}"
     end
     # if @verify_ssl == false
@@ -125,7 +125,7 @@ class Morpheus::StorageProvidersInterface < Morpheus::APIClient
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     # execute(opts, false)
-    if Dir.exists?(outfile)
+    if Dir.exist?(outfile)
       raise "outfile is invalid. It is the name of an existing directory: #{outfile}"
     end
     # if @verify_ssl == false

data/lib/morpheus/api/virtual_images_interface.rb

@@ -81,7 +81,7 @@ class Morpheus::VirtualImagesInterface < Morpheus::APIClient
       # opts[:verify_ssl] = OpenSSL::SSL::VERIFY_NONE
     end
     
-    start_time = Time.now
+    # start_time = Time.now
     query_params = headers.delete(:params) || {}
     file_size = image_file.size
     if File.blockdev?(image_file)

data/lib/morpheus/api.rb

@@ -7,4 +7,6 @@ require 'morpheus/formatters'
 
 # 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| require file }

data/lib/morpheus/benchmarking.rb

@@ -145,7 +145,7 @@ module Morpheus::Benchmarking
 
     # finish the current benchmark and optionally print the time taken.
     def stop_benchmark(exit_code=0, err=nil)
-      if @benchmark_record
+      if defined?(@benchmark_record) && @benchmark_record
         @benchmark_record.stop(exit_code, err)
         @last_benchmark_record = @benchmark_record
         @benchmark_record = nil