morpheus-cli 5.3.0.3 → 5.3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 537ea8ecb044cb316ca3c7610ff9d48d2cfdea448c37c2ce171d797143b9d5bb
-  data.tar.gz: e80110f66f9a28496f507bebc117fb7aa74f770f33f8aadb9078bf331b4099f7
+  metadata.gz: e27f28e852866d25457815c852eec19a3f65bd3b0ae8a33d8e055d990f631e79
+  data.tar.gz: 5270f5c81e872491cbf9e1e59f33cf78bf233c152c1347fa61cb01c544073e34
 SHA512:
-  metadata.gz: 0fff28a9b02ccbff264efa449fd56455316af3263c990cc15f37eae658f45c44e47f5138c33428744d0b687850fa7a710f9fe7193ca753da82057c5570da1ab0
-  data.tar.gz: 7738424a32347e6e51970a7b4542accf527057f1634f4a798ec8e98cf0a908c92b5a14a0fda217dd2f94f2666c0d588f9935d5a0f2ab71b7dc78daa04b97563f
+  metadata.gz: 172818b1030b243ebb2c9c7e316b0cefe173b5a198ff8184f7c0b7bce275954e80109b45c426530ef1587635199e6cc17dedc248011cc11626e2d0f5e8f3f1c1
+  data.tar.gz: 45bdeca37c208f7e7889bd9ab87b0012fea6623faf1b80628fef2ad0df55182388c8e1cd647f9fdd51628d48a4d6cca715e718bb655c8612683fe4ffc9ede3f8

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.5.1
 
-RUN gem install morpheus-cli -v 5.3.0.3
+RUN gem install morpheus-cli -v 5.3.2.1
 
 ENTRYPOINT ["morpheus"]

data/README.md

@@ -23,8 +23,6 @@ And then execute:
 
     $ bundle install
 
-
-
 ## Usage
 
 ### morpheus command
