Changed pam action rotate output to print gateway in use (#1365)

* changed pam action rotate output to print gateway in use

* changed pam action rotate output to print gateway in use

Author: idimov-keeper

keepercommander/commands/discover/job_start.py

@@ -233,4 +233,4 @@ def execute(self, params, **kwargs):
             print(f"To stop and remove the current job, use the command "
                   f"'{bcolors.OKGREEN}pam action discover remove -j <Job ID>'.")
         else:
-            print_router_response(router_response, conversation_id)
+            print_router_response(router_response, "job_info", conversation_id, gateway_uid=gateway_context.gateway_uid)

keepercommander/commands/discoveryrotation.py

@@ -1975,7 +1975,7 @@ def execute(self, params, **kwargs):
             message_type=pam_pb2.CMT_GENERAL,
             is_streaming=False
         )
-        print_router_response(router_response, conversation_id)
+        print_router_response(router_response, 'job_info', conversation_id)
 
 
 class PAMGatewayActionJobCommand(Command):
@@ -2006,7 +2006,7 @@ def execute(self, params, **kwargs):
             destination_gateway_uid_str=gateway_uid
         )
 
-        print_router_response(router_response, original_conversation_id=conversation_id, response_type='job_info')
+        print_router_response(router_response, 'job_info', original_conversation_id=conversation_id, gateway_uid=gateway_uid)
 
 
 class PAMGatewayActionRotateCommand(Command):
@@ -2134,7 +2134,7 @@ def execute(self, params, **kwargs):
             encrypted_transmission_key=encrypted_transmission_key,
             encrypted_session_token=encrypted_session_token)
 
-        print_router_response(router_response, 'job_info', conversation_id)
+        print_router_response(router_response, 'job_info', conversation_id, gateway_uid=gateway_uid)
 
 
 class PAMGatewayActionServerInfoCommand(Command):
@@ -2156,7 +2156,7 @@ def execute(self, params, **kwargs):
             destination_gateway_uid_str=destination_gateway_uid_str
         )
 
-        print_router_response(router_response, response_type='gateway_info', is_verbose=is_verbose)
+        print_router_response(router_response, 'gateway_info', is_verbose=is_verbose, gateway_uid=destination_gateway_uid_str)
 
 
 class PAMGatewayActionDiscoverCommandBase(Command):

keepercommander/commands/discoveryrotation_v1.py

@@ -1497,7 +1497,7 @@ def execute(self, params, **kwargs):
             message_type=pam_pb2.CMT_GENERAL,
             is_streaming=False
         )
-        print_router_response(router_response, conversation_id)
+        print_router_response(router_response, 'job_info', conversation_id)
 
 
 class PAMGatewayActionJobCommand(Command):
@@ -1529,7 +1529,7 @@ def execute(self, params, **kwargs):
             destination_gateway_uid_str=gateway_uid
         )
 
-        print_router_response(router_response, original_conversation_id=conversation_id, response_type='job_info')
+        print_router_response(router_response, 'job_info', original_conversation_id=conversation_id, gateway_uid=gateway_uid)
 
 
 class PAMGatewayActionRotateCommand(Command):
@@ -1629,7 +1629,7 @@ def execute(self, params, **kwargs):
                                                               gateway_destination=facade.controller_uid),
             message_type=pam_pb2.CMT_ROTATE, is_streaming=False)
 
-        print_router_response(router_response, conversation_id)
+        print_router_response(router_response, 'job_info', conversation_id, gateway_uid=facade.controller_uid)
 
 
 class PAMGatewayActionServerInfoCommand(Command):
@@ -1651,7 +1651,7 @@ def execute(self, params, **kwargs):
             destination_gateway_uid_str=destination_gateway_uid_str
         )
 
-        print_router_response(router_response, response_type='gateway_info', is_verbose=is_verbose)
+        print_router_response(router_response, 'gateway_info', is_verbose=is_verbose, gateway_uid=destination_gateway_uid_str)
 
 
 class PAMGatewayRemoveCommand(Command):

keepercommander/commands/pam/router_helper.py

@@ -427,7 +427,7 @@ def get_dag_leafs(params, encrypted_session_token, encrypted_transmission_key, r
         return None
 
 
-def print_router_response(router_response, response_type, original_conversation_id=None, is_verbose=False):
+def print_router_response(router_response, response_type, original_conversation_id=None, is_verbose=False, gateway_uid=''):
     if not router_response:
         return
 
@@ -463,8 +463,9 @@ def print_router_response(router_response, response_type, original_conversation_
     if router_response_response_payload_dict.get('isScheduled') or router_response_response_payload_dict.get('is_scheduled'):
         conversation_id = router_response_response_payload_dict.get('conversation_id')
 
+        gwinfo = f" --gateway={gateway_uid}" if gateway_uid else ""
         print(f"Scheduled action id: {bcolors.OKBLUE}{conversation_id}{bcolors.ENDC}")
-        print(f"The action has been scheduled, use command '{bcolors.OKGREEN}pam action job-info {conversation_id}{bcolors.ENDC}' to get status of the scheduled action")
+        print(f"The action has been scheduled, use command '{bcolors.OKGREEN}pam action job-info {conversation_id}{gwinfo}{bcolors.ENDC}' to get status of the scheduled action")
         return
 
     elif response_type == 'job_info':