morpheus-cli 4.2.1 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46d92f279d50a64ebeb6f5c08623f9e54573cbf4855f08f2bfbb6a201b706522
-  data.tar.gz: 19c96eb29f3afc1943d6e52667fac9be0364a8d8e87d9b2d04da13671d2b68c4
+  metadata.gz: 44226a558c2f02d9ca3aea75025930a2adb9c8b63e41fa6437d14ad55f34211b
+  data.tar.gz: debee18e47a2930a5da5cf2085d6463ce23171a70e875bbe81dc33d68ec1b640
 SHA512:
-  metadata.gz: d7267a3cfbc6052d7963dcda64401c289031b65b12779721361154dfdbf6344195779a8b44d8da5b45a0d52a1b06c5f53cd8a4cf07b300693e23ec71463adaf6
-  data.tar.gz: bca94b7c92c9c420224a5695d05f8f35f89c8211c61c74b3e106b2789439df2a46ab8f7adcee04654655cbff6275fddf5da68408f9691711c25152fcb9636c81
+  metadata.gz: b3d6087cb623b08e6adabe1bf9e8f214b38c9eef2a627a47442b30c3f9523c7a5487fdff61c63f4fef885176695fc595cd0d751287a3e42b8edbebbf984b06f8
+  data.tar.gz: ab8829f3d013e6ef4345447f90cd2defb13e2d91491f5b860ad44fe06ac022b3e2bf8baa3c12e525ab7e33f527e7b51b35043538ab82a52e79c5d628fff3dd0f

data/Dockerfile

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

data/lib/morpheus/api/api_client.rb

@@ -319,6 +319,10 @@ class Morpheus::APIClient
     Morpheus::CloudFoldersInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
+  def datastores
+    Morpheus::DatastoresInterface.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).setopts(@options)
   end
@@ -335,6 +339,14 @@ class Morpheus::APIClient
     Morpheus::ProvisioningSettingsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
+  def provisioning_licenses
+    Morpheus::ProvisioningLicensesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+  end
+
+  def provisioning_license_types
+    Morpheus::ProvisioningLicenseTypesInterface.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).setopts(@options)
   end
@@ -670,6 +682,10 @@ class Morpheus::APIClient
     Morpheus::HealthInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
-  # new interfaces get added here
+  def invoices
+    Morpheus::InvoicesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+  end
+
+  # add new interfaces here
 
 end

data/lib/morpheus/api/datastores_interface.rb

@@ -0,0 +1,18 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::DatastoresInterface < Morpheus::APIClient
+  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil, api='data-stores')
+    @access_token = access_token
+    @refresh_token = refresh_token
+    @base_url = base_url
+    @api_url = "#{base_url}/api/#{api}"
+    @expires_at = expires_at
+  end
+
+  def list(params={})
+    url = @api_url
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
+
+end

data/lib/morpheus/api/invoices_interface.rb

@@ -0,0 +1,24 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::InvoicesInterface < 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/invoices/#{id}"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
+
+  def list(params={})
+    url = "#{@base_url}/api/invoices"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
+
+end

data/lib/morpheus/api/provisioning_license_types_interface.rb

@@ -0,0 +1,37 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::ProvisioningLicenseTypesInterface < Morpheus::APIClient
+  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil) 
+    @access_token = access_token
+    @refresh_token = refresh_token
+    @base_url = base_url
+    @expires_at = expires_at
+  end
+
+  def get(id, params={})
+    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
+    url = build_url(id)
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def list(params={})
+    url = build_url()
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  private
+
+  def build_url(id=nil)
+    url = "#{@base_url}/api/provisioning-license-types"
+    if id
+      url += "/#{id}"
+    end
+    url
+  end
+
+
+end

data/lib/morpheus/api/provisioning_licenses_interface.rb

