Merge "api-ref: sort parameters for limits, quotas and quota classes"

api-ref/source/limits.inc

@@ -32,25 +32,25 @@ Response
 
   - limits: limits
   - absolute: limits_absolutes
-  - maxImageMeta: image_metadata_items
-  - maxPersonality: injected_files
-  - maxPersonalitySize: injected_file_content_bytes
-  - maxSecurityGroupRules: security_group_rules_quota
-  - maxSecurityGroups: security_groups_quota
   - maxServerGroupMembers: server_group_members
   - maxServerGroups: server_groups
   - maxServerMeta: metadata_items
   - maxTotalCores: cores
-  - maxTotalFloatingIps: floating_ips
   - maxTotalInstances: instances
   - maxTotalKeypairs: key_pairs
   - maxTotalRAMSize: ram
   - totalCoresUsed: total_cores_used
-  - totalFloatingIpsUsed: total_floatingips_used
   - totalInstancesUsed: total_instances_used
   - totalRAMUsed: total_ram_used
-  - totalSecurityGroupsUsed: total_security_groups_used
   - totalServerGroupsUsed: total_server_groups_used
+  - maxSecurityGroupRules: security_group_rules_quota
+  - maxSecurityGroups: security_groups_quota
+  - maxTotalFloatingIps: floating_ips
+  - totalFloatingIpsUsed: total_floatingips_used
+  - totalSecurityGroupsUsed: total_security_groups_used
+  - maxImageMeta: image_metadata_items
+  - maxPersonality: injected_files
+  - maxPersonalitySize: injected_file_content_bytes
   - rate: limits_rates
 
 **Example Show Rate And Absolute Limits: JSON response**

api-ref/source/os-quota-class-sets.inc

@@ -64,21 +64,21 @@ Response
 
   - quota_class_set: quota_class_set
   - cores: cores_quota_class
-  - fixed_ips: fixed_ips_quota_class
-  - floating_ips: floating_ips_quota_class
   - id: quota_class_id_body
-  - injected_file_content_bytes: injected_file_content_bytes
-  - injected_file_path_bytes: injected_file_path_bytes
-  - injected_files: injected_files_quota_class
   - instances: instances_quota_class
   - key_pairs: key_pairs_quota_class
   - metadata_items: metadata_items
   - ram: ram_quota_class
+  - fixed_ips: fixed_ips_quota_class
+  - floating_ips: floating_ips_quota_class
+  - networks: networks_quota_optional
   - security_group_rules: security_group_rules_quota_class
   - security_groups: security_groups_quota_class
   - server_groups: server_groups_quota_class
   - server_group_members: server_group_members_quota_class
-  - networks: networks_quota_optional
+  - injected_file_content_bytes: injected_file_content_bytes
+  - injected_file_path_bytes: injected_file_path_bytes
+  - injected_files: injected_files_quota_class
 
 **Example Show A Quota Class: JSON response(2.50)**
 
@@ -108,20 +108,20 @@ Request
   - id: quota_class_id
   - quota_class_set: quota_class_set
   - cores: cores_quota_class_optional
-  - fixed_ips: fixed_ips_quota_class_optional
-  - floating_ips: floating_ips_quota_class_optional
-  - injected_file_content_bytes: injected_file_content_bytes_quota_optional
-  - injected_file_path_bytes: injected_file_path_bytes_quota_optional
-  - injected_files: injected_files_quota_class_optional
   - instances: instances_quota_class_optional
   - key_pairs: key_pairs_quota_class_optional
   - metadata_items: metadata_items_quota_optional
   - ram: ram_quota_class_optional
-  - security_group_rules: security_group_rules_quota_class_optional
-  - security_groups: security_groups_quota_class_optional
   - server_groups: server_groups_quota_class_optional
   - server_group_members: server_group_members_quota_optional
+  - fixed_ips: fixed_ips_quota_class_optional
+  - floating_ips: floating_ips_quota_class_optional
   - networks: networks_quota_optional
+  - security_group_rules: security_group_rules_quota_class_optional
+  - security_groups: security_groups_quota_class_optional
+  - injected_file_content_bytes: injected_file_content_bytes_quota_optional
+  - injected_file_path_bytes: injected_file_path_bytes_quota_optional
+  - injected_files: injected_files_quota_class_optional
 
 **Example Update Quotas: JSON request(2.50)**
 
@@ -135,20 +135,20 @@ Response
 
   - quota_class_set: quota_class_set
   - cores: cores_quota_class
-  - fixed_ips: fixed_ips_quota_class
-  - floating_ips: floating_ips_quota_class
-  - injected_file_content_bytes: injected_file_content_bytes
-  - injected_file_path_bytes: injected_file_path_bytes
-  - injected_files: injected_files_quota_class
   - instances: instances_quota_class
   - key_pairs: key_pairs_quota_class
   - metadata_items: metadata_items
   - ram: ram_quota_class
+  - fixed_ips: fixed_ips_quota_class
+  - floating_ips: floating_ips_quota_class
+  - networks: networks_quota_optional
   - security_group_rules: security_group_rules_quota_class
   - security_groups: security_groups_quota_class
   - server_groups: server_groups_quota_class
   - server_group_members: server_group_members_quota_class
-  - networks: networks_quota_optional
+  - injected_file_content_bytes: injected_file_content_bytes
+  - injected_file_path_bytes: injected_file_path_bytes
+  - injected_files: injected_files_quota_class
 
 **Example Update Quotas: JSON response(2.50)**
 

api-ref/source/os-quota-sets.inc

@@ -39,21 +39,21 @@ Response
 
   - quota_set: quota_set
   - cores: cores
