diff --git a/v2.0/neutron-api-guide.xml b/v2.0/neutron-api-guide.xml index e08c412..a56fd97 100644 --- a/v2.0/neutron-api-guide.xml +++ b/v2.0/neutron-api-guide.xml @@ -2720,5 +2720,6 @@ Date: Wed, 12 Sep 2012 11:36:20 GMT + diff --git a/v2.0/neutron-metering-ext.xml b/v2.0/neutron-metering-ext.xml new file mode 100644 index 0000000..e2b5d1b --- /dev/null +++ b/v2.0/neutron-metering-ext.xml @@ -0,0 +1,44 @@ + + + + + + + + +GET'> +PUT'> +POST'> +DELETE'> + + + + + + '> + + + + + + '> + +]> +
+ + Metering Labels and Rules + Creates, modifies, and deletes OpenStack Layer3 Metering labels + and rules. + +
diff --git a/v2.0/samples/metering-label-create-req.json b/v2.0/samples/metering-label-create-req.json new file mode 100644 index 0000000..6987d27 --- /dev/null +++ b/v2.0/samples/metering-label-create-req.json @@ -0,0 +1,13 @@ +POST /v2.0/metering/metering-labels HTTP/1.1 +Host: controlnode:9696 +User-Agent: python-neutronclient +Content-Type: application/json +Accept: application/json +X-Auth-Token: c52a1b304fec4ca0ac85dc1741eec6e2 + +{ + "metering_label":{ + "name":"label1", + "description":"description of label1" + } +} diff --git a/v2.0/samples/metering-label-create-resp.json b/v2.0/samples/metering-label-create-resp.json new file mode 100644 index 0000000..8c361e2 --- /dev/null +++ b/v2.0/samples/metering-label-create-resp.json @@ -0,0 +1,8 @@ +{ + "metering_label": { + "tenant_id": "45345b0ee1ea477fac0f541b2cb79cd4", + "description": "description of label1", + "name": "label1", + "id": "bc91b832-8465-40a7-a5d8-ba87de442266" + } +} diff --git a/v2.0/samples/metering-label-delete-req.json b/v2.0/samples/metering-label-delete-req.json new file mode 100644 index 0000000..48f7647 --- /dev/null +++ b/v2.0/samples/metering-label-delete-req.json @@ -0,0 +1,6 @@ +DELETE /v2.0/metering/metering-labels/a6700594-5b7a-4105-8bfe-723b346ce866 HTTP/1.1 +Host: controlnode:9696 +User-Agent: python-neutronclient +Content-Type: application/json +Accept: application/json +X-Auth-Token: c52a1b304fec4ca0ac85dc1741eec6e2 diff --git a/v2.0/samples/metering-label-delete-resp.json b/v2.0/samples/metering-label-delete-resp.json new file mode 100644 index 0000000..bfbfad6 --- /dev/null +++ b/v2.0/samples/metering-label-delete-resp.json @@ -0,0 +1 @@ +status: 204 diff --git a/v2.0/samples/metering-label-get-req.json b/v2.0/samples/metering-label-get-req.json new file mode 100644 index 0000000..7387aeb --- /dev/null +++ b/v2.0/samples/metering-label-get-req.json @@ -0,0 +1,6 @@ +GET /v2.0/metering/metering-labels/a6700594-5b7a-4105-8bfe-723b346ce866 HTTP/1.1 +Host: controlnode:9696 +User-Agent: python-neutronclient +Content-Type: application/json +Accept: application/json +X-Auth-Token: c52a1b304fec4ca0ac85dc1741eec6e2 diff --git a/v2.0/samples/metering-label-get-resp.json b/v2.0/samples/metering-label-get-resp.json new file mode 100644 index 0000000..818e046 --- /dev/null +++ b/v2.0/samples/metering-label-get-resp.json @@ -0,0 +1,8 @@ +{ + "metering_label": { + "tenant_id": "45345b0ee1ea477fac0f541b2cb79cd4", + "description": "label1 description", + "name": "label1", + "id": "a6700594-5b7a-4105-8bfe-723b346ce866" + } +} diff --git a/v2.0/samples/metering-label-rule-create-req.json b/v2.0/samples/metering-label-rule-create-req.json new file mode 100644 index 0000000..66136de --- /dev/null +++ b/v2.0/samples/metering-label-rule-create-req.json @@ -0,0 +1,14 @@ +POST /v2.0/metering/metering-label-rules HTTP/1.1 +Host: controlnode:9696 +User-Agent: python-neutronclient +Content-Type: application/json +Accept: application/json +X-Auth-Token: c52a1b304fec4ca0ac85dc1741eec6e2 + +{ + "metering_label_rule":{ + "remote_ip_prefix":"10.0.1.0/24", + "direction":"ingress", + "metering_label_id":"e131d186-b02d-4c0b-83d5-0c0725c4f812" + } +} diff --git a/v2.0/samples/metering-label-rule-create-resp.json b/v2.0/samples/metering-label-rule-create-resp.json new file mode 100644 index 0000000..31e5410 --- /dev/null +++ b/v2.0/samples/metering-label-rule-create-resp.json @@ -0,0 +1,9 @@ +{ + "metering_label_rule":{ + "remote_ip_prefix":"10.0.1.0/24", + "direction":"ingress", + "metering_label_id":"e131d186-b02d-4c0b-83d5-0c0725c4f812", + "id":"00e13b58-b4f2-4579-9c9c-7ac94615f9ae", + "excluded":false + } +} diff --git a/v2.0/samples/metering-label-rule-delete-req.json b/v2.0/samples/metering-label-rule-delete-req.json new file mode 100644 index 0000000..3b74b68 --- /dev/null +++ b/v2.0/samples/metering-label-rule-delete-req.json @@ -0,0 +1,6 @@ +DELETE /v2.0/metering/metering-labels/37b31179-71ee-4f0a-b130-0eeb28e7ede7 HTTP/1.1 +Host: controlnode:9696 +User-Agent: python-neutronclient +Content-Type: application/json +Accept: application/json +X-Auth-Token: c52a1b304fec4ca0ac85dc1741eec6e2 diff --git a/v2.0/samples/metering-label-rule-delete-resp.json b/v2.0/samples/metering-label-rule-delete-resp.json new file mode 100644 index 0000000..bfbfad6 --- /dev/null +++ b/v2.0/samples/metering-label-rule-delete-resp.json @@ -0,0 +1 @@ +status: 204 diff --git a/v2.0/samples/metering-label-rule-get-req.json b/v2.0/samples/metering-label-rule-get-req.json new file mode 100644 index 0000000..0e3c164 --- /dev/null +++ b/v2.0/samples/metering-label-rule-get-req.json @@ -0,0 +1,6 @@ +GET /v2.0/metering/metering-label-rules/9536641a-7d14-4dc5-afaf-93a973ce0eb8 HTTP/1.1 +Host: controlnode:9696 +User-Agent: python-neutronclient +Content-Type: application/json +Accept: application/json +X-Auth-Token: c52a1b304fec4ca0ac85dc1741eec6e2 diff --git a/v2.0/samples/metering-label-rule-get-resp.json b/v2.0/samples/metering-label-rule-get-resp.json new file mode 100644 index 0000000..cc9850b --- /dev/null +++ b/v2.0/samples/metering-label-rule-get-resp.json @@ -0,0 +1,9 @@ +{ + "metering_label_rule": { + "remote_ip_prefix": "20.0.0.0\/24", + "direction": "ingress", + "metering_label_id": "e131d186-b02d-4c0b-83d5-0c0725c4f812", + "id": "9536641a-7d14-4dc5-afaf-93a973ce0eb8", + "excluded": false + } +} diff --git a/v2.0/samples/metering-label-rules-list-get-req.json b/v2.0/samples/metering-label-rules-list-get-req.json new file mode 100644 index 0000000..354d8a5 --- /dev/null +++ b/v2.0/samples/metering-label-rules-list-get-req.json @@ -0,0 +1,6 @@ +GET /v2.0/metering/metering-label-rules HTTP/1.1 +Host: controlnode:9696 +User-Agent: python-neutronclient +Content-Type: application/json +Accept: application/json +X-Auth-Token: c52a1b304fec4ca0ac85dc1741eec6e2 diff --git a/v2.0/samples/metering-label-rules-list-get-resp.json b/v2.0/samples/metering-label-rules-list-get-resp.json new file mode 100644 index 0000000..fcdc0af --- /dev/null +++ b/v2.0/samples/metering-label-rules-list-get-resp.json @@ -0,0 +1,18 @@ +{ + "metering_label_rules": [ + { + "remote_ip_prefix": "20.0.0.0\/24", + "direction": "ingress", + "metering_label_id": "e131d186-b02d-4c0b-83d5-0c0725c4f812", + "id": "9536641a-7d14-4dc5-afaf-93a973ce0eb8", + "excluded": false + }, + { + "remote_ip_prefix": "10.0.0.0\/24", + "direction": "ingress", + "metering_label_id": "e131d186-b02d-4c0b-83d5-0c0725c4f812", + "id": "ffc6fd15-40de-4e7d-b617-34d3f7a93aec", + "excluded": false + } + ] +} diff --git a/v2.0/samples/metering-labels-list-get-req.json b/v2.0/samples/metering-labels-list-get-req.json new file mode 100644 index 0000000..e1df3f2 --- /dev/null +++ b/v2.0/samples/metering-labels-list-get-req.json @@ -0,0 +1,6 @@ +GET /v2.0/metering/metering-labels HTTP/1.1 +Host: controlnode:9696 +User-Agent: python-neutronclient +Content-Type: application/json +Accept: application/json +X-Auth-Token: c52a1b304fec4ca0ac85dc1741eec6e2 diff --git a/v2.0/samples/metering-labels-list-get-resp.json b/v2.0/samples/metering-labels-list-get-resp.json new file mode 100644 index 0000000..104b949 --- /dev/null +++ b/v2.0/samples/metering-labels-list-get-resp.json @@ -0,0 +1,16 @@ +{ + "metering_labels": [ + { + "tenant_id": "45345b0ee1ea477fac0f541b2cb79cd4", + "description": "label1 description", + "name": "label1", + "id": "a6700594-5b7a-4105-8bfe-723b346ce866" + }, + { + "tenant_id": "45345b0ee1ea477fac0f541b2cb79cd4", + "description": "label2 description", + "name": "label2", + "id": "e131d186-b02d-4c0b-83d5-0c0725c4f812" + } + ] +} diff --git a/v2.0/wadl/metering-labels.wadl b/v2.0/wadl/metering-labels.wadl new file mode 100644 index 0000000..f064f43 --- /dev/null +++ b/v2.0/wadl/metering-labels.wadl @@ -0,0 +1,443 @@ + + +%common;]> + + + + + + + + + + + + + + +

