morpheus-cli 2.10.0 → 2.10.1

data/lib/morpheus/cli/login.rb

@@ -9,49 +9,71 @@ class Morpheus::Cli::Login
   include Morpheus::Cli::CliCommand
   # include Morpheus::Cli::WhoamiHelper
   # include Morpheus::Cli::AccountsHelper
-  
-	def initialize() 
-		@appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
-	end
-
-	def connect(opts)
-		#@access_token = Morpheus::Cli::Credentials.new(@appliance_name,@appliance_url).request_credentials()
-		#@api_client = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url)
-	end
-
-	def usage
-		"Usage: morpheus login"
-	end
-
-	def handle(args)
-		login(args)
-	end
-	
-	# def login
-	# 	Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).login()	
-	# end
-
-	def login(args)
-		options = {}
-		optparse = OptionParser.new do|opts|
-			opts.banner = usage
-			build_common_options(opts, options, [:json]) # todo: support :remote too perhaps
-		end
-		optparse.parse(args)
-
-		connect(options)
-
-		begin
-			
-			Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).login(options)
-
-		rescue RestClient::Exception => e
-			print_rest_exception(e, options)
-			exit 1
-		end
-
-	end
-
-	
+  def initialize()
+    
+  end
+
+  def connect(opts)
+    #@api_client = establish_remote_appliance_connection(opts)
+  end
+
+  def usage
+    "Usage: morpheus login"
+  end
+
+  def handle(args)
+    login(args)
+  end
+
+  def login(args)
+    options = {}
+    username, password = nil, nil
+    optparse = OptionParser.new do|opts|
+      opts.banner = usage
+      opts.on( '-u', '--username USERNAME', "Username" ) do |val|
+        username = val
+      end
+      opts.on( '-p', '--password PASSWORD', "Password" ) do |val|
+        password = val
+      end
+      build_common_options(opts, options, [:json, :remote, :quiet])
+    end
+    optparse.parse!(args)
+
+    # connect(options)
+    if options[:remote]
+      appliance = Morpheus::Cli::Remote.appliances[options[:remote].to_sym]
+      if appliance
+        @appliance_name, @appliance_url = options[:remote].to_sym, appliance[:host]
+      else
+        @appliance_name, @appliance_url = nil, nil
+      end
+    else
+      @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
+    end
+
+    begin
+      if !@appliance_name
+        print yellow,"Please specify a remote appliance with -r or see the command `remote use`#{reset}\n"
+        return false
+      end
+      if options[:quiet]
+        if username.empty? || password.empty?
+          print yellow,"You have not specified username and password\n"
+          return false
+        end
+      end
+      options[:remote_username] = username if username
+      options[:remote_password] = password if password
+      #options[:remote_url] = true # will skip credentials save
+      Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).login(options)
+
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+
+  end
+
 
 end

data/lib/morpheus/cli/logout.rb

@@ -11,51 +11,52 @@ class Morpheus::Cli::Logout
   include Morpheus::Cli::CliCommand
   # include Morpheus::Cli::WhoamiHelper
   # include Morpheus::Cli::AccountsHelper
-  
-	def initialize() 
-		@appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
-	end
-
-	def connect(opts)
-		#@access_token = Morpheus::Cli::Credentials.new(@appliance_name,@appliance_url).request_credentials()
-		#@api_client = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url)
-	end
-
-	def usage
-		"Usage: morpheus login"
-	end
-
-	def handle(args)
-		logout(args)
-	end
-	
-	def logout(args)
-		options = {}
-		optparse = OptionParser.new do|opts|
-			opts.banner = usage
-			build_common_options(opts, options, []) # todo: support :remote too perhaps
-		end
-		optparse.parse(args)
-
-		connect(options)
-
-		begin
-
-			creds = Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).load_saved_credentials()
-			if !creds
-				print yellow,"\nYou are not logged in to #{@appliance_name} - #{@appliance_url}.\n\n",reset
-				# exit 0
-			else
-				Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).logout()
-			end
-
-		rescue RestClient::Exception => e
-			print_rest_exception(e, options)
-			exit 1
-		end
-
-	end
-
-	
+  def initialize()
+    @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
+  end
+
+  def connect(opts)
+    #@api_client = establish_remote_appliance_connection(opts)
+    #@access_token = Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).load_saved_credentials(options)
+  end
+
+  def usage
+    "Usage: morpheus logout"
+  end
+
+  def handle(args)
+    logout(args)
+  end
+
+  def logout(args)
+    options = {}
+    optparse = OptionParser.new do|opts|
+      opts.banner = usage
+      build_common_options(opts, options, [:remote]) # todo: support :remote too perhaps
+    end
+    optparse.parse!(args)
+    connect(options)
+
+    begin
+      if !@appliance_name
+        print yellow,"Please specify a Morpheus Appliance to logout of with -r or see the command `remote use`#{reset}\n"
+        return
+      end
+      creds = Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).load_saved_credentials()
+      if !creds
+        print yellow,"You are not currently logged in to #{display_appliance(@appliance_name, @appliance_url)}\n",reset
+        return 0
+      else
+        Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).logout()
+        print cyan,"Goodbye\n",reset
+      end
+
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      return 1
+    end
+
+  end
+
 
 end

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

