Merge "Correct project/user id descriptions for os-instance-actions"

api-ref/source/os-cloudpipe.inc

@@ -33,7 +33,7 @@ Response
   - created_at: created
   - instance_id: instance_id_cloudpipe
   - internal_ip: fixed_ip
-  - project_id: project_id_instance_action
+  - project_id: project_id_server
   - public_ip: vpn_public_ip_resp
   - public_port: vpn_public_port_resp
   - state: vpn_state

api-ref/source/os-instance-actions.inc

@@ -46,10 +46,10 @@ Response
   - action: action
   - instance_uuid: instance_id_body
   - message: message
-  - project_id: project_id_instance_action
+  - project_id: project_id_server_action
   - request_id: request_id_body
   - start_time: start_time
-  - user_id: user_id
+  - user_id: user_id_server_action
   - updated_at: updated_instance_action
   - links: instance_actions_next_links
 
@@ -101,10 +101,10 @@ Response
   - action: action
   - instance_uuid: instance_id_body
   - message: message
-  - project_id: project_id_instance_action
+  - project_id: project_id_server_action
   - request_id: request_id_body
   - start_time: start_time
-  - user_id: user_id
+  - user_id: user_id_server_action
   - events: instance_action_events_2_50
   - events: instance_action_events_2_51
   - events.event: event

api-ref/source/parameters.yaml

@@ -5482,9 +5482,15 @@ project_id:
   in: body
   required: false
   type: string
-project_id_instance_action:
+project_id_server:
   description: |
-    The UUID of the project that this server belongs to.
+    The ID of the project that this server belongs to.
+  in: body
+  required: true
+  type: string
+project_id_server_action:
+  description: |
+    The ID of the project which initiated the server action.
   in: body
   required: true
   type: string
@@ -6749,6 +6755,12 @@ user_id:
   in: body
   required: true
   type: string
+user_id_server_action:
+  description: |
+    The ID of the user which initiated the server action.
+  in: body
+  required: true
+  type: string
 user_id_server_group:
   description: |
     The user ID who owns the server group.