+ The unique identifier of the metering + label.

+ + + + + + + + + + +

+ The unique identifier of metering label rule. +

+ + + + + + + + + + Lists a summary of all + l3 metering labels belonging to the specified + tenant. + The list includes the unique ID for each metering + labels. + This operation does not require a request + body. + This operation returns a response body. + + + + + + + + + + + + + + + + + + + + + Creates a l3 metering label. + + This operation requires a request body. + The following table describes the required and + optional attributes in the request body: + + + + + + + + +
Create Metering Label + Rule Request Attributes
AttributeRequiredDescription
nameRequiredThe name of the metering label. +
descriptionOptional + Description for the metering label. +
+ This operation returns a response body, which + contains the following informations about the metering label: + + name. + Name of the metering label. + description. Description of + the metering label. + tenant_id. The tenant ID for the + specified metering label. + + id. The metering label ID + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Shows informations for a specified + metering label. + This operation does not require a request + body. + This operation returns a response body that contains + the description, name, ID. + + + + + + + + + + + + + + + + + + + + + + + + + + + Deletes a l3 metering label. + + This operation deletes a l3 metering label. + + This operation does not require a request body. This + operation does not return a response body. + + + + + + + + + + + + + + + + + + + + + + + + + + + Lists a summary of all + l3 metering label rules belonging to the specified + tenant. + The list provides the unique ID for each metering + label rule. + This operation does not require a request body. This + operation returns a response body. + + + + + + + + + + + + + + + + + + + + + + + + Creates a l3 metering label rule. + + This operation requires a request body. + The following table describes the required and + optional attributes in the request body: + + + + + + + + + + + + +
Create Metering Label + Rule Request Attributes
AttributeRequiredDescription
directionOptionalIngress or egress: The direction in + which metering rule is + applied. Default: ingress +
metering_label_idRequiredThe meteting label ID to associate + with this metering rule. +
excludedOptional + Specify whether the remote_ip_prefix will be + excluded or not from traffic counters of the metering + label, ie: to not count the traffic of a + specific IP address of a range. Default: False +
remote_ip_prefixRequiredThe + remote IP prefix to be associated with + this metering rule. + packet.
+ This operation returns a response body. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Shows detailed informations for a + specified metering label rule. + This operation does not require a request + body. + This operation returns a response body, which + contains the following informations about the metering label + rule: + direction. + Either ingress or egress. + excluded. Either True or + False. + The ID for the specified metering label + rule + The remote IP prefix + The metering label ID for the metering label + with which the rule is associated + + + + + + + + + + + + + + + + + + + + + + + + + + + + Deletes a specified l3 metering label rule. + + This operation does not require a request + body. + This operation does not return a response body. + + + + + + + + + + + + + + + + + + + + + + + + + +