morpheus-cli 3.6.8 → 3.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f07f82c8c3a9f9040ddd94a5d7537c5bd0f060c2299964f6338876eea0886a84
-  data.tar.gz: fc432221b5e84bc65cf18daba858aad0f491700c5b6fcc02a2092ab6e504d4b9
+  metadata.gz: edf4a115c224b9ee5fbdb0289bc5ed3a9338e2847461ff395c558e28c6352929
+  data.tar.gz: d3eed3cf1efe9c90679fb6c3a6e52e177fc9e78bc6bafeab4429cbe4a72308da
 SHA512:
-  metadata.gz: dd6fe7211b9b4634daa9a497786cb755b7f8127860810d06903398d4ada337dd02cd1a6cdb68aa244773783277131dc2a08bc2fe2be6b912da01daf5d3983d04
-  data.tar.gz: 696525d04100e85028de52f8417bdf3449815236e1da81a57d5d9418d79fbaa82a554a3b774f45d46f7c6d6c7a096c3b3e63d77f61376d43d88218a8bfb42fc8
+  metadata.gz: 970a441acc7a65b6b91578f7a3d44bba995ac01f4060982a17d7ebc490ef7ddced9bb63a9dca5b1bebecb7dff7239bc352f42d6ea8a7f1a179b05fb20b312323
+  data.tar.gz: f07cc47e7ffdc6d2f754dca1551d4f122a944b6b5afe18e7a8d52bb494c870f6cc57c0a0298f42bca88f3559b878f6c7b0d408693b6e02ff9812fd4e753063db

data/lib/morpheus/api/account_groups_interface.rb

@@ -40,14 +40,14 @@ class Morpheus::AccountGroupsInterface < Morpheus::APIClient
   def destroy(account_id, id, params={})
     url = "#{@base_url}/api/accounts/#{account_id}/groups/#{id}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :delete, url: url, timeout: 30, headers: headers}
+    opts = {method: :delete, url: url, headers: headers}
     execute(opts)
   end
 
   def update_zones(account_id, id, payload)
     url = "#{@base_url}/api/accounts/#{account_id}/groups/#{id}/update-zones"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :put, url: url, timeout: 30, headers: headers, payload: payload.to_json}
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 

data/lib/morpheus/api/accounts_interface.rb

@@ -15,24 +15,21 @@ class Morpheus::AccountsInterface < Morpheus::APIClient
     execute(method: :get, url: url, headers: headers)
   end
 
-  def list(options={})
+  def list(params={})
     url = "#{@base_url}/api/accounts"
-    headers = { params: {}, authorization: "Bearer #{@access_token}" }
-    headers[:params].merge!(options)
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
   end
 
-  def create(options)
+  def create(payload)
     url = "#{@base_url}/api/accounts"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = options
     execute(method: :post, url: url, headers: headers, payload: payload.to_json)
   end
 
-  def update(id, options)
+  def update(id, payload)
     url = "#{@base_url}/api/accounts/#{id}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    payload = options
     execute(method: :put, url: url, headers: headers, payload: payload.to_json)
   end
 

data/lib/morpheus/api/api_client.rb

@@ -3,7 +3,7 @@ require 'uri'
 require 'rest-client'
 
 class Morpheus::APIClient
-  def initialize(access_token, refresh_token=nil,expires_in = nil, base_url=nil, verify_ssl=true) 
+  def initialize(access_token, refresh_token=nil,expires_in = nil, base_url=nil, verify_ssl=true, options={})
     @access_token = access_token
     @refresh_token = refresh_token
     @base_url = base_url
@@ -11,6 +11,7 @@ class Morpheus::APIClient
       @expires_at = DateTime.now + expires_in.seconds
     end
     set_ssl_verification_enabled(verify_ssl)
+    setopts(options)
   end
 
   def dry_run(val=true)
@@ -30,7 +31,127 @@ class Morpheus::APIClient
     @verify_ssl = !!val
   end
 