@@ -0,0 +1,66 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::ProvisioningLicensesInterface < Morpheus::APIClient
+  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil) 
+    @access_token = access_token
+    @refresh_token = refresh_token
+    @base_url = base_url
+    @expires_at = expires_at
+  end
+
+  def get(id, params={})
+    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
+    url = build_url(id)
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def list(params={})
+    url = build_url()
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def create(payload)
+    url = build_url()
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def update(id, payload)
+    url = build_url(id)
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def destroy(id, params={})
+    url = build_url(id)
+    headers = { :params => params, :authorization => "Bearer #{@access_token}"}
+    opts = {method: :delete, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def reservations(id, params={})
+    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
+    url = build_url(id) + "/reservations"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  private
+
+  def build_url(id=nil)
+    url = "#{@base_url}/api/provisioning-licenses"
+    if id
+      url += "/#{id}"
+    end
+    url
+  end
+
+
+end

data/lib/morpheus/cli.rb

@@ -161,9 +161,11 @@ module Morpheus
       load 'morpheus/cli/price_sets_command.rb'
       load 'morpheus/cli/prices_command.rb'
       load 'morpheus/cli/provisioning_settings_command.rb'
+      load 'morpheus/cli/provisioning_licenses_command.rb'
       load 'morpheus/cli/budgets_command.rb'
       load 'morpheus/cli/health_command.rb'
-      # Your new commands go here...
+      load 'morpheus/cli/invoices_command.rb'
+      # add new commands here...
 
     end
 

data/lib/morpheus/cli/invoices_command.rb

@@ -0,0 +1,339 @@
+require 'morpheus/cli/cli_command'
+require 'date'
+
+class Morpheus::Cli::InvoicesCommand
+  include Morpheus::Cli::CliCommand
+
+  set_command_name :'invoices'
+
+  register_subcommands :list, :get
+  
+  def connect(opts)
+    @api_client = establish_remote_appliance_connection(opts)
+    @invoices_interface = @api_client.invoices
+  end
+
+  def handle(args)
+    handle_subcommand(args)
+  end
+
+  def list(args)
+    options = {}
+    params = {}
+    ref_ids = []
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage()
+      opts.on('--type TYPE', String, "Find invoices for a Ref Type eg. ComputeSite (Group), ComputeZone (Cloud), ComputeServer (Host), Instance, Container, User") do |val|
+        if val.to_s.downcase == 'cloud' || val.to_s.downcase == 'zone'
+          params['refType'] = 'ComputeZone'
+        elsif val.to_s.downcase == 'instance'
+          params['refType'] = 'Instance'
+        elsif val.to_s.downcase == 'server' || val.to_s.downcase == 'host'
+          params['refType'] = 'ComputeServer'
+        elsif val.to_s.downcase == 'cluster'
+          params['refType'] = 'ComputeServerGroup'
+        elsif val.to_s.downcase == 'group'
+          params['refType'] = 'ComputeSite'
+        elsif val.to_s.downcase == 'user'
+          params['refType'] = 'User'
+        else
+          params['refType'] = val
+        end
+      end
+      opts.on('--ref-id ID', String, "Find invoices for a Ref ID") do |val|
+        ref_ids << val
+      end
+      opts.on('--group ID', String, "Find invoices for a Group") do |val|
+        # params['siteId'] = val
+        params['refType'] = 'ComputeSite'
+        ref_ids << val
+      end
+      opts.on('--cloud ID', String, "Find invoices for a Cloud") do |val|
+        # params['zoneId'] = val
+        params['refType'] = 'ComputeZone'
+        ref_ids << val
+      end
+      opts.on('--instance ID', String, "Find invoices for an Instance") do |val|
+        # params['instanceId'] = val
+        params['refType'] = 'Instance'
+        ref_ids << val
+      end
+      opts.on('--container ID', String, "Find invoices for a Container") do |val|
+        # params['instanceId'] = val
+        params['refType'] = 'Container'
+        ref_ids << val
+      end
+      opts.on('--server ID', String, "Find invoices for a Server (Host)") do |val|
+        # params['serverId'] = val
+        params['refType'] = 'ComputeServer'
+        ref_ids << val
+      end
+      opts.on('--user ID', String, "Find invoices for a User") do |val|
+        # params['userId'] = val
+        params['refType'] = 'User'
+        ref_ids << val
+      end
+      # opts.on('--cluster ID', String, "Filter by Cluster") do |val|
+      #   # params['clusterId'] = val
+      #   params['refType'] = 'ComputeServerGroup'
+      #   params['refId'] = val.to_i
+      # end
+      opts.on('--start DATE', String, "Start date in the format YYYY-MM-DD.") do |val|
+        params['startDate'] = val #parse_time(val).utc.iso8601
+      end
+      opts.on('--end DATE', String, "End date in the format YYYY-MM-DD. Default is now.") do |val|
+        params['endDate'] = val #parse_time(val).utc.iso8601
+      end
+      opts.on('--period PERIOD', String, "Period in the format YYYYMM. This can be used instead of start/end.") do |val|
+        params['period'] = parse_period(val)
+      end
+      opts.on('--active [true|false]',String, "Filter by active.") do |val|
+        params['active'] = (val.to_s != 'false' && val.to_s != 'off')
+      end
+      opts.on('--tenant ID', String, "View invoices for a tenant. Default is your own account.") do |val|
+        params['accountId'] = val
+      end
+      build_standard_list_options(opts, options)
+      opts.footer = "List invoices."
+    end
+    optparse.parse!(args)
+    connect(options)
+    if args.count > 0
+      print_error Morpheus::Terminal.angry_prompt
+      puts_error  "wrong number of arguments, expected 0 and got (#{args.count}) #{args.join(', ')}\n#{optparse}"
+      return 1
+    end
+    begin
+      params['refId'] = ref_ids unless ref_ids.empty?
+      params.merge!(parse_list_options(options))
+      @invoices_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @invoices_interface.dry.list(params)
+        return
+      end
+      json_response = @invoices_interface.list(params)
+      render_result = render_with_format(json_response, options, 'invoice')
+      return 0 if render_result
+      invoices = json_response['invoices']
+      title = "Morpheus Invoices"
+      subtitles = []
+      if params['status']
+        subtitles << "Status: #{params['status']}"
+      end
+      if params['alarmStatus'] == 'acknowledged'
+        subtitles << "(Acknowledged)"
+      end
+      if params['startDate']
+        subtitles << "Start Date: #{params['startDate']}"
+      end
+      if params['endDate']
+        subtitles << "End Date: #{params['endDate']}"
+      end
+      subtitles += parse_list_subtitles(options)
+      print_h1 title, subtitles
+      if invoices.empty?
+        print cyan,"No invoices found.",reset,"\n"
+      else
+        print_invoices_table(invoices, options)
+        print_results_pagination(json_response, {:label => "invoice", :n_label => "invoices"})
+      end
+      print reset,"\n"
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      return 1
+    end
+  end
+  
+  def get(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[id]")
+      build_standard_get_options(opts, options)
+      opts.footer = "Get details about a specific invoice."
+    end
+    optparse.parse!(args)
+    if args.count < 1
+      puts optparse
+      return 1
+    end
+    connect(options)
+    id_list = parse_id_list(args)
+    return run_command_for_each_arg(id_list) do |arg|
+      _get(arg, options)
+    end
+  end
+
+  def _get(id, options)
+
+    begin
+      @invoices_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @invoices_interface.dry.get(id)
+        return
+      end
+      json_response = @invoices_interface.get(id)
+      invoice = json_response['invoice']
+      render_result = render_with_format(json_response, options, 'invoice')
+      return 0 if render_result
+
+      print_h1 "Invoice Details"
+      print cyan
+
+      
+      description_cols = {
+        "Invoice ID" => lambda {|it| it['id'] },
+        "Type" => lambda {|it| format_invoice_ref_type(it) },
+        "Ref ID" => lambda {|it| it['refId'] },
+        "Ref Name" => lambda {|it| it['refName'] },
+        "Plan" => lambda {|it| it['plan'] ? it['plan']['name'] : '' },
+        "Account" => lambda {|it| it['account'] ? it['account']['name'] : '' },
+        "Active" => lambda {|it| format_boolean(it['active']) },
+        "Period" => lambda {|it| format_invoice_period(it) },
+        #"Interval" => lambda {|it| it['interval'] },
+        "Start" => lambda {|it| format_local_dt(it['startDate']) },
+        "End" => lambda {|it| it['endDate'] ? format_local_dt(it['endDate']) : '' },
+        "Estimate" => lambda {|it| format_boolean(it['estimate']) },
+        "Price" => lambda {|it| format_money(it['totalPrice']) },
+        "Cost" => lambda {|it| format_money(it['totalCost']) },
+        # "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+        # "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
+      }
+      print_description_list(description_cols, invoice)
+
+      if invoice['rawData'] && !invoice['rawData'].empty?
+        print_h2 "Raw Data"
+        puts invoice['rawData']
+      end
+      
+
+      print reset,"\n"
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      return 1
+    end
+  end
+
+  private
+
+  # def find_invoice_by_name_or_id(val)
+  #   if val.to_s =~ /\A\d{1,}\Z/
+  #     return find_invoice_by_id(val)
+  #   else
+  #     return find_invoice_by_name(val)
+  #   end
+  # end
+
+  def find_invoice_by_id(id)
+    begin
+      json_response = @invoices_interface.get(id.to_i)
+      return json_response['invoice']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Invoice not found by id #{id}"
+      else
+        raise e
+      end
+    end
+  end
+
+  # def find_invoice_by_name(name)
+  #   invoices = @invoices_interface.list({name: name.to_s})['invoices']
+  #   if invoices.empty?
+  #     print_red_alert "Invoice not found by name #{name}"
+  #     return nil
+  #   elsif invoices.size > 1
+  #     print_red_alert "#{invoices.size} invoices found by name #{name}"
+  #     print_invoices_table(invoices, {color: red})
+  #     print_red_alert "Try using ID instead"
+  #     print reset,"\n"
+  #     return nil
+  #   else
+  #     return invoices[0]
+  #   end
+  # end
+
+  def print_invoices_table(invoices, opts={})
+    columns = [
+      {"INVOICE ID" => lambda {|it| it['id'] } },
+      {"TYPE" => lambda {|it| format_invoice_ref_type(it) } },
+      {"REF ID" => lambda {|it| it['refId'] } },
+      {"REF NAME" => lambda {|it| it['refName'] } },
+      #{"INTERVAL" => lambda {|it| it['interval'] } },
+      {"ACCOUNT" => lambda {|it| it['account'] ? it['account']['name'] : '' } },
+      {"ACTIVE" => lambda {|it| format_boolean(it['active']) } },
+      {"PERIOD" => lambda {|it| format_invoice_period(it) } },
+      {"START" => lambda {|it| format_local_dt(it['startDate']) } },
+      {"END" => lambda {|it| it['endDate'] ? format_local_dt(it['endDate']) : '' } },
+      {"PRICE" => lambda {|it| format_money(it['totalPrice']) } },
+      {"COST" => lambda {|it| format_money(it['totalCost']) } },
+    ]
+    if opts[:include_fields]
+      columns = opts[:include_fields]
+    end
+    print as_pretty_table(invoices, columns, opts)
+  end
+
+  def format_invoice_ref_type(it)
+    if it['refType'] == 'ComputeZone'
+      "Cloud"
+    elsif it['refType'] == 'Instance'
+      "Instance"
+    elsif it['refType'] == 'ComputeServer'
+      "Host"
+    elsif it['refType'] == 'ComputeServerGroup'
+      "Cluster"
+    elsif it['refType'] == 'ComputeSite'
+      "Group"
+    else
+      it['refType']
+    end
+  end
+
+  # convert "202003" to "March 2020"
+  def format_invoice_period(it)
+    interval = it['interval']
+    period = it['period']
+    if period
+      if interval == 'month'
+        year = period[0..3]
+        month = period[4..5]
+        if year && month
+          month_name = Date::MONTHNAMES[month.to_i] || "#{month}?"
+          return "#{month_name} #{year}"
+        else
+          return "#{year}"
+        end
+      else
+        return it['period']
+      end
+    else
+      return "n/a"
+    end
+  end
+
+  # convert "March 2020" to "202003"
+  def parse_period(period, interval='month')
+    if period
+      if interval == 'month'
+        if period.include?(" ")
+          period_parts = period.split(" ")
+          month = Date::MONTHNAMES.index(period_parts[0])
+          year = period_parts[1].to_i
+          if month
+            return "#{year}#{month.to_s.rjust(2, '0')}"
+          else
+            return "#{year}00" # meh, bad month name, raise error probably
+          end
+        else
+          return "#{period}"
+        end
+      else
+        return "#{period}"
+      end
+    else
+      return nil
+    end
+  end
+
+end

data/lib/morpheus/cli/mixins/provisioning_helper.rb

@@ -41,6 +41,10 @@ module Morpheus::Cli::ProvisioningHelper
     @api_client.cloud_datastores
   end
 
+  def datastores_interface
+    @api_client.datastores
+  end
+
   def accounts_interface
     @api_client.accounts
   end
@@ -323,10 +327,10 @@ module Morpheus::Cli::ProvisioningHelper
       available_clouds = get_available_clouds(group_id)
       cloud_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cloud', 'type' => 'select', 'fieldLabel' => 'Cloud', 'selectOptions' => get_available_clouds(group_id), 'required' => true, 'description' => 'Select Cloud.', 'defaultValue' => options[:default_cloud] ? options[:default_cloud] : nil}],options[:options],api_client,{groupId: group_id})
       cloud_id = cloud_prompt['cloud']
+      cloud = available_clouds.find {|it| it['value'] == cloud_id}
     end
 
-    cloud = clouds_interface.get(cloud_id)['zone']
-    cloud_type = cloud['zoneType'] || {}
+    cloud_type = clouds_interface.cloud_type(cloud['zoneTypeId'])
 
     # Instance Type
     instance_type_code = nil
@@ -371,6 +375,7 @@ module Morpheus::Cli::ProvisioningHelper
 
     # config
     config = {}
+=begin
     if cloud_type['code'] == 'amazon' && (cloud['config'] || {})['isVpc'] == 'false' && (cloud['config'] || {})['vpc'] == ''
       config['isEC2'] = true
     else
@@ -382,6 +387,7 @@ module Morpheus::Cli::ProvisioningHelper
         config['isVpcSelectable'] = true
       end
     end
+=end
 
     payload = {
       'zoneId' => cloud_id,
@@ -490,7 +496,8 @@ module Morpheus::Cli::ProvisioningHelper
       layout_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'layout', 'type' => 'select', 'fieldLabel' => 'Layout', 'optionSource' => 'layoutsForCloud', 'required' => true, 'description' => 'Select which configuration of the instance type to be provisioned.', 'defaultValue' => default_layout_value}],options[:options],api_client,{groupId: group_id, cloudId: cloud_id, instanceTypeId: instance_type['id'], version: version_value, creatable: true})['layout']
     end
 
