Client for metering extension
blueprint bandwidth-router-label Change-Id: I4d55c0f950d380c89e0d17c08facfe9ed078dd8e
This commit is contained in:
parent
a3f5d0ad7f
commit
944333b1e6
|
@ -0,0 +1,137 @@
|
||||||
|
# Copyright (C) 2013 eNovance SAS <licensing@enovance.com>
|
||||||
|
#
|
||||||
|
# Author: Sylvain Afchain <sylvain.afchain@enovance.com>
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||||
|
# not use this file except in compliance with the License. You may obtain
|
||||||
|
# a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
# License for the specific language governing permissions and limitations
|
||||||
|
# under the License.
|
||||||
|
|
||||||
|
import logging
|
||||||
|
|
||||||
|
from neutronclient.neutron import v2_0 as neutronv20
|
||||||
|
|
||||||
|
|
||||||
|
class ListMeteringLabel(neutronv20.ListCommand):
|
||||||
|
"""List metering labels that belong to a given tenant."""
|
||||||
|
|
||||||
|
resource = 'metering_label'
|
||||||
|
log = logging.getLogger(__name__ + '.ListMeteringLabel')
|
||||||
|
list_columns = ['id', 'name', 'description']
|
||||||
|
pagination_support = True
|
||||||
|
sorting_support = True
|
||||||
|
|
||||||
|
|
||||||
|
class ShowMeteringLabel(neutronv20.ShowCommand):
|
||||||
|
"""Show information of a given metering label."""
|
||||||
|
|
||||||
|
resource = 'metering_label'
|
||||||
|
log = logging.getLogger(__name__ + '.ShowMeteringLabel')
|
||||||
|
allow_names = True
|
||||||
|
|
||||||
|
|
||||||
|
class CreateMeteringLabel(neutronv20.CreateCommand):
|
||||||
|
"""Create a metering label for a given tenant."""
|
||||||
|
|
||||||
|
resource = 'metering_label'
|
||||||
|
log = logging.getLogger(__name__ + '.CreateMeteringLabel')
|
||||||
|
|
||||||
|
def add_known_arguments(self, parser):
|
||||||
|
parser.add_argument(
|
||||||
|
'name', metavar='NAME',
|
||||||
|
help='Name of metering label to create')
|
||||||
|
parser.add_argument(
|
||||||
|
'--description',
|
||||||
|
help='description of metering label to create')
|
||||||
|
|
||||||
|
def args2body(self, parsed_args):
|
||||||
|
body = {'metering_label': {
|
||||||
|
'name': parsed_args.name}, }
|
||||||
|
|
||||||
|
if parsed_args.tenant_id:
|
||||||
|
body['metering_label'].update({'tenant_id': parsed_args.tenant_id})
|
||||||
|
if parsed_args.description:
|
||||||
|
body['metering_label'].update(
|
||||||
|
{'description': parsed_args.description})
|
||||||
|
return body
|
||||||
|
|
||||||
|
|
||||||
|
class DeleteMeteringLabel(neutronv20.DeleteCommand):
|
||||||
|
"""Delete a given metering label."""
|
||||||
|
|
||||||
|
log = logging.getLogger(__name__ + '.DeleteMeteringLabel')
|
||||||
|
resource = 'metering_label'
|
||||||
|
allow_names = True
|
||||||
|
|
||||||
|
|
||||||
|
class ListMeteringLabelRule(neutronv20.ListCommand):
|
||||||
|
"""List metering labels that belong to a given label."""
|
||||||
|
|
||||||
|
resource = 'metering_label_rule'
|
||||||
|
log = logging.getLogger(__name__ + '.ListMeteringLabelRule')
|
||||||
|
list_columns = ['id', 'excluded', 'direction', 'remote_ip_prefix']
|
||||||
|
pagination_support = True
|
||||||
|
sorting_support = True
|
||||||
|
|
||||||
|
|
||||||
|
class ShowMeteringLabelRule(neutronv20.ShowCommand):
|
||||||
|
"""Show information of a given metering label rule."""
|
||||||
|
|
||||||
|
resource = 'metering_label_rule'
|
||||||
|
log = logging.getLogger(__name__ + '.ShowMeteringLabelRule')
|
||||||
|
|
||||||
|
|
||||||
|
class CreateMeteringLabelRule(neutronv20.CreateCommand):
|
||||||
|
"""Create a metering label rule for a given label."""
|
||||||
|
|
||||||
|
resource = 'metering_label_rule'
|
||||||
|
log = logging.getLogger(__name__ + '.CreateMeteringLabelRule')
|
||||||
|
|
||||||
|
def add_known_arguments(self, parser):
|
||||||
|
parser.add_argument(
|
||||||
|
'label_id', metavar='LABEL',
|
||||||
|
help='Id or Name of the label')
|
||||||
|
parser.add_argument(
|
||||||
|
'remote_ip_prefix', metavar='REMOTE_IP_PREFIX',
|
||||||
|
help='cidr to match on')
|
||||||
|
parser.add_argument(
|
||||||
|
'--direction',
|
||||||
|
default='ingress', choices=['ingress', 'egress'],
|
||||||
|
help='direction of traffic, default:ingress')
|
||||||
|
parser.add_argument(
|
||||||
|
'--excluded',
|
||||||
|
action='store_true',
|
||||||
|
help='exclude this cidr from the label, default:not excluded')
|
||||||
|
|
||||||
|
def args2body(self, parsed_args):
|
||||||
|
neutron_client = self.get_client()
|
||||||
|
neutron_client.format = parsed_args.request_format
|
||||||
|
label_id = neutronv20.find_resourceid_by_name_or_id(
|
||||||
|
neutron_client, 'metering_label', parsed_args.label_id)
|
||||||
|
|
||||||
|
body = {'metering_label_rule': {
|
||||||
|
'metering_label_id': label_id,
|
||||||
|
'remote_ip_prefix': parsed_args.remote_ip_prefix
|
||||||
|
}}
|
||||||
|
|
||||||
|
if parsed_args.direction:
|
||||||
|
body['metering_label_rule'].update(
|
||||||
|
{'direction': parsed_args.direction})
|
||||||
|
if parsed_args.excluded:
|
||||||
|
body['metering_label_rule'].update(
|
||||||
|
{'excluded': True})
|
||||||
|
return body
|
||||||
|
|
||||||
|
|
||||||
|
class DeleteMeteringLabelRule(neutronv20.DeleteCommand):
|
||||||
|
"""Delete a given metering label."""
|
||||||
|
|
||||||
|
log = logging.getLogger(__name__ + '.DeleteMeteringLabelRule')
|
||||||
|
resource = 'metering_label_rule'
|
|
@ -42,6 +42,7 @@ from neutronclient.neutron.v2_0.lb import healthmonitor as lb_healthmonitor
|
||||||
from neutronclient.neutron.v2_0.lb import member as lb_member
|
from neutronclient.neutron.v2_0.lb import member as lb_member
|
||||||
from neutronclient.neutron.v2_0.lb import pool as lb_pool
|
from neutronclient.neutron.v2_0.lb import pool as lb_pool
|
||||||
from neutronclient.neutron.v2_0.lb import vip as lb_vip
|
from neutronclient.neutron.v2_0.lb import vip as lb_vip
|
||||||
|
from neutronclient.neutron.v2_0 import metering
|
||||||
from neutronclient.neutron.v2_0 import network
|
from neutronclient.neutron.v2_0 import network
|
||||||
from neutronclient.neutron.v2_0 import networkprofile
|
from neutronclient.neutron.v2_0 import networkprofile
|
||||||
from neutronclient.neutron.v2_0 import nvp_qos_queue
|
from neutronclient.neutron.v2_0 import nvp_qos_queue
|
||||||
|
@ -250,6 +251,14 @@ COMMAND_V2 = {
|
||||||
'vpn-ikepolicy-create': ikepolicy.CreateIKEPolicy,
|
'vpn-ikepolicy-create': ikepolicy.CreateIKEPolicy,
|
||||||
'vpn-ikepolicy-update': ikepolicy.UpdateIKEPolicy,
|
'vpn-ikepolicy-update': ikepolicy.UpdateIKEPolicy,
|
||||||
'vpn-ikepolicy-delete': ikepolicy.DeleteIKEPolicy,
|
'vpn-ikepolicy-delete': ikepolicy.DeleteIKEPolicy,
|
||||||
|
'meter-label-create': metering.CreateMeteringLabel,
|
||||||
|
'meter-label-list': metering.ListMeteringLabel,
|
||||||
|
'meter-label-show': metering.ShowMeteringLabel,
|
||||||
|
'meter-label-delete': metering.DeleteMeteringLabel,
|
||||||
|
'meter-label-rule-create': metering.CreateMeteringLabelRule,
|
||||||
|
'meter-label-rule-list': metering.ListMeteringLabelRule,
|
||||||
|
'meter-label-rule-show': metering.ShowMeteringLabelRule,
|
||||||
|
'meter-label-rule-delete': metering.DeleteMeteringLabelRule,
|
||||||
}
|
}
|
||||||
|
|
||||||
COMMANDS = {'2.0': COMMAND_V2}
|
COMMANDS = {'2.0': COMMAND_V2}
|
||||||
|
|
|
@ -189,7 +189,8 @@ class CLITestV20Base(testtools.TestCase):
|
||||||
'security_group_rule', 'qos_queue',
|
'security_group_rule', 'qos_queue',
|
||||||
'network_gateway', 'credential',
|
'network_gateway', 'credential',
|
||||||
'network_profile', 'policy_profile',
|
'network_profile', 'policy_profile',
|
||||||
'ikepolicy', 'ipsecpolicy']
|
'ikepolicy', 'ipsecpolicy',
|
||||||
|
'metering_label', 'metering_label_rule']
|
||||||
if (resource in non_admin_status_resources):
|
if (resource in non_admin_status_resources):
|
||||||
body = {resource: {}, }
|
body = {resource: {}, }
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -0,0 +1,102 @@
|
||||||
|
# Copyright (C) 2013 eNovance SAS <licensing@enovance.com>
|
||||||
|
#
|
||||||
|
# Author: Sylvain Afchain <sylvain.afchain@enovance.com>
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||||
|
# not use this file except in compliance with the License. You may obtain
|
||||||
|
# a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
# License for the specific language governing permissions and limitations
|
||||||
|
# under the License.
|
||||||
|
|
||||||
|
import sys
|
||||||
|
|
||||||
|
from neutronclient.neutron.v2_0 import metering
|
||||||
|
from neutronclient.tests.unit import test_cli20
|
||||||
|
|
||||||
|
|
||||||
|
class CLITestV20MeteringJSON(test_cli20.CLITestV20Base):
|
||||||
|
def test_create_metering_label(self):
|
||||||
|
"""Create a metering label."""
|
||||||
|
resource = 'metering_label'
|
||||||
|
cmd = metering.CreateMeteringLabel(
|
||||||
|
test_cli20.MyApp(sys.stdout), None)
|
||||||
|
name = 'my label'
|
||||||
|
myid = 'myid'
|
||||||
|
description = 'my description'
|
||||||
|
args = [name, '--description', description]
|
||||||
|
position_names = ['name', 'description']
|
||||||
|
position_values = [name, description]
|
||||||
|
self._test_create_resource(resource, cmd, name, myid, args,
|
||||||
|
position_names, position_values)
|
||||||
|
|
||||||
|
def test_list_metering_labels(self):
|
||||||
|
resources = "metering_labels"
|
||||||
|
cmd = metering.ListMeteringLabel(
|
||||||
|
test_cli20.MyApp(sys.stdout), None)
|
||||||
|
self._test_list_resources(resources, cmd)
|
||||||
|
|
||||||
|
def test_delete_metering_label(self):
|
||||||
|
"""Delete a metering label."""
|
||||||
|
resource = 'metering_label'
|
||||||
|
cmd = metering.DeleteMeteringLabel(
|
||||||
|
test_cli20.MyApp(sys.stdout), None)
|
||||||
|
myid = 'myid'
|
||||||
|
args = [myid]
|
||||||
|
self._test_delete_resource(resource, cmd, myid, args)
|
||||||
|
|
||||||
|
def test_show_metering_label(self):
|
||||||
|
resource = 'metering_label'
|
||||||
|
cmd = metering.ShowMeteringLabel(
|
||||||
|
test_cli20.MyApp(sys.stdout), None)
|
||||||
|
args = ['--fields', 'id', self.test_id]
|
||||||
|
self._test_show_resource(resource, cmd, self.test_id,
|
||||||
|
args, ['id'])
|
||||||
|
|
||||||
|
def test_create_metering_label_rule(self):
|
||||||
|
resource = 'metering_label_rule'
|
||||||
|
cmd = metering.CreateMeteringLabelRule(
|
||||||
|
test_cli20.MyApp(sys.stdout), None)
|
||||||
|
myid = 'myid'
|
||||||
|
metering_label_id = 'aaa'
|
||||||
|
remote_ip_prefix = '10.0.0.0/24'
|
||||||
|
direction = 'ingress'
|
||||||
|
args = [metering_label_id, remote_ip_prefix, '--direction', direction,
|
||||||
|
'--excluded']
|
||||||
|
position_names = ['metering_label_id', 'remote_ip_prefix', 'direction',
|
||||||
|
'excluded']
|
||||||
|
position_values = [metering_label_id, remote_ip_prefix,
|
||||||
|
direction, True]
|
||||||
|
self._test_create_resource(resource, cmd, metering_label_id,
|
||||||
|
myid, args, position_names, position_values)
|
||||||
|
|
||||||
|
def test_list_metering_label_rules(self):
|
||||||
|
resources = "metering_label_rules"
|
||||||
|
cmd = metering.ListMeteringLabelRule(
|
||||||
|
test_cli20.MyApp(sys.stdout), None)
|
||||||
|
self._test_list_resources(resources, cmd)
|
||||||
|
|
||||||
|
def test_delete_metering_label_rule(self):
|
||||||
|
resource = 'metering_label_rule'
|
||||||
|
cmd = metering.DeleteMeteringLabelRule(
|
||||||
|
test_cli20.MyApp(sys.stdout), None)
|
||||||
|
myid = 'myid'
|
||||||
|
args = [myid]
|
||||||
|
self._test_delete_resource(resource, cmd, myid, args)
|
||||||
|
|
||||||
|
def test_show_metering_label_rule(self):
|
||||||
|
resource = 'metering_label_rule'
|
||||||
|
cmd = metering.ShowMeteringLabelRule(
|
||||||
|
test_cli20.MyApp(sys.stdout), None)
|
||||||
|
args = ['--fields', 'id', self.test_id]
|
||||||
|
self._test_show_resource(resource, cmd, self.test_id,
|
||||||
|
args, ['id'])
|
||||||
|
|
||||||
|
|
||||||
|
class CLITestV20MeteringXML(CLITestV20MeteringJSON):
|
||||||
|
format = 'xml'
|
|
@ -200,7 +200,10 @@ class Client(object):
|
||||||
policy_profiles_path = "/policy_profiles"
|
policy_profiles_path = "/policy_profiles"
|
||||||
policy_profile_path = "/policy_profiles/%s"
|
policy_profile_path = "/policy_profiles/%s"
|
||||||
policy_profile_bindings_path = "/policy_profile_bindings"
|
policy_profile_bindings_path = "/policy_profile_bindings"
|
||||||
|
metering_labels_path = "/metering/metering-labels"
|
||||||
|
metering_label_path = "/metering/metering-labels/%s"
|
||||||
|
metering_label_rules_path = "/metering/metering-label-rules"
|
||||||
|
metering_label_rule_path = "/metering/metering-label-rules/%s"
|
||||||
DHCP_NETS = '/dhcp-networks'
|
DHCP_NETS = '/dhcp-networks'
|
||||||
DHCP_AGENTS = '/dhcp-agents'
|
DHCP_AGENTS = '/dhcp-agents'
|
||||||
L3_ROUTERS = '/l3-routers'
|
L3_ROUTERS = '/l3-routers'
|
||||||
|
@ -236,6 +239,8 @@ class Client(object):
|
||||||
'firewall_rules': 'firewall_rule',
|
'firewall_rules': 'firewall_rule',
|
||||||
'firewall_policies': 'firewall_policy',
|
'firewall_policies': 'firewall_policy',
|
||||||
'firewalls': 'firewall',
|
'firewalls': 'firewall',
|
||||||
|
'metering_labels': 'metering_label',
|
||||||
|
'metering_label_rules': 'metering_label_rule'
|
||||||
}
|
}
|
||||||
# 8192 Is the default max URI len for eventlet.wsgi.server
|
# 8192 Is the default max URI len for eventlet.wsgi.server
|
||||||
MAX_URI_LEN = 8192
|
MAX_URI_LEN = 8192
|
||||||
|
@ -1057,6 +1062,51 @@ class Client(object):
|
||||||
"""Update a policy profile."""
|
"""Update a policy profile."""
|
||||||
return self.put(self.policy_profile_path % (profile), body=body)
|
return self.put(self.policy_profile_path % (profile), body=body)
|
||||||
|
|
||||||
|
@APIParamsCall
|
||||||
|
def create_metering_label(self, body=None):
|
||||||
|
"""Creates a metering label."""
|
||||||
|
return self.post(self.metering_labels_path, body=body)
|
||||||
|
|
||||||
|
@APIParamsCall
|
||||||
|
def delete_metering_label(self, label):
|
||||||
|
"""Deletes the specified metering label."""
|
||||||
|
return self.delete(self.metering_label_path % (label))
|
||||||
|
|
||||||
|
@APIParamsCall
|
||||||
|
def list_metering_labels(self, retrieve_all=True, **_params):
|
||||||
|
"""Fetches a list of all metering labels for a tenant."""
|
||||||
|
return self.list('metering_labels', self.metering_labels_path,
|
||||||
|
retrieve_all, **_params)
|
||||||
|
|
||||||
|
@APIParamsCall
|
||||||
|
def show_metering_label(self, metering_label, **_params):
|
||||||
|
"""Fetches information of a certain metering label."""
|
||||||
|
return self.get(self.metering_label_path %
|
||||||
|
(metering_label), params=_params)
|
||||||
|
|
||||||
|
@APIParamsCall
|
||||||
|
def create_metering_label_rule(self, body=None):
|
||||||
|
"""Creates a metering label rule."""
|
||||||
|
return self.post(self.metering_label_rules_path, body=body)
|
||||||
|
|
||||||
|
@APIParamsCall
|
||||||
|
def delete_metering_label_rule(self, rule):
|
||||||
|
"""Deletes the specified metering label rule."""
|
||||||
|
return self.delete(self.metering_label_rule_path % (rule))
|
||||||
|
|
||||||
|
@APIParamsCall
|
||||||
|
def list_metering_label_rules(self, retrieve_all=True, **_params):
|
||||||
|
"""Fetches a list of all metering label rules for a label."""
|
||||||
|
return self.list('metering_label_rules',
|
||||||
|
self.metering_label_rules_path, retrieve_all,
|
||||||
|
**_params)
|
||||||
|
|
||||||
|
@APIParamsCall
|
||||||
|
def show_metering_label_rule(self, metering_label_rule, **_params):
|
||||||
|
"""Fetches information of a certain metering label rule."""
|
||||||
|
return self.get(self.metering_label_rule_path %
|
||||||
|
(metering_label_rule), params=_params)
|
||||||
|
|
||||||
def __init__(self, **kwargs):
|
def __init__(self, **kwargs):
|
||||||
"""Initialize a new client for the Neutron v2.0 API."""
|
"""Initialize a new client for the Neutron v2.0 API."""
|
||||||
super(Client, self).__init__()
|
super(Client, self).__init__()
|
||||||
|
|
Loading…
Reference in New Issue