Merge "api-ref: some fixes on metering labels and rules"

api-ref/source/v2/metering.inc

@@ -70,10 +70,10 @@ Request
 
    - metering_label: metering_label
    - shared: metering_label-shared-request
-   - description: description
-   - name: name
-   - tenant_id: project_id
-   - project_id: project_id
+   - description: description-request
+   - name: name-request
+   - tenant_id: project_id-request
+   - project_id: project_id-request
 
 Request Example
 ---------------
@@ -207,7 +207,7 @@ Response Parameters
    - direction: direction
    - remote_ip_prefix: remote_ip_prefix
    - excluded : excluded
-   - metering_label_id: metering_label-id-response-body
+   - metering_label_id: metering_label-id-body
    - id: metering_label_rule-id
 
 Response Example
@@ -235,8 +235,8 @@ Request
    - metering_label_rule: metering_label_rule
    - remote_ip_prefix: remote_ip_prefix
    - direction: direction
-   - metering_label_id: metering_label-id-response-body
-   - excluded: excluded
+   - metering_label_id: metering_label-id-body
+   - excluded: excluded-request
 
 Request Example
 ---------------
@@ -253,7 +253,7 @@ Response Parameters
    - direction: direction
    - remote_ip_prefix: remote_ip_prefix
    - excluded : excluded
-   - metering_label_id: metering_label-id-response-body
+   - metering_label_id: metering_label-id-body
    - id: metering_label_rule-id
 
 Response Example
@@ -308,7 +308,7 @@ Response Paramters
    - direction: direction
    - remote_ip_prefix: remote_ip_prefix
    - excluded : excluded
-   - metering_label_id: metering_label-id-response-body
+   - metering_label_id: metering_label-id-body
    - id: metering_label_rule-id
 
 Response Example

api-ref/source/v2/parameters.yaml

@@ -1765,6 +1765,13 @@ ethertype:
   required: false
   type: string
 excluded:
+  description: |
+    Indicates whether to count the traffic of a
+    specific IP address with the ``remote_ip_prefix`` value.
+  in: body
+  required: true
+  type: boolean
+excluded-request:
   description: |
     Indicates whether to count the traffic of a
     specific IP address with the ``remote_ip_prefix`` value. Default
@@ -3155,9 +3162,9 @@ metering_label-id:
   in: body
   required: true
   type: string
-metering_label-id-response-body:
+metering_label-id-body:
   description: |
-    The metering label ID to associate with this
+    The metering label ID associated with this
     metering rule.
   in: body
   required: true
@@ -3174,7 +3181,7 @@ metering_label-shared-request:
     Indicates whether this metering label is shared
     across all projects.
   in: body
-  required: true
+  required: false
   type: boolean
 metering_label_rule:
   description: |