-  - fixed_ips: fixed_ips_quota
-  - floating_ips: floating_ips
   - id: quota_tenant_or_user_id_body
-  - injected_file_content_bytes: injected_file_content_bytes
-  - injected_file_path_bytes: injected_file_path_bytes
-  - injected_files: injected_files
   - instances: instances
   - key_pairs: key_pairs
   - metadata_items: metadata_items
   - ram: ram
-  - security_group_rules: security_group_rules_quota
-  - security_groups: security_groups_quota
   - server_groups: server_groups
   - server_group_members: server_group_members
+  - fixed_ips: fixed_ips_quota
+  - floating_ips: floating_ips
   - networks: networks_quota_set_optional
+  - security_group_rules: security_group_rules_quota
+  - security_groups: security_groups_quota
+  - injected_file_content_bytes: injected_file_content_bytes
+  - injected_file_path_bytes: injected_file_path_bytes
+  - injected_files: injected_files
 
 **Example Show A Quota: JSON response**
 
@@ -89,20 +89,20 @@ Request
   - quota_set: quota_set
   - force: force
   - cores: cores_quota_optional
-  - fixed_ips: fixed_ips_quota_optional
-  - floating_ips: floating_ips_quota_optional
-  - injected_file_content_bytes: injected_file_content_bytes_quota_optional
-  - injected_file_path_bytes: injected_file_path_bytes_quota_optional
-  - injected_files: injected_files_quota_optional
   - instances: instances_quota_optional
   - key_pairs: key_pairs_quota_optional
   - metadata_items: metadata_items_quota_optional
   - ram: ram_quota_optional
-  - security_group_rules: security_group_rules
-  - security_groups: security_groups_quota_optional
   - server_groups: server_groups_quota_optional
   - server_group_members: server_group_members_quota_optional
+  - fixed_ips: fixed_ips_quota_optional
+  - floating_ips: floating_ips_quota_optional
   - networks: networks_quota_set_optional
+  - security_group_rules: security_group_rules
+  - security_groups: security_groups_quota_optional
+  - injected_file_content_bytes: injected_file_content_bytes_quota_optional
+  - injected_file_path_bytes: injected_file_path_bytes_quota_optional
+  - injected_files: injected_files_quota_optional
 
 **Example Update Quotas: JSON request**
 
@@ -121,20 +121,20 @@ Response
 
   - quota_set: quota_set
   - cores: cores
-  - fixed_ips: fixed_ips_quota
-  - floating_ips: floating_ips
-  - injected_file_content_bytes: injected_file_content_bytes
-  - injected_file_path_bytes: injected_file_path_bytes
-  - injected_files: injected_files
   - instances: instances
   - key_pairs: key_pairs
   - metadata_items: metadata_items
   - ram: ram
-  - security_group_rules: security_group_rules_quota
-  - security_groups: security_groups_quota
   - server_groups: server_groups
   - server_group_members: server_group_members
+  - fixed_ips: fixed_ips_quota
+  - floating_ips: floating_ips
   - networks: networks_quota_set_optional
+  - security_group_rules: security_group_rules_quota
+  - security_groups: security_groups_quota
+  - injected_file_content_bytes: injected_file_content_bytes
+  - injected_file_path_bytes: injected_file_path_bytes
+  - injected_files: injected_files
 
 **Example Update Quotas: JSON response**
 
@@ -192,21 +192,21 @@ Response
 
   - quota_set: quota_set
   - cores: cores
-  - fixed_ips: fixed_ips_quota
-  - floating_ips: floating_ips
   - id: quota_tenant_or_user_id_body
-  - injected_file_content_bytes: injected_file_content_bytes
-  - injected_file_path_bytes: injected_file_path_bytes
-  - injected_files: injected_files
   - instances: instances
   - key_pairs: key_pairs
   - metadata_items: metadata_items
   - ram: ram
-  - security_group_rules: security_group_rules_quota
-  - security_groups: security_groups_quota
   - server_groups: server_groups
   - server_group_members: server_group_members
+  - fixed_ips: fixed_ips_quota
+  - floating_ips: floating_ips
   - networks: networks_quota_set_optional
+  - security_group_rules: security_group_rules_quota
+  - security_groups: security_groups_quota
+  - injected_file_content_bytes: injected_file_content_bytes
+  - injected_file_path_bytes: injected_file_path_bytes
+  - injected_files: injected_files
 
 **Example List Default Quotas For Tenant: JSON response**
 
@@ -244,21 +244,21 @@ Response
 
   - quota_set: quota_set
   - cores: cores_quota_details
-  - fixed_ips: fixed_ips_quota_details
-  - floating_ips: floating_ips_quota_details
   - id: quota_tenant_or_user_id_body
-  - injected_file_content_bytes: injected_file_content_bytes_quota_details
-  - injected_file_path_bytes: injected_file_path_bytes_quota_details
-  - injected_files: injected_files_quota_details
   - instances: instances_quota_details
   - key_pairs: key_pairs_quota_details
   - metadata_items: metadata_items_quota_details
   - ram: ram_quota_details
-  - security_group_rules: security_group_rules_quota_details
-  - security_groups: security_groups_quota_details
   - server_groups: server_groups_quota_details
   - server_group_members: server_group_members_quota_details
+  - fixed_ips: fixed_ips_quota_details
+  - floating_ips: floating_ips_quota_details
   - networks: networks_quota_set_optional
+  - security_group_rules: security_group_rules_quota_details
+  - security_groups: security_groups_quota_details
+  - injected_file_content_bytes: injected_file_content_bytes_quota_details
+  - injected_file_path_bytes: injected_file_path_bytes_quota_details
+  - injected_files: injected_files_quota_details
 
 **Example Show A Quota: JSON response**