morpheus-cli 4.0.0.1 → 4.1.0

data/lib/morpheus/cli/option_types.rb

@@ -5,7 +5,6 @@ module Morpheus
     module OptionTypes
       include Term::ANSIColor
 
-
       def self.confirm(message,options={})
         if options[:yes] == true
           return true
@@ -237,9 +236,19 @@ module Morpheus
         return value
       end
 
+
+      def self.set_last_select(obj)
+        Thread.current[:_last_select] = obj
+      end
+
+      def self.get_last_select()
+        Thread.current[:_last_select]
+      end
+
       def self.select_prompt(option_type,api_client, api_params={}, no_prompt=false, use_value=nil)
         value_found = false
         value = nil
+        default_value = option_type['defaultValue']
         # local array of options
         if option_type['selectOptions']
           select_options = option_type['selectOptions']
@@ -272,9 +281,22 @@ module Morpheus
             print "\n"
             exit 1
           end
-        elsif !select_options.nil? && select_options.count == 1 && option_type['skipSingleOption'] == true
-          value_found = true
-          value = select_options[0]['value']
+        # skipSingleOption is no longer supported
+        # elsif !select_options.nil? && select_options.count == 1 && option_type['skipSingleOption'] == true
+        #   value_found = true
+        #   value = select_options[0]['value']
+        # if there is just one option, use it as the defaultValue
+        elsif !select_options.nil? && select_options.count == 1
+          if option_type['required'] && default_value.nil?
+            default_value = select_options[0]['name'] # name is prettier than value
+          end
+        elsif !select_options.nil?
+          if default_value.nil?
+            found_default_option = select_options.find {|opt| opt['isDefault'] == true }
+            if found_default_option
+              default_value = found_default_option['name'] # name is prettier than value
+            end
+          end
         end
 
         if no_prompt
@@ -314,18 +336,19 @@ module Morpheus
             }
             matches
           }
-          input = Readline.readline("#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? ('(' + option_type['fieldAddOn'] + ') ') : '' }#{!option_type['required'] ? ' (optional)' : ''}#{!option_type['defaultValue'].to_s.empty? ? ' ['+option_type['defaultValue'].to_s+']' : ''} ['?' for options]: ", false).to_s
+          input = Readline.readline("#{option_type['fieldLabel']}#{option_type['fieldAddOn'] ? ('(' + option_type['fieldAddOn'] + ') ') : '' }#{!option_type['required'] ? ' (optional)' : ''}#{!default_value.to_s.empty? ? ' ['+default_value.to_s+']' : ''} ['?' for options]: ", false).to_s
           input = input.chomp.strip
-          if input.empty?
-            value = option_type['defaultValue']
-          else
-            select_option = select_options.find{|b| b['name'] == input || (!b['value'].nil? && b['value'].to_s == input) || (b['value'].nil? && input.empty?)}
-            if select_option
-              value = select_option['value']
-            elsif !input.nil?  && !input.empty?
-              input = '?'
-            end
+          if input.empty? && default_value
+            input = default_value
+          end
+          select_option = select_options.find{|b| b['name'] == input || (!b['value'].nil? && b['value'].to_s == input) || (b['value'].nil? && input.empty?)}
+          if select_option
+            value = select_option['value']
+            set_last_select(select_option)
+          elsif !input.nil?  && !input.empty?
+            input = '?'
           end
+          
           if input == '?'
             help_prompt(option_type)
             display_select_options(option_type, select_options)

data/lib/morpheus/cli/roles.rb

@@ -286,10 +286,11 @@ class Morpheus::Cli::Roles
   def add(args)
     usage = "Usage: morpheus roles add [options]"
     options = {}
+    params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[options]")
       build_option_type_options(opts, options, add_role_option_types)
-      build_common_options(opts, options, [:options, :json, :dry_run, :remote])
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
 
@@ -300,51 +301,47 @@ class Morpheus::Cli::Roles
       account = find_account_from_options(options)
       account_id = account ? account['id'] : nil
 
-      # argh, some options depend on others here...eg. multitenant is only available when roleType == 'user'
-      #prompt_option_types = update_role_option_types()
+      passed_options = options[:options] ? options[:options].reject {|k,v| k.is_a?(Symbol) } : {}
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+        payload.deep_merge!({'role' => passed_options}) unless passed_options.empty?
+      else
+        # merge -O options into normally parsed options
+        params.deep_merge!(passed_options)
 
-      role_payload = {}
-      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'authority', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1}], options[:options])
-      role_payload['authority'] = v_prompt['authority']
-      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 2}], options[:options])
-      role_payload['description'] = v_prompt['description']
+        # argh, some options depend on others here...eg. multitenant is only available when roleType == 'user'
+        #prompt_option_types = update_role_option_types()
 