-  def execute(opts, parse_json=true)
+  # set this in your interface, eg. to 'application/json'
+  def default_content_type
+    nil
+  end
+
+  # common global options, hooray.
+  # this is probably needed for CliCommand too..
+  # maybe make this a mixin...
+
+  # need this accessor?
+  # def get_options
+  #   @options
+  # end
+
+  # set common global @options for use with all requests
+  # meant for inline use just like dry(), set_options(dry_run:true) can be used in place of dry()
+  # @param opts [Hash] globally supported options like :dry_run, :json, :curl, :headers, :timeout, etc
+  # Example: 
+  # Prints curl -XGET .../whoami -H "Bearer" instead of actually request
+  # APIClient.new(token).whoami.setopts(curl:true).get({})
+  # @return self (APIClient)
+  def setopts(new_options)
+    @options = new_options
+    if @options[:dry_run]
+      dry_run(true)
+    end
+    self
+  end
+
+  # with_options sets common global @options for the duration of the block only
+  # then returns the options to their prior values
+  # @param opts [Hash] globally supported options like :dry_run, :json, :curl, :headers, :timeout, etc
+  # @return result of block, usually the a result Hash from client.execute({})
+  def withopts(tmp_options, &block)
+    @_old_options = @options
+    begin
+      @options = tmp_options
+      result = block.call()
+    ensure
+      @options = @_old_options
+    end
+    return result
+  end
+
+  alias :set_options :setopts
+  alias :with_options :withopts
+  # Execute an HTTP request with this client.
+  # opts - Hash of options for HTTP Request.
+  #   :url - The full url
+  #   :method - The default method is :get (GET)
+  #   :headers - Hash of headers to include in the request.
+  #              eg. {'Content-Type' => 'application/json'}. :params is a special key for query parameters.
+  #   :params - query parameters
+  #   :payload - The body of the request.
+  #   :timeout - A custom timeout in seconds for api requests. The default is 30. todo: separate timeout options
+  # options - Hash of common global options that commands parse. eg. :headers, :timeout, :dry_run, :curl, etc
+  #   :headers - Extra headers to add. This expects a Hash like {'Content-Type' => 'application/json'}.
+  #   :timeout - A custom timeout in seconds for api requests. The default is 30. todo: separate timeout options
+  def execute(opts, options={})
+    # merge in common global @options
+    if @options
+      options = options.merge(@options)
+    else
+      options = options.clone
+    end
+
+    # default HTTP method
+    if opts[:method].nil?
+      # why not a default? you will get an error from RestClient
+      # opts[:method] = :get
+    else
+      # convert to lowercase Symbol like :get, :post, :put, or :delete
+      opts[:method] = opts[:method].to_s.downcase.to_sym
+    end
+
+    # apply default headers
+    opts[:headers] ||= {}
+    # Authorization: apply our access token
+    if @access_token
+      if opts[:headers][:authorization].nil? && opts[:headers]['Authorization'].nil?
+        opts[:headers][:authorization] = "Bearer #{@access_token}"
+      else
+        # authorization header has already been set.
+      end
+    end
+
+    # Content-Type: apply interface default
+    if opts[:headers]['Content-Type'].nil? && default_content_type
+      opts[:headers]['Content-Type'] = default_content_type
+    end
+
+    # use custom timeout eg. from --timeout option
+    if options[:timeout]
+      opts[:timeout] = options[:timeout].to_f
+    end
+    
+    # add extra headers, eg. from --header option
+    # headers should be a Hash and not an Array, dont make me split you here!
+    if options[:headers]
+      opts[:headers] = opts[:headers].merge(options[:headers])
+    end
+
+    # this is confusing, but RestClient expects :params inside the headers...?
+    # right?
+    # move/copy params to headers.params for simplification.
+    # remove this if issues arise
+    if opts[:params] && (opts[:headers][:params].nil? || opts[:headers][:params].empty?)
+      opts[:headers][:params] = opts[:params] # .delete(:params) maybe?
+    end
+
+    # :command_options for these
+    # if options[:curl]
+    #   opts[:curl] = options[:curl]
+    # end
+    # if options.key?(:pretty_json)
+    #   opts[:pretty_json] = options[:pretty_json]
+    # end
+    # if options.key?(:scrub)
+    #   opts[:scrub] = options[:scrub]
+    # end
+
     # @verify_ssl is not used atm
     # todo: finish this and use it instead of the global variable RestClient.ssl_verification_enabled?
     # gotta clean up all APIClient subclasses new() methods to support this
@@ -39,14 +160,24 @@ class Morpheus::APIClient
     if @verify_ssl == false
       opts[:verify_ssl] = OpenSSL::SSL::VERIFY_NONE
     end
+
     if @dry_run
       # JD: could return a Request object instead...
+      # print_dry_run needs options somehow...
+      opts[:command_options] = options # trash this..we got @options with setopts now
       return opts
     end
+
+    # uhh can't use LIST at the moment
+    # fix it!
+    # if opts[:method] == :list
+    #   opts[:method]
+    # end
+
     # Morpheus::Logging::DarkPrinter.puts "Morpheus::RestClient.execute(#{opts})" if Morpheus::Logging.debug?
     # instead, using ::RestClient.log = STDOUT 
     response = Morpheus::RestClient.execute(opts)
-    if parse_json
+    if opts[:parse_json] != false && options[:parse_json] != false
       return JSON.parse(response.to_s)
     else
       return response
@@ -54,273 +185,279 @@ class Morpheus::APIClient
   end
 
   def auth
-    Morpheus::AuthInterface.new(@base_url, @access_token)
+    Morpheus::AuthInterface.new(@base_url, @access_token).setopts(@options)
   end
 
   def whoami
