openstack/heat
Code Issues Proposed changes

Merge "Remove deprecated method"

Browse Source
This commit is contained in:
Jenkins 2015-12-02 15:42:03 +00:00 committed by Gerrit Code Review
commit 0435b7cc40
2 changed files with 0 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
heat/engine/resources/openstack/neutron/neutron.py
View File

@ -10,11 +10,8 @@
# 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 oslo_utils import uuidutils
import six
import warnings
from heat.common import exception
from heat.common.i18n import _
from heat.engine import resource
@ -109,45 +106,6 @@ class NeutronResource(resource.Resource):
def get_reference_id(self):
return six.text_type(self.resource_id)
@staticmethod
def get_secgroup_uuids(security_groups, client, tenant_id):
"""Returns a list of security group UUIDs.
Args:
security_groups: List of security group names or UUIDs
client: reference to neutronclient
tenant_id: the tenant id to match the security_groups
"""
warnings.warn('neutron.NeutronResource.get_secgroup_uuids is '
'deprecated. Use '
'self.client_plugin("neutron").get_secgroup_uuids')
seclist = []
all_groups = None
for sg in security_groups:
if uuidutils.is_uuid_like(sg):
seclist.append(sg)
else:
if not all_groups:
response = client.list_security_groups()
all_groups = response['security_groups']
same_name_groups = [g for g in all_groups if g['name'] == sg]
groups = [g['id'] for g in same_name_groups]
if len(groups) == 0:
raise exception.EntityNotFound(entity='Resource', name=sg)
elif len(groups) == 1:
seclist.append(groups[0])
else:
# for admin roles, can get the other users'
# securityGroups, so we should match the tenant_id with
# the groups, and return the own one
own_groups = [g['id'] for g in same_name_groups
if g['tenant_id'] == tenant_id]
if len(own_groups) == 1:
seclist.append(own_groups[0])
else:
raise exception.PhysicalResourceNameAmbiguity(name=sg)
return seclist
def _not_found_in_call(self, func, *args, **kwargs):
try:
func(*args, **kwargs)

92
heat/tests/openstack/neutron/test_neutron.py
View File

@ -13,7 +13,6 @@
import mock
from neutronclient.common import exceptions as qe
from neutronclient.v2_0 import client as neutronclient
import six
from heat.common import exception
@ -23,7 +22,6 @@ from heat.engine.resources.openstack.neutron import net
from heat.engine.resources.openstack.neutron import neutron as nr
from heat.engine import rsrc_defn
from heat.tests import common
from heat.tests import utils
class NeutronTest(common.HeatTestCase):
@ -111,93 +109,3 @@ class NeutronTest(common.HeatTestCase):
# and return None due to resource_id is None
res.attributes.reset_resolved_values()
self.assertIsNone(res.FnGetAtt('show'))
class GetSecGroupUuidTest(common.HeatTestCase):
scenarios = [
('with_uuid', dict(
secgroups=['b62c3079-6946-44f5-a67b-6b9091884d4f',
'9887157c-d092-40f5-b547-6361915fce7d'],
expected=['b62c3079-6946-44f5-a67b-6b9091884d4f',
'9887157c-d092-40f5-b547-6361915fce7d'],
error=False,
fake_group_list=None)),
('with_name', dict(
secgroups=['security_group_1'],
expected=['0389f747-7785-4757-b7bb-2ab07e4b09c3'],
error=False,
fake_group_list={
'security_groups': [
{
'tenant_id': 'dc4b074874244f7693dd65583733a758',
'id': '0389f747-7785-4757-b7bb-2ab07e4b09c3',
'name': 'security_group_1',
'security_group_rules': [],
'description': 'no protocol'
}
]
})),
('two_same_names_one_belongs_to_tenant', dict(
secgroups=['security_group_1'],
expected=['0389f747-7785-4757-b7bb-2ab07e4b09c3'],
error=False,
fake_group_list={
'security_groups': [
{
'tenant_id': 'dc4b074874244f7693dd65583733a758',
'id': '0389f747-7785-4757-b7bb-2ab07e4b09c3',
'name': 'security_group_1',
'security_group_rules': [],
'description': 'no protocol'
},
{
'tenant_id': '64395a8e5beb4930a18245f76a5b1570',
'id': '384ccd91-447c-4d83-832c-06974a7d3d05',
'name': 'security_group_1',
'security_group_rules': [],
'description': 'no protocol'
}
]
})),
('two_same_names_both_belongs_to_tenant', dict(
secgroups=['security_group_1'],
expected=['0389f747-7785-4757-b7bb-2ab07e4b09c3'],
error=True,
fake_group_list={
'security_groups': [
{
'tenant_id': 'dc4b074874244f7693dd65583733a758',
'id': '0389f747-7785-4757-b7bb-2ab07e4b09c3',
'name': 'security_group_1',
'security_group_rules': [],
'description': 'no protocol'
},
{
'tenant_id': 'dc4b074874244f7693dd65583733a758',
'id': '384ccd91-447c-4d83-832c-06974a7d3d05',
'name': 'security_group_1',
'security_group_rules': [],
'description': 'no protocol'
}
]
}))
]
def test_secgr(self):
ctx = utils.dummy_context(
tenant_id='dc4b074874244f7693dd65583733a758')
nclient = neutronclient.Client()
mock_list = self.patchobject(neutronclient.Client,
'list_security_groups')
mock_list.return_value = self.fake_group_list
if self.error:
self.assertRaises(exception.PhysicalResourceNameAmbiguity,
nr.NeutronResource.get_secgroup_uuids,
self.secgroups, nclient, ctx.tenant_id)
else:
self.assertEqual(
self.expected,
nr.NeutronResource.get_secgroup_uuids(self.secgroups, nclient,
ctx.tenant_id))