-      if @is_master_account
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'roleType', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => role_type_options, 'defaultValue' => 'user', 'displayOrder' => 3}], options[:options])
-        role_payload['roleType'] = v_prompt['roleType']
-      else
-        role_payload['roleType'] = 'user'
-      end
+        role_payload = params
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'authority', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1}], options[:options])
+        role_payload['authority'] = v_prompt['authority']
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 2}], options[:options])
+        role_payload['description'] = v_prompt['description']
 
-      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'baseRole', 'fieldLabel' => 'Copy From Role', 'type' => 'text', 'displayOrder' => 4}], options[:options])
-      if v_prompt['baseRole'].to_s != ''
-        base_role = find_role_by_name_or_id(account_id, v_prompt['baseRole'])
-        exit 1 if base_role.nil?
-        role_payload['baseRoleId'] = base_role['id']
-      end
+        if @is_master_account
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'roleType', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => role_type_options, 'defaultValue' => 'user', 'displayOrder' => 3}], options[:options])
+          role_payload['roleType'] = v_prompt['roleType']
+        else
+          role_payload['roleType'] = 'user'
+        end
 
-      if @is_master_account
-        if role_payload['roleType'] == 'user'
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'multitenant', 'fieldLabel' => 'Multitenant', 'type' => 'checkbox', 'defaultValue' => 'off', 'description' => 'A Multitenant role is automatically copied into all existing subaccounts as well as placed into a subaccount when created. Useful for providing a set of predefined roles a Customer can use', 'displayOrder' => 5}], options[:options])
-          role_payload['multitenant'] = ['on','true'].include?(v_prompt['multitenant'].to_s)
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'baseRole', 'fieldLabel' => 'Copy From Role', 'type' => 'text', 'displayOrder' => 4}], options[:options])
+        if v_prompt['baseRole'].to_s != ''
+          base_role = find_role_by_name_or_id(account_id, v_prompt['baseRole'])
+          exit 1 if base_role.nil?
+          role_payload['baseRoleId'] = base_role['id']
         end
-      end
 
-      role_payload['instanceLimits'] = {}
-      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'instanceLimits.maxStorage', 'fieldLabel' => 'Max Storage (bytes)', 'type' => 'text', 'displayOrder' => 8}], options[:options])
-      if v_prompt['instanceLimits.maxStorage'].to_s.strip != ''
-        role_payload['instanceLimits']['maxStorage'] = v_prompt['instanceLimits.maxStorage'].to_i
-      end
-      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'instanceLimits.maxMemory', 'fieldLabel' => 'Max Memory (bytes)', 'type' => 'text', 'displayOrder' => 9}], options[:options])
-      if v_prompt['instanceLimits.maxMemory'].to_s.strip != ''
-        role_payload['instanceLimits']['maxMemory'] = v_prompt['instanceLimits.maxMemory'].to_i
-      end
-      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'instanceLimits.maxCpu', 'fieldLabel' => 'CPU Count', 'type' => 'text', 'displayOrder' => 10}], options[:options])
-      if v_prompt['instanceLimits.maxCpu'].to_s.strip != ''
-        role_payload['instanceLimits']['maxCpu'] = v_prompt['instanceLimits.maxCpu'].to_i
-      end
+        if @is_master_account
+          if role_payload['roleType'] == 'user'
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'multitenant', 'fieldLabel' => 'Multitenant', 'type' => 'checkbox', 'defaultValue' => 'off', 'description' => 'A Multitenant role is automatically copied into all existing subaccounts as well as placed into a subaccount when created. Useful for providing a set of predefined roles a Customer can use', 'displayOrder' => 5}], options[:options])
+            role_payload['multitenant'] = ['on','true'].include?(v_prompt['multitenant'].to_s)
+          end
+        end
 
-      payload = {role: role_payload}
+        payload = {"role" => role_payload}
+      end
       @roles_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @roles_interface.dry.create(account_id, payload)
@@ -358,10 +355,17 @@ class Morpheus::Cli::Roles
         return
       end
 
+      role = json_response['role']
+      display_name = role['authority'] rescue ''
       if account
-        print_green_success "Added role #{role_payload['authority']} to account #{account['name']}"
+        print_green_success "Added role #{display_name} to account #{account['name']}"
       else
-        print_green_success "Added role #{role_payload['authority']}"
+        print_green_success "Added role #{display_name}"
+      end
+
+      get_args = [role['id']] + (options[:remote] ? ["-r",options[:remote]] : [])
+      if account
+        get_args.push "--account-id", account['id'].to_s
       end
 
       details_options = [role_payload["authority"]]