-    layout = find_instance_type_layout_by_id(instance_type['id'], layout_id.to_i)
+    # layout = find_instance_type_layout_by_id(instance_type['id'], layout_id.to_i)
+    layout = (instance_type['instanceTypeLayouts'] || []).find {|it| it['id'] == layout_id.to_i }
     if !layout
       print_red_alert "Layout not found by id #{layout_id}"
       exit 1
@@ -587,6 +594,7 @@ module Morpheus::Cli::ProvisioningHelper
         elsif resource_pool_prompt[resource_pool_option_type['fieldName']]
           pool_id = resource_pool_prompt[resource_pool_option_type['fieldName']]
         end
+        resource_pool ||= resource_pool_options.find {|it| it['id'] == pool_id}
       end
     end
 
@@ -600,23 +608,33 @@ module Morpheus::Cli::ProvisioningHelper
       # add selectable datastores for resource pool
       if options[:select_datastore]
         begin
-          service_plan['datastores'] = {'cluster' => [], 'store' => []}
-          selectable_datastores = cloud_datastores_interface.selectable(cloud_id, {'siteId' => group_id, 'resourcePoolId' => resource_pool['id']})
-          ['cluster', 'store'].each do |type|
+          selectable_datastores = datastores_interface.list({'zoneId' => cloud_id, 'siteId' => group_id, 'resourcePoolId' => resource_pool['id']})
+          service_plan['datastores'] = {'clusters' => [], 'datastores' => []}
+          ['clusters', 'datastores'].each do |type|
             service_plan['datastores'][type] ||= []
             selectable_datastores[type].reject { |ds| service_plan['datastores'][type].find {|it| it['id'] == ds['id']} }.each { |ds|
               service_plan['datastores'][type] << ds
             }
           end
         rescue => error
