Currently compute security_group_default_rules_client returns Response by removing top key from Response. For example- return service_client.ResponseBody(resp, body['security_group_default_rule']) As service clients are in direction to move to Tempest-lib, all service clients should return Response without any truncation. One good example is Resource pagination links which are lost with current way of return value. Resource pagination links are present in parallel (not inside) to top key of Response. This patch makes compute security_group_default_rules_client to return complete Response body. Change-Id: Ie39cb8a0d710c1412836f93ce6b3df60faad9f76 Implements: blueprint method-return-value-and-move-service-clients-to-lib
132 lines
5.7 KiB
Python
132 lines
5.7 KiB
Python
# Copyright 2014 NEC Corporation. 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.
|
|
|
|
from tempest_lib import exceptions as lib_exc
|
|
import testtools
|
|
|
|
from tempest.api.compute import base
|
|
from tempest import config
|
|
from tempest import test
|
|
|
|
CONF = config.CONF
|
|
|
|
|
|
class SecurityGroupDefaultRulesTest(base.BaseV2ComputeAdminTest):
|
|
|
|
@classmethod
|
|
# TODO(GMann): Once Bug# 1311500 is fixed, these test can run
|
|
# for Neutron also.
|
|
@testtools.skipIf(CONF.service_available.neutron,
|
|
"Skip as this functionality is not yet "
|
|
"implemented in Neutron. Related Bug#1311500")
|
|
def setup_credentials(cls):
|
|
# A network and a subnet will be created for these tests
|
|
cls.set_network_resources(network=True, subnet=True)
|
|
super(SecurityGroupDefaultRulesTest, cls).setup_credentials()
|
|
|
|
@classmethod
|
|
def setup_clients(cls):
|
|
super(SecurityGroupDefaultRulesTest, cls).setup_clients()
|
|
cls.adm_client = cls.os_adm.security_group_default_rules_client
|
|
|
|
def _create_security_group_default_rules(self, ip_protocol='tcp',
|
|
from_port=22, to_port=22,
|
|
cidr='10.10.0.0/24'):
|
|
# Create Security Group default rule
|
|
rule = self.adm_client.create_security_default_group_rule(
|
|
ip_protocol=ip_protocol,
|
|
from_port=from_port,
|
|
to_port=to_port,
|
|
cidr=cidr)['security_group_default_rule']
|
|
self.assertEqual(ip_protocol, rule['ip_protocol'])
|
|
self.assertEqual(from_port, rule['from_port'])
|
|
self.assertEqual(to_port, rule['to_port'])
|
|
self.assertEqual(cidr, rule['ip_range']['cidr'])
|
|
return rule
|
|
|
|
@test.idempotent_id('6d880615-eec3-4d29-97c5-7a074dde239d')
|
|
def test_create_delete_security_group_default_rules(self):
|
|
# Create and delete Security Group default rule
|
|
ip_protocols = ['tcp', 'udp', 'icmp']
|
|
for ip_protocol in ip_protocols:
|
|
rule = self._create_security_group_default_rules(ip_protocol)
|
|
# Delete Security Group default rule
|
|
self.adm_client.delete_security_group_default_rule(rule['id'])
|
|
self.assertRaises(lib_exc.NotFound,
|
|
self.adm_client.show_security_group_default_rule,
|
|
rule['id'])
|
|
|
|
@test.idempotent_id('4d752e0a-33a1-4c3a-b498-ff8667ca22e5')
|
|
def test_create_security_group_default_rule_without_cidr(self):
|
|
ip_protocol = 'udp'
|
|
from_port = 80
|
|
to_port = 80
|
|
rule = self.adm_client.create_security_default_group_rule(
|
|
ip_protocol=ip_protocol,
|
|
from_port=from_port,
|
|
to_port=to_port)['security_group_default_rule']
|
|
self.addCleanup(self.adm_client.delete_security_group_default_rule,
|
|
rule['id'])
|
|
self.assertNotEqual(0, rule['id'])
|
|
self.assertEqual('0.0.0.0/0', rule['ip_range']['cidr'])
|
|
|
|
@test.idempotent_id('29f2d218-69b0-4a95-8f3d-6bd0ef732b3a')
|
|
def test_create_security_group_default_rule_with_blank_cidr(self):
|
|
ip_protocol = 'icmp'
|
|
from_port = 10
|
|
to_port = 10
|
|
cidr = ''
|
|
rule = self.adm_client.create_security_default_group_rule(
|
|
ip_protocol=ip_protocol,
|
|
from_port=from_port,
|
|
to_port=to_port,
|
|
cidr=cidr)['security_group_default_rule']
|
|
self.addCleanup(self.adm_client.delete_security_group_default_rule,
|
|
rule['id'])
|
|
self.assertNotEqual(0, rule['id'])
|
|
self.assertEqual('0.0.0.0/0', rule['ip_range']['cidr'])
|
|
|
|
@test.idempotent_id('6e6de55e-9146-4ae0-89f2-3569586e0b9b')
|
|
def test_security_group_default_rules_list(self):
|
|
ip_protocol = 'tcp'
|
|
from_port = 22
|
|
to_port = 22
|
|
cidr = '10.10.0.0/24'
|
|
rule = self._create_security_group_default_rules(ip_protocol,
|
|
from_port,
|
|
to_port,
|
|
cidr)
|
|
self.addCleanup(self.adm_client.delete_security_group_default_rule,
|
|
rule['id'])
|
|
rules = (self.adm_client.list_security_group_default_rules()
|
|
['security_group_default_rules'])
|
|
self.assertNotEqual(0, len(rules))
|
|
self.assertIn(rule, rules)
|
|
|
|
@test.idempotent_id('15cbb349-86b4-4f71-a048-04b7ef3f150b')
|
|
def test_default_security_group_default_rule_show(self):
|
|
ip_protocol = 'tcp'
|
|
from_port = 22
|
|
to_port = 22
|
|
cidr = '10.10.0.0/24'
|
|
rule = self._create_security_group_default_rules(ip_protocol,
|
|
from_port,
|
|
to_port,
|
|
cidr)
|
|
self.addCleanup(self.adm_client.delete_security_group_default_rule,
|
|
rule['id'])
|
|
fetched_rule = self.adm_client.show_security_group_default_rule(
|
|
rule['id'])['security_group_default_rule']
|
|
self.assertEqual(rule, fetched_rule)
|