@@ -379,6 +383,7 @@ class Morpheus::Cli::Roles
   def update(args)
     usage = "Usage: morpheus roles update [name] [options]"
     options = {}
+    params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [options]")
       build_option_type_options(opts, options, update_role_option_types)
@@ -402,37 +407,32 @@ class Morpheus::Cli::Roles
       role = find_role_by_name_or_id(account_id, name)
       exit 1 if role.nil?
 
-      prompt_option_types = update_role_option_types()
-      if !@is_master_account
-        prompt_option_types = prompt_option_types.reject {|it| ['roleType', 'multitenant'].include?(it['fieldName']) }
-      end
-      if role['roleType'] != 'user'
-        prompt_option_types = prompt_option_types.reject {|it| ['multitenant'].include?(it['fieldName']) }
-      end
-      #params = Morpheus::Cli::OptionTypes.prompt(prompt_option_types, options[:options], @api_client, options[:params])
-      params = options[:options] || {}
-
-      if params.empty?
-        puts optparse
-        option_lines = prompt_option_types.collect {|it| "\t-O #{it['fieldName']}=\"value\"" }.join("\n")
-        puts "\nAvailable Options:\n#{option_lines}\n\n"
-        exit 1
-      end
+      passed_options = options[:options] ? options[:options].reject {|k,v| k.is_a?(Symbol) } : {}
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+        payload.deep_merge!({'role' => passed_options}) unless passed_options.empty?
+      else
+        # merge -O options into normally parsed options
+        params.deep_merge!(passed_options)
+        prompt_option_types = update_role_option_types()
+        if !@is_master_account
+          prompt_option_types = prompt_option_types.reject {|it| ['roleType', 'multitenant'].include?(it['fieldName']) }
+        end
+        if role['roleType'] != 'user'
+          prompt_option_types = prompt_option_types.reject {|it| ['multitenant'].include?(it['fieldName']) }
+        end
+        #params = Morpheus::Cli::OptionTypes.prompt(prompt_option_types, options[:options], @api_client, options[:params])
 
-      #puts "parsed params is : #{params.inspect}"
-      role_keys = ['authority', 'description', 'instanceLimits']
-      role_payload = params.select {|k,v| role_keys.include?(k) }
-      if !role_payload['instanceLimits']
-        role_payload['instanceLimits'] = {}
-        role_payload['instanceLimits']['maxStorage'] = params['instanceLimits.maxStorage'].to_i if params['instanceLimits.maxStorage'].to_s.strip != ''
-        role_payload['instanceLimits']['maxMemory'] = params['instanceLimits.maxMemory'].to_i if params['instanceLimits.maxMemory'].to_s.strip != ''
-        role_payload['instanceLimits']['maxCpu'] = params['instanceLimits.maxCpu'].to_i if params['instanceLimits.maxCpu'].to_s.strip != ''
-      end
+        if params.empty?
+          puts optparse
+          option_lines = prompt_option_types.collect {|it| "\t-O #{it['fieldName']}=\"value\"" }.join("\n")
+          puts "\nAvailable Options:\n#{option_lines}\n\n"
+          exit 1
+        end
 
-      if params['multitenant'].to_s != ''
-        role_payload['multitenant'] = ['on','true'].include?(params['multitenant'].to_s)
+        payload = {"role" => params}
       end
-      payload = {role: role_payload}
       @roles_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @roles_interface.dry.update(account_id, role['id'], payload)
@@ -444,14 +444,15 @@ class Morpheus::Cli::Roles
         print "\n"
         return
       end
+      role = json_response['role']
+      display_name = role['authority'] rescue ''
+      print_green_success "Updated role #{display_name}"
 
-      print_green_success "Updated role #{role_payload['authority']}"
-
-      details_options = [role_payload["authority"] || role['authority']]
+      get_args = [role['id']] + (options[:remote] ? ["-r",options[:remote]] : [])
       if account
-        details_options.push "--account-id", account['id'].to_s
+        get_args.push "--account-id", account['id'].to_s
       end
-      get(details_options)
+      get(get_args)
 
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -1180,9 +1181,9 @@ class Morpheus::Cli::Roles
       {'fieldName' => 'roleType', 'fieldLabel' => 'Role Type', 'type' => 'select', 'selectOptions' => [{'name' => 'User Role', 'value' => 'user'}, {'name' => 'Account Role', 'value' => 'account'}], 'defaultValue' => 'user', 'displayOrder' => 3},
       {'fieldName' => 'baseRole', 'fieldLabel' => 'Copy From Role', 'type' => 'text', 'displayOrder' => 4},
       {'fieldName' => 'multitenant', 'fieldLabel' => 'Multitenant', 'type' => 'checkbox', 'defaultValue' => 'off', 'description' => 'A Multitenant role is automatically copied into all existing subaccounts as well as placed into a subaccount when created. Useful for providing a set of predefined roles a Customer can use', 'displayOrder' => 5},