@@ -1,7 +1,7 @@
 require 'table_print'
 require 'morpheus/cli/mixins/print_helper'
 
-# Mixin for Morpheus::Cli command classes 
+# Mixin for Morpheus::Cli command classes
 # Provides common methods for fetching and printing accounts, roles, and users.
 # The including class must establish @accounts_interface, @roles_interface, @users_interface
 module Morpheus::Cli::AccountsHelper
@@ -10,10 +10,35 @@ module Morpheus::Cli::AccountsHelper
     klass.send :include, Morpheus::Cli::PrintHelper
   end
 
-  def find_account_by_id(id)
+  def accounts_interface
+    # @api_client.accounts
     raise "#{self.class} has not defined @accounts_interface" if @accounts_interface.nil?
+    @accounts_interface
+  end
+
+  def users_interface
+    # @api_client.users
+    raise "#{self.class} has not defined @users_interface" if @users_interface.nil?
+    @users_interface
+  end
+
+  def roles_interface
+    # @api_client.roles
+    raise "#{self.class} has not defined @roles_interface" if @roles_interface.nil?
+    @roles_interface
+  end
+
+  def find_account_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_account_by_id(val)
+    else
+      return find_account_by_name(val)
+    end
+  end
+
+  def find_account_by_id(id)
     begin
-      json_response = @accounts_interface.get(id.to_i)
+      json_response = accounts_interface.get(id.to_i)
       return json_response['account']
     rescue RestClient::Exception => e
       if e.response && e.response.code == 404
@@ -25,8 +50,7 @@ module Morpheus::Cli::AccountsHelper
   end
 
   def find_account_by_name(name)
-    raise "#{self.class} has not defined @accounts_interface" if @accounts_interface.nil?
-    accounts = @accounts_interface.list({name: name.to_s})['accounts']
+    accounts = accounts_interface.list({name: name.to_s})['accounts']
     if accounts.empty?
       print_red_alert "Account not found by name #{name}"
       return nil
@@ -43,7 +67,10 @@ module Morpheus::Cli::AccountsHelper
 
   def find_account_from_options(options)
     account = nil
-    if options[:account_name]
+    if options[:account]
+      account = find_account_by_name_or_id(options[:account])
+      exit 1 if account.nil?
+    elsif options[:account_name]
       account = find_account_by_name(options[:account_name])
       exit 1 if account.nil?
     elsif options[:account_id]
@@ -55,10 +82,17 @@ module Morpheus::Cli::AccountsHelper
     return account
   end
 