+          Morpheus::Logging::DarkPrinter.puts "Unable to load available data-stores, using datastores option source instead." if Morpheus::Logging.debug?
         end
 
         if provision_type && provision_type['supportsAutoDatastore']
+          service_plan['supportsAutoDatastore'] = true
           service_plan['autoOptions'] ||= []
-          if service_plan['datastores']['cluster'].count > 0 && !service_plan['autoOptions'].find {|it| it['id'] == 'autoCluster'}
+          if service_plan['datastores'] && service_plan['datastores']['clusters']
+            if service_plan['datastores']['clusters'].count > 0 && !service_plan['autoOptions'].find {|it| it['id'] == 'autoCluster'}
+              service_plan['autoOptions'] << {'id' => 'autoCluster', 'name' => 'Auto - Cluster'}
+            end
+          else
             service_plan['autoOptions'] << {'id' => 'autoCluster', 'name' => 'Auto - Cluster'}
           end
-          if service_plan['datastores']['store'].count > 0 && !service_plan['autoOptions'].find {|it| it['id'] == 'auto'}
+          if service_plan['datastores'] && service_plan['datastores']['datastores']
+            if service_plan['datastores']['datastores'].count > 0 && !service_plan['autoOptions'].find {|it| it['id'] == 'auto'}
+              service_plan['autoOptions'] << {'id' => 'auto', 'name' => 'Auto - Datastore'}
+            end
+          else
             service_plan['autoOptions'] << {'id' => 'auto', 'name' => 'Auto - Datastore'}
           end
         end