-    Morpheus::WhoamiInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::WhoamiInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def user_settings
-    Morpheus::UserSettingsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::UserSettingsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def options
-    Morpheus::OptionsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::OptionsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def groups
-    Morpheus::GroupsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::GroupsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def account_groups
-    Morpheus::AccountGroupsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::AccountGroupsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def clouds
-    Morpheus::CloudsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::CloudsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def cloud_datastores
-    Morpheus::CloudDatastoresInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::CloudDatastoresInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def servers
-    Morpheus::ServersInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::ServersInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def instances
-    Morpheus::InstancesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::InstancesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def containers
-    Morpheus::ContainersInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::ContainersInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def instance_types
-    Morpheus::InstanceTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::InstanceTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def provision_types
-    Morpheus::ProvisionTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::ProvisionTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def load_balancers
-    Morpheus::LoadBalancersInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::LoadBalancersInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def tasks
-    Morpheus::TasksInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::TasksInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def task_sets
-    Morpheus::TaskSetsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::TaskSetsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def virtual_images
-    Morpheus::VirtualImagesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::VirtualImagesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def apps
-    Morpheus::AppsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::AppsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def blueprints
-    Morpheus::BlueprintsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::BlueprintsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def app_templates
-    Morpheus::AppTemplatesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::AppTemplatesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def deploy
-    Morpheus::DeployInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::DeployInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def deployments
-    Morpheus::DeploymentsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::DeploymentsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def security_groups
-    Morpheus::SecurityGroupsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::SecurityGroupsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def security_group_rules
-    Morpheus::SecurityGroupRulesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::SecurityGroupRulesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def accounts
-    Morpheus::AccountsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::AccountsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def users
-    Morpheus::UsersInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::UsersInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def user_groups
-    Morpheus::UserGroupsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::UserGroupsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def user_sources
-    Morpheus::UserSourcesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::UserSourcesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def logs
-    Morpheus::LogsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::LogsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def roles
-    Morpheus::RolesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::RolesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def key_pairs
-    Morpheus::KeyPairsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::KeyPairsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def license
-    Morpheus::LicenseInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::LicenseInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def custom_instance_types
-    Morpheus::CustomInstanceTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::CustomInstanceTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def option_types
-    Morpheus::OptionTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::OptionTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def option_type_lists
-    Morpheus::OptionTypeListsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::OptionTypeListsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def dashboard
-    Morpheus::DashboardInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::DashboardInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def power_schedules
-    Morpheus::PowerSchedulesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::PowerSchedulesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def execute_schedules
-    Morpheus::ExecuteSchedulesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::ExecuteSchedulesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def setup
-    Morpheus::SetupInterface.new(@base_url)
+    Morpheus::SetupInterface.new(@base_url).setopts(@options).setopts(@options)
   end
   
   def monitoring
-    Morpheus::MonitoringInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::MonitoringInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   # def checks
-  #   # Morpheus::MonitoringChecksInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  #   # Morpheus::MonitoringChecksInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   #   monitoring.checks
   # end
 
   # def incidents
-  #   # Morpheus::MonitoringIncidentsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  #   # Morpheus::MonitoringIncidentsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   #   monitoring.incidents
   # end
 
   def policies
-    Morpheus::PoliciesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::PoliciesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def group_policies
-    Morpheus::GroupPoliciesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::GroupPoliciesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def cloud_policies
-    Morpheus::CloudPoliciesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::CloudPoliciesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def networks
-    Morpheus::NetworksInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::NetworksInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def network_groups
-    Morpheus::NetworkGroupsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::NetworkGroupsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def network_pools
-    Morpheus::NetworkPoolsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::NetworkPoolsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def network_services
-    Morpheus::NetworkServicesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::NetworkServicesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def network_pool_servers
-    Morpheus::NetworkPoolServersInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::NetworkPoolServersInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def network_domains
-    Morpheus::NetworkDomainsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::NetworkDomainsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def network_proxies
-    Morpheus::NetworkProxiesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::NetworkProxiesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def archive_buckets
-    Morpheus::ArchiveBucketsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::ArchiveBucketsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def archive_files
-    Morpheus::ArchiveFilesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::ArchiveFilesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def image_builder
-    Morpheus::ImageBuilderInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::ImageBuilderInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def storage_providers
-    Morpheus::StorageProvidersInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::StorageProvidersInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def library_instance_types
-    Morpheus::LibraryInstanceTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::LibraryInstanceTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def library_layouts
-    Morpheus::LibraryLayoutsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::LibraryLayoutsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def library_container_upgrades
-    Morpheus::LibraryContainerUpgradesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::LibraryContainerUpgradesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def library_container_types
-    Morpheus::LibraryContainerTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::LibraryContainerTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def library_container_scripts
-    Morpheus::LibraryContainerScriptsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::LibraryContainerScriptsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def library_container_templates
-    Morpheus::LibraryContainerTemplatesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::LibraryContainerTemplatesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def packages
-    Morpheus::PackagesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::PackagesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def cypher
-    Morpheus::CypherInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::CypherInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+  end
+
+  def old_cypher
+    Morpheus::OldCypherInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
   
   def execution_request
-    Morpheus::ExecutionRequestInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::ExecutionRequestInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def file_copy_request
-    Morpheus::FileCopyRequestInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::FileCopyRequestInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
   def processes
-    Morpheus::ProcessesInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+    Morpheus::ProcessesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
+  # new interfaces get added here
+
 end