+  def find_role_by_name_or_id(account_id, val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_role_by_id(account_id, val)
+    else
+      return find_role_by_name(account_id, val)
+    end
+  end
+
   def find_role_by_id(account_id, id)
-    raise "#{self.class} has not defined @roles_interface" if @roles_interface.nil?
     begin
-      json_response = @roles_interface.get(account_id, id.to_i)
+      json_response = roles_interface.get(account_id, id.to_i)
       return json_response['role']
     rescue RestClient::Exception => e
       if e.response && e.response.code == 404
@@ -70,8 +104,7 @@ module Morpheus::Cli::AccountsHelper
   end
 
   def find_role_by_name(account_id, name)
-    raise "#{self.class} has not defined @roles_interface" if @roles_interface.nil?
-    roles = @roles_interface.list(account_id, {authority: name.to_s})['roles']
+    roles = roles_interface.list(account_id, {authority: name.to_s})['roles']
     if roles.empty?
       print_red_alert "Role not found by name #{name}"
       return nil
@@ -87,10 +120,17 @@ module Morpheus::Cli::AccountsHelper
 
   alias_method :find_role_by_authority, :find_role_by_name
 
+  def find_user_by_username_or_id(account_id, val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_user_by_id(account_id, val)
+    else
+      return find_user_by_username(account_id, val)
+    end
+  end
+
   def find_user_by_id(account_id, id)
-    raise "#{self.class} has not defined @users_interface" if @users_interface.nil?
     begin
-      json_response = @users_interface.get(account_id, id.to_i)
+      json_response = users_interface.get(account_id, id.to_i)
       return json_response['user']
     rescue RestClient::Exception => e
       if e.response && e.response.code == 404
@@ -102,8 +142,7 @@ module Morpheus::Cli::AccountsHelper
   end
 
   def find_user_by_username(account_id, username)
-    raise "#{self.class} has not defined @users_interface" if @users_interface.nil?
-    users = @users_interface.list(account_id, {username: username.to_s})['users']
+    users = users_interface.list(account_id, {username: username.to_s})['users']
     if users.empty?
       print_red_alert "User not found by username #{username}"
       return nil
@@ -127,21 +166,20 @@ module Morpheus::Cli::AccountsHelper
         status_state = "#{red}INACTIVE#{table_color}"
       end
       {
-        id: account['id'], 
-        name: account['name'], 
-        description: account['description'], 
-        role: account['role'] ? account['role']['authority'] : nil, 
+        id: account['id'],
+        name: account['name'],
+        description: account['description'],
+        role: account['role'] ? account['role']['authority'] : nil,
         status: status_state,
-        dateCreated: format_local_dt(account['dateCreated']) 
+        dateCreated: format_local_dt(account['dateCreated'])
       }
     end
-    
     print table_color
     tp rows, [
-      :id, 
-      :name, 
-      :description, 
-      :role, 
+      :id,
+      :name,
+      :description,
+      :role,
       {:dateCreated => {:display_name => "Date Created"} },
       :status
     ]
@@ -178,21 +216,21 @@ module Morpheus::Cli::AccountsHelper
     # ]
     rows = roles.collect do |role|
       {
-        id: role['id'], 
-        name: role['authority'], 
-        description: role['description'], 
+        id: role['id'],
+        name: role['authority'],
+        description: role['description'],
         scope: role['scope'],
         multitenant: role['multitenant'] ? 'Yes' : 'No',
         type: format_role_type(role),
         owner: role['owner'] ? role['owner']['name'] : "System",
-        dateCreated: format_local_dt(role['dateCreated']) 
+        dateCreated: format_local_dt(role['dateCreated'])
       }
     end
     print table_color
     tp rows, [
-      :id, 
-      :name, 
-      :description, 
+      :id,
+      :name,
+      :description,
       # opts[:is_master_account] ? :scope : nil,
       opts[:is_master_account] ? :type : nil,
       opts[:is_master_account] ? :multitenant : nil,

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

@@ -0,0 +1,106 @@
+require 'morpheus/cli/mixins/print_helper'
+require 'morpheus/cli/option_types'
+require 'morpheus/rest_client'
+# Mixin for Morpheus::Cli command classes
+# Provides common methods for infrastructure management
+module Morpheus::Cli::InfrastructureHelper
+
+  def self.included(klass)
+    klass.send :include, Morpheus::Cli::PrintHelper
+  end
+
+  def groups_interface
+    # @api_client.groups
+    raise "#{self.class} has not defined @groups_interface" if @groups_interface.nil?
+    @groups_interface
+  end
+
+  def clouds_interface
+    # @api_client.clouds
+    raise "#{self.class} has not defined @clouds_interface" if @clouds_interface.nil?
+    @clouds_interface
+  end
+
+  def find_group_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_group_by_id(val)
+    else
+      return find_group_by_name(val)
+    end
+  end
+
+  def find_group_by_id(id)
+    begin
+      json_response = groups_interface.get(id.to_i)
+      return json_response['group']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Group not found by id #{id}"
+        exit 1
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_group_by_name(name)
+    json_results = groups_interface.get({name: name})
+    if json_results['groups'].empty?
+      print_red_alert "Group not found by name #{name}"
+      exit 1
+    end
+    group = json_results['groups'][0]
+    return group
+  end
+
+  def find_cloud_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_cloud_by_id(val)
+    else
+      return find_cloud_by_name(val)
+    end
+  end
+
+  def find_cloud_by_id(id)
+    json_results = clouds_interface.get(id.to_i)
+    if json_results['zone'].empty?
+      print_red_alert "Cloud not found by id #{id}"
+      exit 1
+    end
+    cloud = json_results['zone']
+    return cloud
+  end
+
+  def find_cloud_by_name(name)
+    json_results = clouds_interface.get({name: name})
+    if json_results['zones'].empty?
+      print_red_alert "Cloud not found by name #{name}"
+      exit 1
+    end
+    cloud = json_results['zones'][0]
+    return cloud
+  end
+
+  def get_available_cloud_types(refresh=false)
+    if !@available_cloud_types || refresh
+      @available_cloud_types = clouds_interface.cloud_types['zoneTypes']
+    end
+    return @available_cloud_types
+  end
+
+  def cloud_type_for_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return cloud_type_for_id(val)
+    else
+      return cloud_type_for_name(val)
+    end
+  end
+  def cloud_type_for_id(id)
+    return get_available_cloud_types().find { |z| z['id'].to_i == id.to_i}
+  end
+
+  def cloud_type_for_name(name)
+    return get_available_cloud_types().find { |z| z['name'].downcase == name.downcase || z['code'].downcase == name.downcase}
+  end
+
+end