@@ -767,6 +785,8 @@ module Morpheus::Cli::ProvisioningHelper
       plan_info['datastores'].each do |k, v|
         v.each do |opt|
           if !opt.nil?
+            k = 'datastores' if k == 'store'
+            k = 'clusters' if k == 'cluster'
             datastore_options << {'name' => "#{k}: #{opt['name']}", 'value' => opt['id']}
           end
         end

data/lib/morpheus/cli/option_types.rb

@@ -1,5 +1,6 @@
 require 'term/ansicolor'
 require 'readline'
+require 'csv'
 module Morpheus
   module Cli
     module OptionTypes
@@ -106,9 +107,21 @@ module Morpheus
             input_value = ['select', 'multiSelect'].include?(option_type['type']) && option_type['fieldInput'] ? cur_namespace[option_type['fieldInput']] : nil
             if option_type['type'] == 'number'
               value = value.to_s.include?('.') ? value.to_f : value.to_i
-            elsif ['select', 'multiSelect'].include?(option_type['type'])
-              # this should just fall down through below, with the extra params no_prompt, use_value
+            # these select prompts should just fall down through below, with the extra params no_prompt, use_value
+            elsif option_type['type'] == 'select'
               value = select_prompt(option_type.merge({'defaultValue' => value, 'defaultInputValue' => input_value}), api_client, (api_params || {}).merge(results), true)
+            elsif option_type['type'] == 'multiSelect'
+              value_list = value.is_a?(String) ? value.parse_csv : [value].flatten
+              input_value_list = input_value.is_a?(String) ? input_value.parse_csv : [input_value].flatten
+              if value_list.size > 1
+                select_value_list = []
+                value_list.each_with_index do |v, i|
+                  select_value_list << select_prompt(option_type.merge({'defaultValue' => v, 'defaultInputValue' => input_value_list[i]}), api_client, (api_params || {}).merge(results), true)
+                end
+                value = select_value_list
+              else
+                value = select_prompt(option_type.merge({'defaultValue' => value, 'defaultInputValue' => input_value}), api_client, (api_params || {}).merge(results), true)
+              end
             end
             if options[:always_prompt] != true
               value_found = true
@@ -125,7 +138,7 @@ module Morpheus
           no_prompt = no_prompt || options[:no_prompt]
           if no_prompt
             if !value_found
-              if option_type['defaultValue'] != nil && option_type['type'] != 'select'
+              if option_type['defaultValue'] != nil && !['select', 'multiSelect'].include?(option_type['type'])
                 value = option_type['defaultValue']
                 value_found = true
               end

data/lib/morpheus/cli/provisioning_licenses_command.rb