@@ -32,7 +30,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
-morpheus remote add demo https://demo.mymorpheus.com
+morpheus remote add
 morpheus instances list
 ```
 

data/lib/morpheus/api/account_groups_interface.rb

@@ -1,12 +1,6 @@
 require 'morpheus/api/api_client'
 
 class Morpheus::AccountGroupsInterface < 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/accounts_interface.rb

@@ -1,41 +1,9 @@
-require 'morpheus/api/api_client'
+require 'morpheus/api/rest_interface'
 
-class Morpheus::AccountsInterface < 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)
-    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
-    url = "#{@base_url}/api/accounts/#{id}"
-    headers = { params: {}, authorization: "Bearer #{@access_token}" }
-    execute(method: :get, url: url, headers: headers)
-  end
-
-  def list(params={})
-    url = "#{@base_url}/api/accounts"
-    headers = { params: params, authorization: "Bearer #{@access_token}" }
-    execute(method: :get, url: url, headers: headers)
-  end
-
-  def create(payload)
-    url = "#{@base_url}/api/accounts"
-    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    execute(method: :post, url: url, headers: headers, payload: payload.to_json)
-  end
+class Morpheus::AccountsInterface < Morpheus::RestInterface
 
-  def update(id, payload)
-    url = "#{@base_url}/api/accounts/#{id}"
-    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    execute(method: :put, url: url, headers: headers, payload: payload.to_json)
+  def base_path
+    "/api/accounts"
   end
 
-  def destroy(id)
-    url = "#{@base_url}/api/accounts/#{id}"
-    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    execute(method: :delete, url: url, headers: headers)
-  end
 end

data/lib/morpheus/api/api_client.rb

@@ -1,5 +1,6 @@
 require 'json'
 require 'uri'
+require 'cgi'
 require 'rest-client'
 
 class Morpheus::APIClient
@@ -80,7 +81,7 @@ class Morpheus::APIClient
   end
 
   # set default seconds for interface to timeout after
-  # or let it use system default? none, it should not timeout by default.. 
+  # or let it use system default? none, it should not timeout by default..
   # I think execute() may use 30 seconds for get by default.
   # and it should remove timeout when method is post, put, or delete
   def default_timeout
@@ -104,7 +105,7 @@ class Morpheus::APIClient
   # 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: 
+  # Example:
   # Prints curl -XGET .../whoami -H "Bearer" instead of actually request
   # APIClient.new(token).whoami.setopts(curl:true).get({})
   # @return self (APIClient)
@@ -146,6 +147,7 @@ class Morpheus::APIClient
   #   :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={})
+    # Morpheus::Logging::DarkPrinter.puts "Morpheus::RestClient.execute(#{opts})" if Morpheus::Logging.debug?
     # ok, always prepend @base_url, let the caller specify it exactly or leave it off.
     # this allows the Interface definition be lazy and not specify the base_url in every call to execute()
       # it will be used though...
@@ -168,13 +170,13 @@ class Morpheus::APIClient
       # convert to lowercase Symbol like :get, :post, :put, or :delete
       opts[:method] = opts[:method].to_s.downcase.to_sym
     end
-    
+
     # could validate method here...
 
     # apply default headers
     opts[:headers] ||= {}
 
-    is_multipart = (opts[:payload].is_a?(Hash) && opts[:payload][:multipart])
+    is_multipart = (opts[:payload].is_a?(Hash) && opts[:payload][:multipart] == true)
 
     # Authorization: apply our access token
     if authorization_required?
@@ -187,15 +189,20 @@ class Morpheus::APIClient
       end
     end
 
-    # Content-Type default is application/json
-    if opts[:headers]['Content-Type'].nil? && opts[:payload] && is_multipart == false
-      opts[:headers]['Content-Type'] = (default_content_type || 'application/json')
-    end
+    # POST and PUT requests default Content-Type is application/json
+    # set Content-Type or pass :form_data => true if you want application/x-www-form-urlencoded
+    # or use opts[:payload][:multipart] = true if you need multipart/form-data
+    if opts[:method] == :post || opts[:method] == :put
+      if opts[:headers]['Content-Type'].nil? && opts[:payload] && is_multipart != true && opts[:form_data] != true
+        opts[:headers]['Content-Type'] = (default_content_type || 'application/json')
+      end
 
-    # this could be nice too..
-    # if opts[:headers]['Content-Type'] == 'application/json' && opts[:payload].is_a?(Hash)
-    #   opts[:payload] = opts[:payload].to_json
-    # end
+      # Auto encode payload as JSON, just to be nice
+      if opts[:headers]['Content-Type'] == 'application/json' && !opts[:payload].is_a?(String)
+        opts[:payload] = opts[:payload].to_json
+      end
+
+    end
 
     # always use custom timeout eg. from --timeout option
     # or use default_timeout for GET requests only.
@@ -254,7 +261,7 @@ class Morpheus::APIClient
     # end
 
     # Morpheus::Logging::DarkPrinter.puts "Morpheus::RestClient.execute(#{opts})" if Morpheus::Logging.debug?
-    # instead, using ::RestClient.log = STDOUT 
+    # instead, using ::RestClient.log = STDOUT
     response = Morpheus::RestClient.execute(opts)
     if opts[:parse_json] != false && options[:parse_json] != false
       return JSON.parse(response.to_s)
@@ -317,11 +324,12 @@ class Morpheus::APIClient
 
   def common_interface_options
     {
-      url: @base_url, 
-      access_token: @access_token, 
-      refresh_token: @refresh_token, 
-      expires_at: @expires_at, 
-      client_id: @client_id
+      url:           @base_url,
+      access_token:  @access_token,
+      refresh_token: @refresh_token,
+      expires_at:    @expires_at,
+      client_id:     @client_id,
+      verify_ssl:    @verify_ssl
     }
   end
 
@@ -336,10 +344,10 @@ class Morpheus::APIClient
   def setup
     Morpheus::SetupInterface.new(common_interface_options).setopts(@options)
   end
-  
+
   def auth
     # Morpheus::AuthInterface.new(common_interface_options).setopts(@options)
-    Morpheus::AuthInterface.new({url: @base_url, client_id: @client_id}).setopts(@options)
+    Morpheus::AuthInterface.new({url: @base_url, client_id: @client_id, verify_ssl: @verify_ssl}).setopts(@options)
   end
 
   def forgot
@@ -367,385 +375,405 @@ class Morpheus::APIClient
   end
 
   def options
-    Morpheus::OptionsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::OptionsInterface.new(common_interface_options).setopts(@options)
   end
 
   def groups
-    Morpheus::GroupsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::GroupsInterface.new(common_interface_options).setopts(@options)
   end
 
   def account_groups
-    Morpheus::AccountGroupsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::AccountGroupsInterface.new(common_interface_options).setopts(@options)
   end
 
   def clouds
-    Morpheus::CloudsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::CloudsInterface.new(common_interface_options).setopts(@options)
   end
 
   def cloud_datastores
-    Morpheus::CloudDatastoresInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::CloudDatastoresInterface.new(common_interface_options).setopts(@options)
   end
 
   def cloud_resource_pools
-    Morpheus::CloudResourcePoolsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::CloudResourcePoolsInterface.new(common_interface_options).setopts(@options)
   end
 
   def cloud_folders
-    Morpheus::CloudFoldersInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::CloudFoldersInterface.new(common_interface_options).setopts(@options)
   end
 
   def datastores
-    Morpheus::DatastoresInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::DatastoresInterface.new(common_interface_options).setopts(@options)
   end
 
   def servers
-    Morpheus::ServersInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::ServersInterface.new(common_interface_options).setopts(@options)
   end
 
   def instances
-    Morpheus::InstancesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::InstancesInterface.new(common_interface_options).setopts(@options)
   end
 
   def appliance_settings
-    Morpheus::ApplianceSettingsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::ApplianceSettingsInterface.new(common_interface_options).setopts(@options)
   end
 
   def provisioning_settings
-    Morpheus::ProvisioningSettingsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::ProvisioningSettingsInterface.new(common_interface_options).setopts(@options)
   end
 
   def provisioning_licenses
-    Morpheus::ProvisioningLicensesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::ProvisioningLicensesInterface.new(common_interface_options).setopts(@options)
   end
 
   def provisioning_license_types
-    Morpheus::ProvisioningLicenseTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::ProvisioningLicenseTypesInterface.new(common_interface_options).setopts(@options)
   end
 
   def containers
-    Morpheus::ContainersInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::ContainersInterface.new(common_interface_options).setopts(@options)
   end
 
   def instance_types
-    Morpheus::InstanceTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::InstanceTypesInterface.new(common_interface_options).setopts(@options)
   end
 
   def integrations
-    Morpheus::IntegrationsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::IntegrationsInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def integration_types
+    Morpheus::IntegrationTypesInterface.new(common_interface_options).setopts(@options)
   end
 
   def jobs
-    Morpheus::JobsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::JobsInterface.new(common_interface_options).setopts(@options)
   end
 
   def server_types
-    Morpheus::ServerTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::ServerTypesInterface.new(common_interface_options).setopts(@options)
   end
 
   def provision_types
-    Morpheus::ProvisionTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::ProvisionTypesInterface.new(common_interface_options).setopts(@options)
   end
 
   def service_plans
-    Morpheus::ServicePlansInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::ServicePlansInterface.new(common_interface_options).setopts(@options)
   end
 
   def price_sets
-    Morpheus::PriceSetsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::PriceSetsInterface.new(common_interface_options).setopts(@options)
   end
 
   def prices
-    Morpheus::PricesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::PricesInterface.new(common_interface_options).setopts(@options)
   end
 
   def load_balancers
-    Morpheus::LoadBalancersInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::LoadBalancersInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def load_balancer_types
+    Morpheus::LoadBalancerTypesInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def load_balancer_virtual_servers
+    Morpheus::LoadBalancerVirtualServersInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def load_balancer_pools
+    Morpheus::LoadBalancerPoolsInterface.new(common_interface_options).setopts(@options)
   end
 
   def tasks
-    Morpheus::TasksInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::TasksInterface.new(common_interface_options).setopts(@options)
   end
 
   def task_sets
-    Morpheus::TaskSetsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::TaskSetsInterface.new(common_interface_options).setopts(@options)
   end
 
   def virtual_images
-    Morpheus::VirtualImagesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::VirtualImagesInterface.new(common_interface_options).setopts(@options)
   end
 
   def apps
-    Morpheus::AppsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::AppsInterface.new(common_interface_options).setopts(@options)
   end
 
   def blueprints
-    Morpheus::BlueprintsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::BlueprintsInterface.new(common_interface_options).setopts(@options)
   end
 
   def deploy
-    Morpheus::DeployInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::DeployInterface.new(common_interface_options).setopts(@options)
   end
 
   def deployments
-    Morpheus::DeploymentsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::DeploymentsInterface.new(common_interface_options).setopts(@options)
   end
 
   def security_groups
-    Morpheus::SecurityGroupsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::SecurityGroupsInterface.new(common_interface_options).setopts(@options)
   end
 
   def security_group_rules
-    Morpheus::SecurityGroupRulesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::SecurityGroupRulesInterface.new(common_interface_options).setopts(@options)
   end
 
   def clusters
-    Morpheus::ClustersInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::ClustersInterface.new(common_interface_options).setopts(@options)
   end
 
   def accounts
-    Morpheus::AccountsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::AccountsInterface.new(common_interface_options).setopts(@options)
   end
 
   def approvals
-    Morpheus::ApprovalsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::ApprovalsInterface.new(common_interface_options).setopts(@options)
   end
 
   def users
-    Morpheus::UsersInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::UsersInterface.new(common_interface_options).setopts(@options)
   end
 
   def user_groups
-    Morpheus::UserGroupsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::UserGroupsInterface.new(common_interface_options).setopts(@options)
   end
 
   def user_sources
-    Morpheus::UserSourcesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::UserSourcesInterface.new(common_interface_options).setopts(@options)
   end
 
   def logs
-    Morpheus::LogsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::LogsInterface.new(common_interface_options).setopts(@options)
   end
 
   def roles
-    Morpheus::RolesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::RolesInterface.new(common_interface_options).setopts(@options)
   end
 
   def key_pairs
-    Morpheus::KeyPairsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::KeyPairsInterface.new(common_interface_options).setopts(@options)
   end
 
-  def license
-    Morpheus::LicenseInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+  def certificates
+    Morpheus::CertificatesInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def certificate_types
+    Morpheus::CertificateTypesInterface.new(common_interface_options).setopts(@options)
   end
 
-  def custom_instance_types
-    Morpheus::CustomInstanceTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+  def license
+    Morpheus::LicenseInterface.new(common_interface_options).setopts(@options)
   end
 
   def option_types
-    Morpheus::OptionTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::OptionTypesInterface.new(common_interface_options).setopts(@options)
   end
 
   def option_type_lists
-    Morpheus::OptionTypeListsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::OptionTypeListsInterface.new(common_interface_options).setopts(@options)
   end
 
   def power_schedules
-    Morpheus::PowerSchedulesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::PowerSchedulesInterface.new(common_interface_options).setopts(@options)
   end
 
   def execute_schedules
-    Morpheus::ExecuteSchedulesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::ExecuteSchedulesInterface.new(common_interface_options).setopts(@options)
   end
 
   def monitoring
-    Morpheus::MonitoringInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::MonitoringInterface.new(common_interface_options).setopts(@options)
   end
 
   # def checks
-  #   # Morpheus::MonitoringChecksInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+  #   # Morpheus::MonitoringChecksInterface.new(common_interface_options).setopts(@options)
   #   monitoring.checks
   # end
 
   # def incidents
-  #   # Morpheus::MonitoringIncidentsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+  #   # Morpheus::MonitoringIncidentsInterface.new(common_interface_options).setopts(@options)
   #   monitoring.incidents
   # end
 
   def policies
-    Morpheus::PoliciesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::PoliciesInterface.new(common_interface_options).setopts(@options)
   end
 
   def group_policies
-    Morpheus::GroupPoliciesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::GroupPoliciesInterface.new(common_interface_options).setopts(@options)
   end
 
   def cloud_policies
-    Morpheus::CloudPoliciesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::CloudPoliciesInterface.new(common_interface_options).setopts(@options)
   end
 
   def networks
-    Morpheus::NetworksInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::NetworksInterface.new(common_interface_options).setopts(@options)
   end
 
   def network_types
-    Morpheus::NetworkTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::NetworkTypesInterface.new(common_interface_options).setopts(@options)
   end
 
   def subnets
-    Morpheus::SubnetsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::SubnetsInterface.new(common_interface_options).setopts(@options)
   end
 
   def subnet_types
-    Morpheus::SubnetTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::SubnetTypesInterface.new(common_interface_options).setopts(@options)
   end
 
   def network_groups
-    Morpheus::NetworkGroupsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::NetworkGroupsInterface.new(common_interface_options).setopts(@options)
   end
 
   def network_pools
-    Morpheus::NetworkPoolsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::NetworkPoolsInterface.new(common_interface_options).setopts(@options)
   end
 
   def network_pool_ips
-    Morpheus::NetworkPoolIpsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::NetworkPoolIpsInterface.new(common_interface_options).setopts(@options)
   end
 
   def network_routers
-    Morpheus::NetworkRoutersInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::NetworkRoutersInterface.new(common_interface_options).setopts(@options)
   end
 
   def network_services
-    Morpheus::NetworkServicesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::NetworkServicesInterface.new(common_interface_options).setopts(@options)
   end
 
   def network_security_servers
-    Morpheus::NetworkSecurityServersInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::NetworkSecurityServersInterface.new(common_interface_options).setopts(@options)
   end
 
   def network_pool_servers
-    Morpheus::NetworkPoolServersInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::NetworkPoolServersInterface.new(common_interface_options).setopts(@options)
   end
 
   def network_domains
-    Morpheus::NetworkDomainsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::NetworkDomainsInterface.new(common_interface_options).setopts(@options)
   end
 
   def network_domain_records
-    Morpheus::NetworkDomainRecordsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::NetworkDomainRecordsInterface.new(common_interface_options).setopts(@options)
   end
 
   def network_proxies
-    Morpheus::NetworkProxiesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::NetworkProxiesInterface.new(common_interface_options).setopts(@options)
   end
 
   def archive_buckets
-    Morpheus::ArchiveBucketsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::ArchiveBucketsInterface.new(common_interface_options).setopts(@options)
   end
 
   def archive_files
-    Morpheus::ArchiveFilesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::ArchiveFilesInterface.new(common_interface_options).setopts(@options)
   end
 
   def image_builder
-    Morpheus::ImageBuilderInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::ImageBuilderInterface.new(common_interface_options).setopts(@options)
   end
 
   def storage_providers
-    Morpheus::StorageProvidersInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::StorageProvidersInterface.new(common_interface_options).setopts(@options)
   end
 
   def library_instance_types
-    Morpheus::LibraryInstanceTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::LibraryInstanceTypesInterface.new(common_interface_options).setopts(@options)
   end
 
   def library_layouts
-    Morpheus::LibraryLayoutsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::LibraryLayoutsInterface.new(common_interface_options).setopts(@options)
   end
 
   def library_container_upgrades
-    Morpheus::LibraryContainerUpgradesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::LibraryContainerUpgradesInterface.new(common_interface_options).setopts(@options)
   end
 
   def library_container_types
-    Morpheus::LibraryContainerTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::LibraryContainerTypesInterface.new(common_interface_options).setopts(@options)
   end
 
   def library_container_scripts
-    Morpheus::LibraryContainerScriptsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::LibraryContainerScriptsInterface.new(common_interface_options).setopts(@options)
   end
 
   def library_container_templates
-    Morpheus::LibraryContainerTemplatesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::LibraryContainerTemplatesInterface.new(common_interface_options).setopts(@options)
   end
 
   def library_cluster_layouts
-    Morpheus::LibraryClusterLayoutsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::LibraryClusterLayoutsInterface.new(common_interface_options).setopts(@options)
   end
 
   def library_spec_templates
-    Morpheus::LibrarySpecTemplatesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::LibrarySpecTemplatesInterface.new(common_interface_options).setopts(@options)
   end
 
   def library_spec_template_types
-    Morpheus::LibrarySpecTemplateTypesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::LibrarySpecTemplateTypesInterface.new(common_interface_options).setopts(@options)
   end
 
   def packages
-    Morpheus::PackagesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::PackagesInterface.new(common_interface_options).setopts(@options)
   end
 
   def cypher
-    Morpheus::CypherInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::CypherInterface.new(common_interface_options).setopts(@options)
   end
 
   def old_cypher
-    Morpheus::OldCypherInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::OldCypherInterface.new(common_interface_options).setopts(@options)
   end
 
   def execution_request
-    Morpheus::ExecutionRequestInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::ExecutionRequestInterface.new(common_interface_options).setopts(@options)
   end
 
   def file_copy_request
-    Morpheus::FileCopyRequestInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::FileCopyRequestInterface.new(common_interface_options).setopts(@options)
   end
 
   def processes
-    Morpheus::ProcessesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::ProcessesInterface.new(common_interface_options).setopts(@options)
   end
 
   def reports
-    Morpheus::ReportsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::ReportsInterface.new(common_interface_options).setopts(@options)
   end
 
   def environments
-    Morpheus::EnvironmentsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::EnvironmentsInterface.new(common_interface_options).setopts(@options)
   end
 
   def backup_settings
-    Morpheus::BackupSettingsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::BackupSettingsInterface.new(common_interface_options).setopts(@options)
   end
 
   def log_settings
-    Morpheus::LogSettingsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::LogSettingsInterface.new(common_interface_options).setopts(@options)
   end
 
   def whitelabel_settings
-    Morpheus::WhitelabelSettingsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::WhitelabelSettingsInterface.new(common_interface_options).setopts(@options)
   end
 
   def wiki
-    Morpheus::WikiInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::WikiInterface.new(common_interface_options).setopts(@options)
   end
 
   def budgets
-    Morpheus::BudgetsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::BudgetsInterface.new(common_interface_options).setopts(@options)
   end
 
   def health
-    Morpheus::HealthInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::HealthInterface.new(common_interface_options).setopts(@options)
   end
 
   def invoices
@@ -757,7 +785,7 @@ class Morpheus::APIClient
   end
 
   def guidance
-    Morpheus::GuidanceInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+    Morpheus::GuidanceInterface.new(common_interface_options).setopts(@options)
   end
 
   def projects
@@ -787,7 +815,27 @@ class Morpheus::APIClient
   def billing
     Morpheus::BillingInterface.new(common_interface_options).setopts(@options)
   end
-  
+
+  def vdi
+    Morpheus::VdiInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def vdi_pools
+    Morpheus::VdiPoolsInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def vdi_allocations
+    Morpheus::VdiAllocationsInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def vdi_apps
+    Morpheus::VdiAppsInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def vdi_gateways
+    Morpheus::VdiGatewaysInterface.new(common_interface_options).setopts(@options)
+  end
+
   # add new interfaces here
 
   protected