-      {'fieldName' => 'instanceLimits.maxStorage', 'fieldLabel' => 'Max Storage (bytes)', 'type' => 'text', 'displayOrder' => 8},
-      {'fieldName' => 'instanceLimits.maxMemory', 'fieldLabel' => 'Max Memory (bytes)', 'type' => 'text', 'displayOrder' => 9},
-      {'fieldName' => 'instanceLimits.maxCpu', 'fieldLabel' => 'CPU Count', 'type' => 'text', 'displayOrder' => 10},
+      # {'fieldName' => 'instanceLimits.maxStorage', 'fieldLabel' => 'Max Storage (bytes)', 'type' => 'text', 'displayOrder' => 8},
+      # {'fieldName' => 'instanceLimits.maxMemory', 'fieldLabel' => 'Max Memory (bytes)', 'type' => 'text', 'displayOrder' => 9},
+      # {'fieldName' => 'instanceLimits.maxCpu', 'fieldLabel' => 'CPU Count', 'type' => 'text', 'displayOrder' => 10},
     ]
   end
 

data/lib/morpheus/cli/user_settings_command.rb

@@ -28,6 +28,9 @@ class Morpheus::Cli::UserSettingsCommand
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
+      opts.on("--user-id ID", String, "User ID") do |val|
+        params['userId'] = val.to_s
+      end
       build_common_options(opts, options, [:query, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "Get your user settings."
     end
@@ -107,6 +110,9 @@ class Morpheus::Cli::UserSettingsCommand
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[options]")
+      opts.on("--user-id ID", String, "User ID") do |val|
+        params['userId'] = val.to_s
+      end
       build_common_options(opts, options, [:payload, :options, :json, :dry_run, :quiet, :remote])
       opts.footer = "Update your user settings."
     end
@@ -144,7 +150,8 @@ class Morpheus::Cli::UserSettingsCommand
       end
 
       print_green_success "Updated user settings"
-      get([])
+      get_args = [] + (options[:remote] ? ["-r",options[:remote]] : []) + (params['userId'] ? ['--user-id', params['userId'].to_s] : [])
+      get(get_args)
       return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -157,6 +164,9 @@ class Morpheus::Cli::UserSettingsCommand
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[file]")
+      opts.on("--user-id ID", String, "User ID") do |val|
+        params['userId'] = val.to_s
+      end
       build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
       opts.footer = "Update your avatar profile image.\n" +
                     "[file] is required. This is the local path of a file to upload [png|jpg|svg]."
@@ -194,7 +204,8 @@ class Morpheus::Cli::UserSettingsCommand
       end
 
       print_green_success "Updated avatar"
-      get([])
+      get_args = [] + (options[:remote] ? ["-r",options[:remote]] : []) + (params['userId'] ? ['--user-id', params['userId'].to_s] : [])
+      get(get_args)
       return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -207,6 +218,9 @@ class Morpheus::Cli::UserSettingsCommand
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[file]")
+      opts.on("--user-id ID", String, "User ID") do |val|
+        params['userId'] = val.to_s
+      end
       build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
       opts.footer = "Remove your avatar profile image."
     end
@@ -233,7 +247,8 @@ class Morpheus::Cli::UserSettingsCommand
       end
 
       print_green_success "Removed avatar"
-      get([])
+      get_args = [] + (options[:remote] ? ["-r",options[:remote]] : []) + (params['userId'] ? ['--user-id', params['userId'].to_s] : [])
+      get(get_args)
       return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -247,6 +262,9 @@ class Morpheus::Cli::UserSettingsCommand
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
+      opts.on("--user-id ID", String, "User ID") do |val|
+        params['userId'] = val.to_s
+      end
       build_common_options(opts, options, [:remote])
       opts.footer = "View your avatar profile image.\n" +
                     "This opens the avatar image url with a web browser."
@@ -291,6 +309,9 @@ class Morpheus::Cli::UserSettingsCommand
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[client-id]")
+      opts.on("--user-id ID", String, "User ID") do |val|
+        params['userId'] = val.to_s
+      end
       build_common_options(opts, options, [:payload, :options, :json, :dry_run, :quiet, :remote])
       opts.footer = "Regenerate API access token for a specific client.\n" +
                     "[client-id] is required. This is the id of an api client."
@@ -326,7 +347,8 @@ class Morpheus::Cli::UserSettingsCommand
         return 0
       end
       print_green_success "Regenerated #{params['clientId']} access token: #{new_access_token}"
-      get([])
+      get_args = [] + (options[:remote] ? ["-r",options[:remote]] : []) + (params['userId'] ? ['--user-id', params['userId'].to_s] : [])
+      get(get_args)
       return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -340,6 +362,9 @@ class Morpheus::Cli::UserSettingsCommand
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[client-id]")
+      opts.on("--user-id ID", String, "User ID") do |val|
+        params['userId'] = val.to_s
+      end
       build_common_options(opts, options, [:payload, :options, :json, :dry_run, :quiet, :remote])
       opts.footer = "Clear API access token for a specific client.\n" +
                     "[client-id] is required. This is the id of an api client."
@@ -375,7 +400,8 @@ class Morpheus::Cli::UserSettingsCommand
       if params['clientId'] == 'morph-cli'
         print yellow,"Your current access token is no longer valid, you will need to login again.",reset,"\n"
       end
-      #get([])
+      # get_args = [] + (options[:remote] ? ["-r",options[:remote]] : []) + (params['userId'] ? ['--user-id', params['userId'].to_s] : [])
+      # get(get_args)
       return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
@@ -389,6 +415,9 @@ class Morpheus::Cli::UserSettingsCommand
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
+      # opts.on("--user-id ID", String, "User ID") do |val|
+      #   params['userId'] = val.to_s
+      # end
       build_common_options(opts, options, [:query, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "List available api clients."
     end

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "4.0.0.1"
+    VERSION = "4.1.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 4.0.0.1
+  version: 4.1.0
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-09 00:00:00.000000000 Z
+date: 2019-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,6 +156,7 @@ files:
 - README.md
 - Rakefile
 - bin/morpheus
+- lib/morpheus/api.rb
 - lib/morpheus/api/account_groups_interface.rb
 - lib/morpheus/api/accounts_interface.rb
 - lib/morpheus/api/api_client.rb
@@ -169,6 +170,7 @@ files:
 - lib/morpheus/api/cloud_policies_interface.rb
 - lib/morpheus/api/cloud_resource_pools_interface.rb
 - lib/morpheus/api/clouds_interface.rb
+- lib/morpheus/api/clusters_interface.rb
 - lib/morpheus/api/containers_interface.rb
 - lib/morpheus/api/custom_instance_types_interface.rb
 - lib/morpheus/api/cypher_interface.rb
@@ -188,6 +190,7 @@ files:
 - lib/morpheus/api/instance_types_interface.rb
 - lib/morpheus/api/instances_interface.rb
 - lib/morpheus/api/key_pairs_interface.rb
+- lib/morpheus/api/library_compute_type_layouts_interface.rb
 - lib/morpheus/api/library_container_scripts_interface.rb
 - lib/morpheus/api/library_container_templates_interface.rb
 - lib/morpheus/api/library_container_types_interface.rb
@@ -211,6 +214,8 @@ files:
 - lib/morpheus/api/network_pools_interface.rb
 - lib/morpheus/api/network_proxies_interface.rb
 - lib/morpheus/api/network_services_interface.rb
+- lib/morpheus/api/network_subnet_types_interface.rb
+- lib/morpheus/api/network_subnets_interface.rb
 - lib/morpheus/api/network_types_interface.rb
 - lib/morpheus/api/networks_interface.rb
 - lib/morpheus/api/old_cypher_interface.rb
@@ -228,8 +233,10 @@ files:
 - lib/morpheus/api/security_groups_interface.rb
 - lib/morpheus/api/server_types_interface.rb
 - lib/morpheus/api/servers_interface.rb
+- lib/morpheus/api/service_plans_interface.rb
 - lib/morpheus/api/setup_interface.rb
 - lib/morpheus/api/storage_providers_interface.rb
+- lib/morpheus/api/subnets_interface.rb
 - lib/morpheus/api/task_sets_interface.rb
 - lib/morpheus/api/tasks_interface.rb
 - lib/morpheus/api/user_groups_interface.rb
@@ -256,6 +263,7 @@ files:
 - lib/morpheus/cli/cloud_folders_command.rb
 - lib/morpheus/cli/cloud_resource_pools_command.rb
 - lib/morpheus/cli/clouds.rb
+- lib/morpheus/cli/clusters.rb
 - lib/morpheus/cli/command_error.rb
 - lib/morpheus/cli/commands/standard/alias_command.rb
 - lib/morpheus/cli/commands/standard/benchmark_command.rb