@@ -0,0 +1,506 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::ProvisioningLicensesCommand
+  include Morpheus::Cli::CliCommand
+  set_command_name :'provisioning-licenses'
+  register_subcommands :list, :get, :add, :update, :remove, :reservations, :'list-types'
+
+  set_command_hidden
+  
+  def connect(opts)
+    @api_client = establish_remote_appliance_connection(opts)
+    @provisioning_licenses_interface = @api_client.provisioning_licenses
+    @provisioning_license_types_interface = @api_client.provisioning_license_types
+    @virtual_images_interface = @api_client.virtual_images
+    @options_interface = @api_client.options
+  end
+
+  def handle(args)
+    handle_subcommand(args)
+  end
+
+  def list(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage()
+      build_standard_list_options(opts, options)
+      opts.footer = "List licenses."
+    end
+    optparse.parse!(args)
+    if args.count != 0
+      raise_command_error "wrong number of arguments, expected 0 and got (#{args.count}) #{args}\n#{optparse}"
+    end
+    connect(options)
+    begin
+      params.merge!(parse_list_options(options))
+      @provisioning_licenses_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @provisioning_licenses_interface.dry.list(params)
+        return 0
+      end
+      json_response = @provisioning_licenses_interface.list(params)
+      render_result = render_with_format(json_response, options, 'licenses')
+      return 0 if render_result
+      licenses = json_response['licenses']
+
+      title = "Morpheus Licenses"
+      subtitles = []
+      subtitles += parse_list_subtitles(options)
+      print_h1 title, subtitles
+      if licenses.empty?
+        print cyan,"No licenses found.",reset,"\n"
+      else
+        columns = [
+          {"ID" => lambda {|license| license['id'] } },
+          {"NAME" => lambda {|license| license['name'] } },
+          {"LICENSE TYPE" => lambda {|license| license['licenseType']['name'] rescue license['licenseType'] } },
+          {"COPIES" => lambda {|license| 
+            "#{license['reservationCount']}/#{license['copies']}"
+          } },
+          {"TENANTS" => lambda {|it| it['tenants'] ? it['tenants'].collect {|acnt| acnt['name']}.join(', ') : '' } },
+          {"VIRTUAL IMAGES" => lambda {|it| it['virtualImages'] ? it['virtualImages'].collect {|v| v['name']}.join(', ') : '' } },
+        ]
+        if options[:include_fields]
+          columns = options[:include_fields]
+        end
+        print as_pretty_table(licenses, columns, options)
+        print_results_pagination(json_response)
+      end
+      print reset,"\n"
+      
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def get(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[license]")
+      build_standard_get_options(opts, options)
+      opts.footer = "Get details about a license.\n[license] is required. License ID or name"
+    end
+    optparse.parse!(args)
+
+    if args.count < 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.join(', ')}\n#{optparse}"
+    end
+
+    connect(options)
+    
+    begin
+      @provisioning_licenses_interface.setopts(options)
+      if options[:dry_run]
+        if args[0].to_s =~ /\A\d{1,}\Z/
+          print_dry_run @provisioning_licenses_interface.dry.get(args[0], params)
+        else
+          print_dry_run @provisioning_licenses_interface.dry.list({name: args[0].to_s})
+        end
+        return 0
+      end
+      license = find_license_by_name_or_id(args[0])
+      return 1 if license.nil?
+      # skip reload if already fetched via get(id)
+      json_response = {'license' => license}
+      if args[0].to_s != license['id'].to_s
+        json_response = @provisioning_licenses_interface.get(license['id'], params)
+        license = json_response['license']
+      end
+      render_result = render_with_format(json_response, options, 'license')
+      return 0 if render_result
+
+      
+      print_h1 "License Details"
+      print cyan
+      columns = [
+        {"ID" => lambda {|license| license['id'] } },
+        {"Name" => lambda {|license| license['name'] } },
+        {"License Type" => lambda {|license| license['licenseType']['name'] rescue license['licenseType'] } },
+        {"License Key" => lambda {|license| license['licenseKey'] } },
+        {"Copies" => lambda {|license| 
+          "#{license['reservationCount']}/#{license['copies']}"
+        } },
+        {"Tenants" => lambda {|it| it['tenants'] ? it['tenants'].collect {|acnt| acnt['name']}.join(', ') : '' } },
+        {"Virtual Images" => lambda {|it| it['virtualImages'] ? it['virtualImages'].collect {|v| v['name']}.join(', ') : '' } },
+      ]
+      print_description_list(columns, license, options)
+      print reset,"\n"
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      return 1
+    end
+  end
+
+  def add(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[name] [options]")
+      opts.on( '-t', '--type TYPE', "License Type Code eg. win" ) do |val|
+        options[:options]['licenseType'] ||= val
+      end
+      opts.add_hidden_option('--licenseType')
+      build_option_type_options(opts, options, add_license_option_types)
+      build_standard_add_options(opts, options)
+      opts.footer = "Create license."
+    end
+    optparse.parse!(args)
+    if args.count > 1
+      raise_command_error "wrong number of arguments, expected 0-1 and got (#{args.count}) #{args}\n#{optparse}"
+    end
+    if args[0]
+      options[:options]['name'] ||= args[0]
+    end
+    connect(options)
+    begin
+      # construct payload
+      passed_options = options[:options] ? options[:options].reject {|k,v| k.is_a?(Symbol) } : {}
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+        payload.deep_merge!({'license' => passed_options}) unless passed_options.empty?
+      else
+        payload = {
+          'license' => {
+          }
+        }
+        # allow arbitrary -O options
+        payload.deep_merge!({'license' => passed_options}) unless passed_options.empty?
+        v_prompt = Morpheus::Cli::OptionTypes.prompt(add_license_option_types, options[:options], @api_client)
+        params.deep_merge!(v_prompt)
+        payload.deep_merge!({'license' => params}) unless params.empty?
+      end
+
+      @provisioning_licenses_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @provisioning_licenses_interface.dry.create(payload)
+        return
+      end
+      json_response = @provisioning_licenses_interface.create(payload)
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      else
+        display_name = json_response['license']  ? json_response['license']['name'] : ''
+        print_green_success "License #{display_name} added"
+        get([json_response['license']['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def update(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[license] [options]")
+      build_option_type_options(opts, options, update_license_option_types)
+      build_standard_update_options(opts, options)
+      opts.footer = "Update license.\n[license] is required. License ID or name"
+    end
+    optparse.parse!(args)
+
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args}\n#{optparse}"
+    end
+
+    connect(options)
+    begin
+
+      license = find_license_by_name_or_id(args[0])
+      return 1 if license.nil?
+
+      # construct payload
+      passed_options = options[:options] ? options[:options].reject {|k,v| k.is_a?(Symbol) } : {}
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+        payload.deep_merge!({'license' => passed_options}) unless passed_options.empty?
+      else
+        payload = {
+          'license' => {
+          }
+        }
+        # allow arbitrary -O options
+        # virtual_images = passed_options.delete('virtualImages')
+        # tenants = passed_options.delete('tenants')
+        payload.deep_merge!({'license' => passed_options}) unless passed_options.empty?
+        # prompt for options
+        #params = Morpheus::Cli::OptionTypes.prompt(update_license_option_types, options[:options], @api_client, options[:params])
+        v_prompt = Morpheus::Cli::OptionTypes.prompt(update_license_option_types, options[:options].merge(:no_prompt => true), @api_client)
+        params.deep_merge!(v_prompt)
+        
+        # if !virtual_images.empty?
+        #   params['virtualImages'] = virtual_images # split(",") and lookup ?
+        # end
+        
+        payload.deep_merge!({'license' => params}) unless params.empty?
+
+        if payload.empty? || payload['license'].empty?
+          raise_command_error "Specify at least one option to update.\n#{optparse}"
+        end
+      end
+      @provisioning_licenses_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @provisioning_licenses_interface.dry.update(license['id'], payload)
+        return
+      end
+      json_response = @provisioning_licenses_interface.update(license['id'], payload)
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      else
+        display_name = json_response['license'] ? json_response['license']['name'] : ''
+        print_green_success "License #{display_name} updated"
+        get([json_response['license']['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def remove(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[name]")
+      build_standard_remove_options(opts, options)
+      opts.footer = "Delete license.\n[license] is required. License ID or name"
+    end
+    optparse.parse!(args)
+
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args}\n#{optparse}"
+    end
+
+    connect(options)
+    begin
+      license = find_license_by_name_or_id(args[0])
+      return 1 if license.nil?
+
+      unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the license #{license['name']}?")
+        return 9, "aborted command"
+      end
+      @provisioning_licenses_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @provisioning_licenses_interface.dry.destroy(license['id'])
+        return
+      end
+      json_response = @provisioning_licenses_interface.destroy(license['id'])
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      else
+        print_green_success "License #{license['name']} removed"
+        # list([] + (options[:remote] ? ["-r",options[:remote]] : []))
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def reservations(args)
+    params = {}
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[name]")
+      build_standard_list_options(opts, options)
+      opts.footer = "List reservations for a license.\n[license] is required. License ID or name"
+    end
+    optparse.parse!(args)
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args}\n#{optparse}"
+    end
+    connect(options)
+    begin
+      license = find_license_by_name_or_id(args[0])
+      return 1 if license.nil?
+      params.merge!(parse_list_options(options))
+      @provisioning_licenses_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @provisioning_licenses_interface.dry.reservations(license['id'], params)
+        return 0
+      end
+      json_response = @provisioning_licenses_interface.reservations(license['id'], params)
+      render_result = render_with_format(json_response, options, 'reservations')
+      return 0 if render_result
+      reservations = json_response['reservations']
+      
+      title = "License Reservations: [#{license['id']}] #{license['name']}"
+      subtitles = []
+      subtitles += parse_list_subtitles(options)
+      print_h1 title, subtitles
+      if reservations.empty?
+        print cyan,"No reservations found.",reset,"\n"
+      else
+        columns = [
+          #{"ID" => lambda {|it| it['id'] } },
+          {"RESOURCE ID" => lambda {|it| it['resourceId'] } },
+          {"RESOURCE TYPE" => lambda {|it| it['resourceType'] } },
+        ]
+        if options[:include_fields]
+          columns = options[:include_fields]
+        end
+        print as_pretty_table(reservations, columns, options)
+        print_results_pagination(json_response)
+      end
+      print reset,"\n"
+      
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def list_types(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage()
+      build_standard_list_options(opts, options)
+      opts.footer = "List license types."
+    end
+    optparse.parse!(args)
+    if args.count != 0
+      raise_command_error "wrong number of arguments, expected 0 and got (#{args.count}) #{args}\n#{optparse}"
+    end
+    connect(options)
+    begin
+      params.merge!(parse_list_options(options))
+      @provisioning_license_types_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @provisioning_license_types_interface.dry.list(params)
+        return 0
+      end
+      json_response = @provisioning_license_types_interface.list(params)
+      render_result = render_with_format(json_response, options, 'licenseTypes')
+      return 0 if render_result
+      license_types = json_response['licenseTypes']
+
+      title = "Morpheus License Types"
+      subtitles = []
+      subtitles += parse_list_subtitles(options)
+      print_h1 title, subtitles
+      if license_types.empty?
+        print cyan,"No license types found.",reset,"\n"
+      else
+        columns = [
+          {"ID" => lambda {|it| it['id'] } },
+          {"NAME" => lambda {|it| it['name'] } },
+          {"CODE" => lambda {|it| it['code'] } },
+        ]
+        if options[:include_fields]
+          columns = options[:include_fields]
+        end
+        print as_pretty_table(license_types, columns, options)
+        print_results_pagination(json_response)
+      end
+      print reset,"\n"
+      
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  private
+
+  def find_license_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_license_by_id(val)
+    else
+      return find_license_by_name(val)
+    end
+  end
+
+  def find_license_by_id(id)
+    raise "#{self.class} has not defined @provisioning_licenses_interface" if @provisioning_licenses_interface.nil?
+    begin
+      json_response = @provisioning_licenses_interface.get(id)
+      return json_response['license']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "License not found by id #{id}"
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_license_by_name(name)
+    raise "#{self.class} has not defined @provisioning_licenses_interface" if @provisioning_licenses_interface.nil?
+    licenses = @provisioning_licenses_interface.list({name: name.to_s})['licenses']
+    if licenses.empty?
+      print_red_alert "License not found by name #{name}"
+      return nil
+    elsif licenses.size > 1
+      print_red_alert "#{licenses.size} Licenses found by name #{name}"
+      print as_pretty_table(licenses, [:id,:name], {color:red})
+      print reset,"\n"
+      return nil
+    else
+      return licenses[0]
+    end
+  end
+
+  # def get_license_types_dropdown()
+  #   [{"name" => "Windows", "value" => "win"}]
+  # end
+
+  def get_license_types_dropdown()
+    @provisioning_license_types_interface.list({max:10000})['licenseTypes'].collect { |it|
+      {"name" => it["name"], "value" => it["code"]}
+    }
+  end
+
+  def get_virtual_images_dropdown()
+    @virtual_images_interface.list({max:10000})['virtualImages'].collect { |it|
+      {"name" => it["name"], "value" => it["id"]}
+    }
+  end
+
+  def add_license_option_types
+    [
+      {'fieldName' => 'licenseType', 'fieldLabel' => 'License Type', 'type' => 'select', 'optionSource' => lambda { 
+        # @options_interface.options_for_source("licenseTypes", {})['data']
+        get_license_types_dropdown()
+      }, 'required' => true, 'displayOrder' => 1},
+      {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 2},
+      {'fieldName' => 'licenseKey', 'fieldLabel' => 'License Key', 'type' => 'text', 'required' => true, 'displayOrder' => 3},
+      {'fieldName' => 'orgName', 'fieldLabel' => 'Org Name', 'type' => 'text', 'description' => "The Organization Name (if applicable) related to the license key", 'displayOrder' => 4},
+      {'fieldName' => 'fullName', 'fieldLabel' => 'Full Name', 'type' => 'text', 'description' => "The Full Name (if applicable) related to the license key", 'displayOrder' => 5},
+      {'fieldName' => 'licenseVersion', 'fieldLabel' => 'Version', 'type' => 'text', 'displayOrder' => 6},
+      {'fieldName' => 'copies', 'fieldLabel' => 'Copies', 'type' => 'number', 'required' => true, 'defaultValue' => 1, 'displayOrder' => 7},
+      {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 8},
+      {'fieldName' => 'virtualImages', 'fieldLabel' => 'Virtual Images', 'type' => 'multiSelect', 'optionSource' => lambda { 
+        # @options_interface.options_for_source("virtualImages", {})['data']
+        get_virtual_images_dropdown()
+      }, 'displayOrder' => 9},
+      {'fieldName' => 'tenants', 'fieldLabel' => 'Tenants', 'type' => 'multiSelect', 'optionSource' => lambda { 
+        @options_interface.options_for_source("allTenants", {})['data']
+      }, 'displayOrder' => 10},
+    ]
+  end
+
+  def update_license_option_types
+    list = add_license_option_types()
+    list = list.reject {|it| ["licenseType", "licenseKey", "orgName", "fullName"].include? it['fieldName'] }
+    list.each {|it| it.delete('required') }
+    list.each {|it| it.delete('defaultValue') }
+    list
+  end
+
+end

data/lib/morpheus/cli/service_plans_command.rb

@@ -483,9 +483,6 @@ class Morpheus::Cli::ServicePlanCommand
       opts.on('--active [on|off]', String, "Can be used to enable / disable the plan. Default is on") do |val|
         params['active'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       end
-      opts.on('--editable [on|off]', String, "Can be used to enable / disable the editability of the service plan. Default is on") do |val|
-        params['editable'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
-      end
       opts.on('--storage [AMOUNT]', String, "Storage size is required. Assumes GB unless optional modifier specified, ex: 512MB" ) do |val|
         bytes = parse_bytes_param(val, '--storage', 'GB')
         params['maxStorage'] = bytes[:bytes]

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "4.2.1"
+    VERSION = "4.2.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.2.2
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-11 00:00:00.000000000 Z
+date: 2020-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -194,6 +194,7 @@ files:
 - lib/morpheus/api/custom_instance_types_interface.rb
 - lib/morpheus/api/cypher_interface.rb
 - lib/morpheus/api/dashboard_interface.rb
+- lib/morpheus/api/datastores_interface.rb
 - lib/morpheus/api/deploy_interface.rb
 - lib/morpheus/api/deployments_interface.rb
 - lib/morpheus/api/environments_interface.rb
@@ -210,6 +211,7 @@ files:
 - lib/morpheus/api/instance_types_interface.rb
 - lib/morpheus/api/instances_interface.rb
 - lib/morpheus/api/integrations_interface.rb
+- lib/morpheus/api/invoices_interface.rb
 - lib/morpheus/api/jobs_interface.rb
 - lib/morpheus/api/key_pairs_interface.rb
 - lib/morpheus/api/library_cluster_layouts_interface.rb
@@ -255,6 +257,8 @@ files:
 - lib/morpheus/api/prices_interface.rb
 - lib/morpheus/api/processes_interface.rb
 - lib/morpheus/api/provision_types_interface.rb
+- lib/morpheus/api/provisioning_license_types_interface.rb
+- lib/morpheus/api/provisioning_licenses_interface.rb
 - lib/morpheus/api/provisioning_settings_interface.rb
 - lib/morpheus/api/reports_interface.rb
 - lib/morpheus/api/roles_interface.rb
@@ -340,6 +344,7 @@ files:
 - lib/morpheus/cli/instance_types.rb
 - lib/morpheus/cli/instances.rb
 - lib/morpheus/cli/integrations_command.rb
+- lib/morpheus/cli/invoices_command.rb
 - lib/morpheus/cli/jobs_command.rb
 - lib/morpheus/cli/key_pairs.rb
 - lib/morpheus/cli/library.rb
@@ -391,6 +396,7 @@ files:
 - lib/morpheus/cli/price_sets_command.rb
 - lib/morpheus/cli/prices_command.rb
 - lib/morpheus/cli/processes_command.rb
+- lib/morpheus/cli/provisioning_licenses_command.rb
 - lib/morpheus/cli/provisioning_settings_command.rb
 - lib/morpheus/cli/recent_activity_command.rb
 - lib/morpheus/cli/remote.rb