0a60aae852
Module novaclient.v1_1 is used as implementation of V1.1, V2 and V3. Since future development(microversioning) will be done across V2, implementation should be done in appropriate module(to prevent misleading). Despite the fact that implementation for all versions are equal, discover method for contrib path worked only for v1.1. This patch fixes this bug and modifies shell tests to check all versions. Change-Id: Ib6798f4dfe177586302141f522dc593560ce6a5b
79 lines
2.6 KiB
Python
79 lines
2.6 KiB
Python
# Copyright 2011 OpenStack Foundation
|
|
# All Rights Reserved.
|
|
#
|
|
# 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.
|
|
|
|
"""
|
|
Security group rules interface (1.1 extension).
|
|
"""
|
|
|
|
from novaclient import base
|
|
from novaclient import exceptions
|
|
from novaclient.i18n import _
|
|
|
|
|
|
class SecurityGroupRule(base.Resource):
|
|
def __str__(self):
|
|
return str(self.id)
|
|
|
|
def delete(self):
|
|
self.manager.delete(self)
|
|
|
|
|
|
class SecurityGroupRuleManager(base.Manager):
|
|
resource_class = SecurityGroupRule
|
|
|
|
def create(self, parent_group_id, ip_protocol=None, from_port=None,
|
|
to_port=None, cidr=None, group_id=None):
|
|
"""
|
|
Create a security group rule
|
|
|
|
:param ip_protocol: IP protocol, one of 'tcp', 'udp' or 'icmp'
|
|
:param from_port: Source port
|
|
:param to_port: Destination port
|
|
:param cidr: Destination IP address(es) in CIDR notation
|
|
:param group_id: Security group id (int)
|
|
:param parent_group_id: Parent security group id (int)
|
|
"""
|
|
|
|
try:
|
|
from_port = int(from_port)
|
|
except (TypeError, ValueError):
|
|
raise exceptions.CommandError(_("From port must be an integer."))
|
|
try:
|
|
to_port = int(to_port)
|
|
except (TypeError, ValueError):
|
|
raise exceptions.CommandError(_("To port must be an integer."))
|
|
if ip_protocol.upper() not in ['TCP', 'UDP', 'ICMP']:
|
|
raise exceptions.CommandError(_("IP protocol must be 'tcp', 'udp'"
|
|
", or 'icmp'."))
|
|
|
|
body = {"security_group_rule": {
|
|
"ip_protocol": ip_protocol,
|
|
"from_port": from_port,
|
|
"to_port": to_port,
|
|
"cidr": cidr,
|
|
"group_id": group_id,
|
|
"parent_group_id": parent_group_id}}
|
|
|
|
return self._create('/os-security-group-rules', body,
|
|
'security_group_rule')
|
|
|
|
def delete(self, rule):
|
|
"""
|
|
Delete a security group rule
|
|
|
|
:param rule: The security group rule to delete (ID or Class)
|
|
"""
|
|
self._delete('/os-security-group-rules/%s' % base.getid(rule))
|