x
/
group-based-policy
Code Issues Proposed changes

Enable hacking N326, N327 

Change-Id: Ia7c0feacc154bf36a08f1033fd5a860becfa2167
This commit is contained in:
Anna Khmelnitsky 2017-03-16 14:35:23 -07:00
parent f7f1ce349e
commit 051b34f08e
34 changed files with 147 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gbpservice/contrib/nfp/configurator/agents/firewall.py
View File

@ -14,6 +14,7 @@ import operator
import os
import oslo_messaging as messaging
import requests
import six
from neutron._i18n import _LI
@ -431,7 +432,7 @@ def load_drivers(conf):
ld = load_driver.ConfiguratorUtils(conf)
drivers = ld.load_drivers(const.SERVICE_TYPE)
for service_type, driver_name in drivers.iteritems():
for service_type, driver_name in six.iteritems(drivers):
driver_obj = driver_name(conf=conf)
drivers[service_type] = driver_obj

3
gbpservice/contrib/nfp/configurator/agents/generic_config.py
View File

@ -12,6 +12,7 @@
import copy
import os
import six
from neutron._i18n import _LI
@ -467,7 +468,7 @@ def load_drivers(conf):
cutils = utils.ConfiguratorUtils(conf)
drivers = cutils.load_drivers()
for service_type, driver_name in drivers.iteritems():
for service_type, driver_name in six.iteritems(drivers):
driver_obj = driver_name(conf=conf)
drivers[service_type] = driver_obj
LOG.info(_LI("Generic config agent loaded drivers drivers:"

3
gbpservice/contrib/nfp/configurator/agents/loadbalancer_v1.py
View File

@ -10,6 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
import six
from gbpservice.contrib.nfp.configurator.agents import agent_base
from gbpservice.contrib.nfp.configurator.lib import data_filter
@ -795,7 +796,7 @@ def load_drivers(sc, conf):
plugin_rpc = LBaasRpcSender(sc)
for service_type, dobj in drivers.iteritems():
for service_type, dobj in six.iteritems(drivers):
'''LB Driver constructor needs plugin_rpc as a param'''
instantiated_dobj = dobj(plugin_rpc=plugin_rpc, conf=conf)
drivers[service_type] = instantiated_dobj

3
gbpservice/contrib/nfp/configurator/agents/loadbalancer_v2.py
View File

@ -11,6 +11,7 @@
# under the License.
import os
import six
from neutron._i18n import _LI
@ -929,7 +930,7 @@ def load_drivers(sc, conf):
plugin_rpc = LBaaSV2RpcSender(sc)
for service_type, dobj in drivers.iteritems():
for service_type, dobj in six.iteritems(drivers):
'''LB Driver constructor needs plugin_rpc as a param'''
instantiated_dobj = dobj(plugin_rpc=plugin_rpc, conf=conf)
drivers[service_type] = instantiated_dobj

3
gbpservice/contrib/nfp/configurator/agents/nfp_service.py
View File

@ -12,6 +12,7 @@
import os
import oslo_messaging as messaging
import six
from gbpservice.contrib.nfp.configurator.agents import agent_base
from gbpservice.contrib.nfp.configurator.lib import (
@ -175,7 +176,7 @@ def load_drivers(conf):
ld = load_driver.ConfiguratorUtils(conf)
drivers = ld.load_drivers(const.SERVICE_TYPE)
for service_type, driver_name in drivers.iteritems():
for service_type, driver_name in six.iteritems(drivers):
driver_obj = driver_name(conf=conf)
drivers[service_type] = driver_obj

3
gbpservice/contrib/nfp/configurator/agents/vpn.py
View File

@ -12,6 +12,7 @@
import os
import six
from gbpservice.contrib.nfp.configurator.agents import agent_base
from gbpservice.contrib.nfp.configurator.drivers.base import base_driver
@ -377,7 +378,7 @@ def load_drivers(sc, conf):
ld = utils.ConfiguratorUtils(conf)
drivers = ld.load_drivers(const.SERVICE_TYPE)
for service_type, driver_name in drivers.iteritems():
for service_type, driver_name in six.iteritems(drivers):
driver_obj = driver_name(conf=conf)
drivers[service_type] = driver_obj

4
gbpservice/contrib/nfp/configurator/drivers/vpn/vyos/vyos_vpn_driver.py
View File

@ -13,6 +13,7 @@
import copy
import requests
import six
import time
from gbpservice.contrib.nfp.configurator.drivers.base import base_driver
@ -48,7 +49,8 @@ class RestApi(object):
self.timeout = const.REST_TIMEOUT
def _dict_to_query_str(self, args):
return '&'.join([str(k) + '=' + str(v) for k, v in args.iteritems()])
return '&'.join([str(k) + '=' + str(v)
for k, v in six.iteritems(args)])
def post(self, api, args):
"""

4
gbpservice/contrib/tests/unit/nfp/configurator/drivers/vpn/test_vpn_driver.py
View File

@ -14,6 +14,7 @@ import requests
import json
import mock
import six
from gbpservice.contrib.nfp.configurator.agents import vpn
from gbpservice.contrib.nfp.configurator.drivers.base import base_driver
@ -95,7 +96,8 @@ class VpnaasIpsecDriverTestCase(base.BaseTestCase):
self.test_dict.ipsec_vpnsvc_status)
def _dict_to_query_str(self, args):
return '&'.join([str(k) + '=' + str(v) for k, v in args.iteritems()])
return '&'.join([str(k) + '=' + str(v)
for k, v in six.iteritems(args)])
def test_delete_ipsec_site_conn(self):
"""

15
gbpservice/neutron/services/grouppolicy/drivers/cisco/apic/aim_mapping.py
View File

@ -12,6 +12,7 @@
import hashlib
import re
import six
from aim.api import resource as aim_resource
from aim import context as aim_context
@ -362,7 +363,7 @@ class AIMMappingDriver(nrd.CommonNeutronBase, aim_rpc.AIMMappingRPCMixin):
l3p_db = context._plugin._get_l3_policy(
context._plugin_context, context.current['id'])
v4v6subpools = {4: l3p_db.subnetpools_v4, 6: l3p_db.subnetpools_v6}
for k, v in v4v6subpools.iteritems():
for k, v in six.iteritems(v4v6subpools):
subpools = [sp.subnetpool_id for sp in v]
for sp_id in subpools:
self._db_plugin(
@ -900,7 +901,7 @@ class AIMMappingDriver(nrd.CommonNeutronBase, aim_rpc.AIMMappingRPCMixin):
def extend_policy_rule_dict(self, session, result):
result[cisco_apic.DIST_NAMES] = {}
aim_filter_entries = self._get_aim_filter_entries(session, result)
for k, v in aim_filter_entries.iteritems():
for k, v in six.iteritems(aim_filter_entries):
dn_list = []
for entry in v:
dn_list.append(entry.dn)
@ -1412,7 +1413,7 @@ class AIMMappingDriver(nrd.CommonNeutronBase, aim_rpc.AIMMappingRPCMixin):
def _create_aim_filter_entries(self, session, aim_ctx, aim_filter,
filter_entries):
for k, v in filter_entries.iteritems():
for k, v in six.iteritems(filter_entries):
self._create_aim_filter_entry(
session, aim_ctx, aim_filter, k, v)
@ -1428,7 +1429,7 @@ class AIMMappingDriver(nrd.CommonNeutronBase, aim_rpc.AIMMappingRPCMixin):
# This gets the Forward and Reverse Filters from the AIM DB
aim_ctx = aim_context.AimContext(session)
filters = {}
for k, v in FILTER_DIRECTIONS.iteritems():
for k, v in six.iteritems(FILTER_DIRECTIONS):
aim_filter = self._aim_filter(session, policy_rule, v)
aim_filter_fetched = self.aim.get(aim_ctx, aim_filter)
if not aim_filter_fetched:
@ -1449,7 +1450,7 @@ class AIMMappingDriver(nrd.CommonNeutronBase, aim_rpc.AIMMappingRPCMixin):
aim_ctx = aim_context.AimContext(session)
filters = self._get_aim_filters(session, policy_rule)
filters_entries = {}
for k, v in filters.iteritems():
for k, v in six.iteritems(filters):
if v:
aim_filter_entries = self.aim.find(
aim_ctx, aim_resource.FilterEntry,
@ -1688,7 +1689,7 @@ class AIMMappingDriver(nrd.CommonNeutronBase, aim_rpc.AIMMappingRPCMixin):
contracts = {alib.SERVICE_PREFIX: infra_entries,
alib.IMPLICIT_PREFIX: arp_entries}
for contract_name_prefix, entries in contracts.iteritems():
for contract_name_prefix, entries in six.iteritems(contracts):
contract_name = self.name_mapper.project(
session, l2p['tenant_id'], prefix=contract_name_prefix)
# Create Contract (one per tenant)
@ -1725,7 +1726,7 @@ class AIMMappingDriver(nrd.CommonNeutronBase, aim_rpc.AIMMappingRPCMixin):
provided_contracts=[contract_name])
filter_names = []
for k, v in entries.iteritems():
for k, v in six.iteritems(entries):
filter_name = self.name_mapper.project(
session, l2p['tenant_id'],
prefix=''.join([contract_name_prefix, k, '-']))

5
gbpservice/neutron/services/grouppolicy/drivers/cisco/apic/apic_mapping.py
View File

@ -14,6 +14,7 @@ import copy
import hashlib
import netaddr
import re
import six
from apic_ml2.neutron.db import l3out_vlan_allocation as l3out_vlan_alloc
from apic_ml2.neutron.db import port_ha_ipaddress_binding as ha_ip_db
@ -2824,7 +2825,7 @@ class ApicMappingDriver(api.ResourceMappingDriver,
# Create ARP filter/subject
entries = alib.get_arp_filter_entry()
for k, v in entries.iteritems():
for k, v in six.iteritems(entries):
self._associate_service_filter(tenant, contract, k,
k, transaction=trs, **v)
@ -3675,7 +3676,7 @@ class ApicMappingDriver(api.ResourceMappingDriver,
def _create_tenant_filter(self, rule_name, tenant, entries=None,
transaction=None):
with self.apic_manager.apic.transaction(transaction) as trs:
for k, v in entries.iteritems():
for k, v in six.iteritems(entries):
self.apic_manager.create_tenant_filter(
rule_name, owner=tenant, transaction=trs, entry=k, **v)

5
gbpservice/neutron/services/grouppolicy/drivers/cisco/apic/apic_mapping_lib.py
View File

@ -11,6 +11,7 @@
# under the License.
import copy
import six
from neutron.common import constants as n_constants
@ -168,7 +169,7 @@ def get_service_contract_filter_entries():
# ARP
arp_entries = get_arp_filter_entry()
for k, v in arp_entries.iteritems():
for k, v in six.iteritems(arp_entries):
entries[k] = v
return entries
@ -183,7 +184,7 @@ def map_to_aim_filter_entry(entry):
'sFromPort': 'source_from_port',
'icmpv4T': 'icmpv4_type',
'tcpRules': 'tcp_flags'}
return dict((mapped_keys[k], v) for (k, v) in entry.iteritems())
return dict((mapped_keys[k], v) for (k, v) in six.iteritems(entry))
def _get_filter_entry_name(entry_number):

3
gbpservice/neutron/services/grouppolicy/drivers/odl/odl_manager.py
View File

@ -12,6 +12,7 @@
import requests
from requests import auth
import six
from neutron._i18n import _LI
from oslo_config import cfg
@ -123,7 +124,7 @@ class OdlManager(object):
def _convert2ascii(self, obj):
if isinstance(obj, dict):
return {self._convert2ascii(key): self._convert2ascii(value) for
key, value in obj.iteritems()}
key, value in six.iteritems(obj)}
elif isinstance(obj, list):
return [self._convert2ascii(element) for element in obj]
elif isinstance(obj, unicode):

3
gbpservice/neutron/services/grouppolicy/plugin.py
View File

@ -11,6 +11,7 @@
# under the License.
import netaddr
import six
from neutron._i18n import _LE
from neutron._i18n import _LW
@ -130,7 +131,7 @@ class GroupPolicyPlugin(group_policy_mapping_db.GroupPolicyMappingDbPlugin):
for attr in links:
ids = obj[attr]
if ids:
if isinstance(ids, basestring):
if isinstance(ids, six.string_types):
ids = [ids]
ref_type = links[attr]
linked_objects = getattr(

3
gbpservice/neutron/services/servicechain/plugins/ncp/node_drivers/nfp_node_driver.py
View File

@ -13,6 +13,7 @@
import eventlet
from eventlet import greenpool
import six
import sys
import threading
@ -341,7 +342,7 @@ class NFPNodeDriver(driver_base.NodeDriverBase):
service_flavor_dict = dict(item.split('=') for item
in service_flavor_str.split(','))
service_details = {key.strip(): value.strip() for key, value
in service_flavor_dict.iteritems()}
in six.iteritems(service_flavor_dict)}
return service_details
def get_plumbing_info(self, context):

85
gbpservice/neutron/tests/unit/db/grouppolicy/test_group_policy_db.py
View File

@ -13,6 +13,7 @@
import copy
import os
import six
import webob.exc
import mock
@ -159,7 +160,7 @@ class ApiManagerMixin(object):
expected_res_status=None, tenant_id=None,
**kwargs):
param_str = '&'.join(['%s=%s' % (k, v)
for k, v in kwargs.iteritems()])
for k, v in six.iteritems(kwargs)])
req = self.new_list_request(plural, self.fmt,
params=param_str or None)
req.environ['neutron.context'] = context.Context(
@ -384,7 +385,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
res = self.deserialize(self.fmt,
req.get_response(self.ext_api))
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(res[resource][k], v)
def test_create_and_show_policy_target(self):
@ -394,7 +395,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
pt = self.create_policy_target(policy_target_group_id=ptg_id)
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(pt['policy_target'][k], v)
req = self.new_show_request(
@ -427,7 +428,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
'policy_targets', data, pt['policy_target']['id'])
res = self.deserialize(self.fmt, req.get_response(self.ext_api))
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(res['policy_target'][k], v)
self._test_show_resource(
@ -468,7 +469,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
provided_policy_rule_sets={provided_prs_id: None},
consumed_policy_rule_sets={consumed_prs_id: None})
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(ptg['policy_target_group'][k], v)
self._test_show_resource(
@ -480,7 +481,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
network_service_params=params)
nsp = self.create_network_service_policy(network_service_params=params)
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(nsp['network_service_policy'][k], v)
self._test_show_resource('network_service_policy',
@ -503,7 +504,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
network_service_policy_id=nsp['network_service_policy']['id'],
provided_policy_rule_sets={provided_prs_id: None},
consumed_policy_rule_sets={consumed_prs_id: None})
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(ptg1['policy_target_group'][k], v)
self._test_show_resource(
'policy_target_group', ptg1['policy_target_group']['id'], attrs)
@ -515,7 +516,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
network_service_policy_id=nsp['network_service_policy']['id'],
provided_policy_rule_sets={provided_prs_id: None},
consumed_policy_rule_sets={consumed_prs_id: None})
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(ptg2['policy_target_group'][k], v)
self._test_show_resource(
'policy_target_group', ptg2['policy_target_group']['id'], attrs)
@ -538,7 +539,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
apg = self.create_application_policy_group(
name=name)
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(apg['application_policy_group'][k], v)
self._test_show_resource('application_policy_group',
@ -559,7 +560,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
ptg1 = self.create_policy_target_group(
name=name,
application_policy_group_id=apg_id)['policy_target_group']
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(v, ptg1[k])
self._test_show_resource(
'policy_target_group', ptg1['id'], attrs)
@ -571,7 +572,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
ptg2 = self.create_policy_target_group(name=name)[
'policy_target_group']
del attrs['application_policy_group_id']
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(v, ptg2[k])
self._test_show_resource('policy_target_group', ptg2['id'], attrs)
@ -639,7 +640,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
attrs['provided_policy_rule_sets'] = [ct3_id]
attrs['consumed_policy_rule_sets'] = [ct4_id]
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(res['policy_target_group'][k], v)
self._test_show_resource('policy_target_group',
@ -683,7 +684,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
apg['application_policy_group']['id'])
res = self.deserialize(self.fmt, req.get_response(self.ext_api))
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(res['application_policy_group'][k], v)
self._test_show_resource('application_policy_group',
@ -707,7 +708,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
attrs = cm.get_create_l2_policy_default_attrs(l3_policy_id=l3p_id)
l2p = self.create_l2_policy(l3_policy_id=l3p_id)
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(l2p['l2_policy'][k], v)
self._test_show_resource('l2_policy', l2p['l2_policy']['id'], attrs)
@ -733,7 +734,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
l2p['l2_policy']['id'])
res = self.deserialize(self.fmt, req.get_response(self.ext_api))
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(res['l2_policy'][k], v)
self._test_show_resource('l2_policy', l2p['l2_policy']['id'], attrs)
@ -767,14 +768,14 @@ class TestGroupResources(GroupPolicyDbTestCase):
l3p = self.create_l3_policy(external_segments=es_dict)
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(v, l3p['l3_policy'][k])
req = self.new_show_request('l3_policies', l3p['l3_policy']['id'],
fmt=self.fmt)
res = self.deserialize(self.fmt, req.get_response(self.ext_api))
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(v, res['l3_policy'][k])
self._test_show_resource('l3_policy', l3p['l3_policy']['id'], attrs)
@ -841,7 +842,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
l3p['l3_policy']['id'])
res = self.deserialize(self.fmt, req.get_response(self.ext_api))
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(res['l3_policy'][k], v)
self._test_show_resource('l3_policy', l3p['l3_policy']['id'], attrs)
@ -901,7 +902,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
network_service_params=params)
nsp = self.create_network_service_policy(network_service_params=params)
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(nsp['network_service_policy'][k], v)
self._test_show_resource('network_service_policy',
@ -929,7 +930,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
nsp['network_service_policy']['id'])
res = self.deserialize(self.fmt, req.get_response(self.ext_api))
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(res['network_service_policy'][k], v)
self._test_show_resource('network_service_policy',
@ -991,7 +992,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
pc = self.create_policy_classifier(name=name)
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(pc['policy_classifier'][k], v)
req = self.new_show_request('policy_classifiers',
@ -999,7 +1000,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
fmt=self.fmt)
res = self.deserialize(self.fmt, req.get_response(self.ext_api))
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(res['policy_classifier'][k], v)
self._test_show_resource('policy_classifier',
@ -1013,7 +1014,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
name=name, protocol=protocol)
pc = self.create_policy_classifier(name=name, protocol=protocol)
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(pc['policy_classifier'][k], v)
req = self.new_show_request('policy_classifiers',
@ -1021,7 +1022,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
fmt=self.fmt)
res = self.deserialize(self.fmt, req.get_response(self.ext_api))
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(res['policy_classifier'][k], v)
self._test_show_resource('policy_classifier',
@ -1054,7 +1055,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
pc['policy_classifier']['id'])
res = self.deserialize(self.fmt, req.get_response(self.ext_api))
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(res['policy_classifier'][k], v)
self._test_show_resource('policy_classifier',
@ -1079,7 +1080,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
pc['policy_classifier']['id'])
res = self.deserialize(self.fmt, req.get_response(self.ext_api))
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(res['policy_classifier'][k], v)
self._test_show_resource('policy_classifier',
@ -1113,7 +1114,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
pa = self.create_policy_action(name=name)
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(pa['policy_action'][k], v)
req = self.new_show_request('policy_actions',
@ -1121,7 +1122,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
fmt=self.fmt)
res = self.deserialize(self.fmt, req.get_response(self.ext_api))
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(res['policy_action'][k], v)
self._test_show_resource('policy_action',
@ -1150,7 +1151,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
pa['policy_action']['id'])
res = self.deserialize(self.fmt, req.get_response(self.ext_api))
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(res['policy_action'][k], v)
self._test_show_resource('policy_action',
@ -1189,14 +1190,14 @@ class TestGroupResources(GroupPolicyDbTestCase):
pr = self.create_policy_rule(
name=name, policy_classifier_id=pc_id)
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(pr['policy_rule'][k], v)
req = self.new_show_request('policy_rules', pr['policy_rule']['id'],
fmt=self.fmt)
res = self.deserialize(self.fmt, req.get_response(self.ext_api))
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(res['policy_rule'][k], v)
self._test_show_resource('policy_rule',
@ -1237,7 +1238,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
pr['policy_rule']['id'])
res = self.deserialize(self.fmt, req.get_response(self.ext_api))
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(res['policy_rule'][k], v)
self._test_show_resource('policy_rule',
@ -1265,7 +1266,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
self.assertItemsEqual(actions_list,
res['policy_rule']['policy_actions'])
del attrs['policy_actions']
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(v, res['policy_rule'][k])
def test_delete_policy_rule(self):
@ -1297,14 +1298,14 @@ class TestGroupResources(GroupPolicyDbTestCase):
prs = self.create_policy_rule_set(name=name)
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(prs['policy_rule_set'][k], v)
req = self.new_show_request(
'policy_rule_sets', prs['policy_rule_set']['id'], fmt=self.fmt)
res = self.deserialize(self.fmt, req.get_response(self.ext_api))
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(res['policy_rule_set'][k], v)
self._test_show_resource('policy_rule_set',
@ -1341,7 +1342,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
res['policy_rule_set']['policy_rules'])
res['policy_rule_set']['child_policy_rule_sets'] = sorted(
res['policy_rule_set']['child_policy_rule_sets'])
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(res['policy_rule_set'][k], v)
req = self.new_show_request('policy_rule_sets',
@ -1395,7 +1396,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
prs['policy_rule_set']['id'])
res = self.deserialize(self.fmt, req.get_response(self.ext_api))
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(res['policy_rule_set'][k], v)
self._test_show_resource('policy_rule_set',
@ -1488,12 +1489,12 @@ class TestGroupResources(GroupPolicyDbTestCase):
plural = cm.get_resource_plural(type)
res = self._create_resource(type, None, False, **attrs)
expected = expected or attrs
for k, v in expected.iteritems():
for k, v in six.iteritems(expected):
self.assertEqual(v, res[type][k])
req = self.new_show_request(plural, res[type]['id'], fmt=self.fmt)
res = self.deserialize(self.fmt, req.get_response(self.ext_api))
for k, v in expected.iteritems():
for k, v in six.iteritems(expected):
self.assertEqual(v, res[type][k])
self._test_show_resource(type, res[type]['id'], expected)
@ -1559,7 +1560,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
ep['id'])
res = self.deserialize(self.fmt, req.get_response(self.ext_api))
res = res['external_policy']
for k, v in data['external_policy'].iteritems():
for k, v in six.iteritems(data['external_policy']):
self.assertEqual(v, res[k])
self._test_show_resource('external_policy', ep['id'],
@ -1580,7 +1581,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
es['id'])
res = self.deserialize(self.fmt, req.get_response(self.ext_api))
res = res['external_segment']
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(res[k], v)
self._test_show_resource('external_segment', es['id'], attrs)
@ -1601,7 +1602,7 @@ class TestGroupResources(GroupPolicyDbTestCase):
np['id'])
res = self.deserialize(self.fmt, req.get_response(self.ext_api))
res = res['nat_pool']
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(v, res[k])
self._test_show_resource('nat_pool', np['id'], attrs)

21
gbpservice/neutron/tests/unit/db/grouppolicy/test_servicechain_db.py
View File

@ -11,6 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import six
import webob.exc
from neutron import context
@ -98,7 +99,7 @@ class TestServiceChainResources(ServiceChainDbTestCase):
res = self.deserialize(self.fmt,
req.get_response(self.ext_api))
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(v, res[resource][k])
def test_create_servicechain_specs_same_node(self):
@ -141,7 +142,7 @@ class TestServiceChainResources(ServiceChainDbTestCase):
service_profile_id=profile['service_profile']['id'],
config="config1")
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(v, scn['servicechain_node'][k])
self._test_show_resource('servicechain_node',
@ -179,7 +180,7 @@ class TestServiceChainResources(ServiceChainDbTestCase):
scn['servicechain_node']['id'])
res = self.deserialize(self.fmt, req.get_response(self.ext_api))
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(v, res['servicechain_node'][k])
self._test_show_resource('servicechain_node',
@ -221,7 +222,7 @@ class TestServiceChainResources(ServiceChainDbTestCase):
scs = self.create_servicechain_spec(name=name, nodes=[scn_id])
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(v, scs['servicechain_spec'][k])
self._test_show_resource('servicechain_spec',
@ -238,7 +239,7 @@ class TestServiceChainResources(ServiceChainDbTestCase):
name=name, nodes=[scn1_id, scn2_id])
scs = self.create_servicechain_spec(
name=name, nodes=[scn1_id, scn2_id])
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(v, scs['servicechain_spec'][k])
def test_list_servicechain_specs(self):
@ -290,7 +291,7 @@ class TestServiceChainResources(ServiceChainDbTestCase):
scs['servicechain_spec']['id'])
res = self.deserialize(self.fmt, req.get_response(self.ext_api))
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(v, res['servicechain_spec'][k])
self._test_show_resource('servicechain_spec',
@ -368,7 +369,7 @@ class TestServiceChainResources(ServiceChainDbTestCase):
management_ptg_id=policy_target_group_id,
classifier_id=classifier_id,
config_param_values=config_param_values)
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(v, sci['servicechain_instance'][k])
self._test_show_resource('servicechain_instance',
@ -450,7 +451,7 @@ class TestServiceChainResources(ServiceChainDbTestCase):
req = self.new_update_request('servicechain_instances', data,
sci['servicechain_instance']['id'])
res = self.deserialize(self.fmt, req.get_response(self.ext_api))
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(v, res['servicechain_instance'][k])
self._test_show_resource('servicechain_instance',
@ -479,7 +480,7 @@ class TestServiceChainResources(ServiceChainDbTestCase):
scn = self.create_service_profile(
service_type=constants.FIREWALL, vendor="vendor1")
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(scn['service_profile'][k], v)
self._test_show_resource('service_profile',
@ -510,7 +511,7 @@ class TestServiceChainResources(ServiceChainDbTestCase):
scn['service_profile']['id'])
res = self.deserialize(self.fmt, req.get_response(self.ext_api))
for k, v in attrs.iteritems():
for k, v in six.iteritems(attrs):
self.assertEqual(res['service_profile'][k], v)
self._test_show_resource('service_profile',

3
gbpservice/neutron/tests/unit/nfp/core/test_process_model.py
View File

@ -21,6 +21,7 @@ import multiprocessing as multiprocessing
from oslo_config import cfg as oslo_config
from oslo_log import log as oslo_logging
import random
import six
import time
import unittest2
LOG = oslo_logging.getLogger(__name__)
@ -356,7 +357,7 @@ class Test_Process_Model(unittest2.TestCase):
init_load = [6, 4, 2]
worker_pids = []
resource_map = controller._manager._resource_map
for pid, em in resource_map.iteritems():
for pid, em in six.iteritems(resource_map):
load = init_load.pop()
em._load = load
worker_pids.append(pid)

5
gbpservice/neutron/tests/unit/nfp/lib/test_transport.py
View File

@ -16,6 +16,7 @@ from neutron.common import rpc as n_rpc
from neutron import context as ctx
from oslo_config import cfg
from oslo_serialization import jsonutils
import six
import unittest2
"""
@ -29,11 +30,11 @@ class Map(dict):
super(Map, self).__init__(*args, **kwargs)
for arg in args:
if isinstance(arg, dict):
for k, v in arg.iteritems():
for k, v in six.iteritems(arg):
self[k] = v
if kwargs:
for k, v in kwargs.iteritems():
for k, v in six.iteritems(kwargs):
self[k] = v
def __getattr__(self, attr):

11
gbpservice/neutron/tests/unit/plugins/ml2plus/test_apic_aim.py
View File

@ -15,6 +15,7 @@
import mock
import netaddr
import six
from aim.aim_lib import nat_strategy
from aim import aim_manager
@ -99,7 +100,7 @@ class FakeTenant(object):
class FakeProjectManager(object):
def list(self):
return [FakeTenant(k, v) for k, v in TEST_TENANT_NAMES.iteritems()]
return [FakeTenant(k, v) for k, v in six.iteritems(TEST_TENANT_NAMES)]
def get(self, project_id):
return FakeTenant('test-tenant', 'new_name')
@ -209,7 +210,7 @@ class ApicAimTestCase(test_address_scope.AddressScopeTestCase,
dist_names = resource.get('apic:distinguished_names')
self.assertIsInstance(dist_names, dict)
dn = dist_names.get(key)
self.assertIsInstance(dn, basestring)
self.assertIsInstance(dn, six.string_types)
self.assertEqual(aim_resource.dn, dn)
def _check_no_dn(self, resource, key):
@ -2788,7 +2789,7 @@ class CallRecordWrapper(object):
return recorder
def tearDown(self):
for k, v in self.klass.__overridden.iteritems():
for k, v in six.iteritems(self.klass.__overridden):
setattr(self.klass, k, v)
del self.klass.__overridden
@ -2996,7 +2997,7 @@ class TestExternalConnectivityBase(object):
# Connect the router interfaces to the subnets
vrf_objs = {}
for tenant, router_list in objs.iteritems():
for tenant, router_list in six.iteritems(objs):
tenant_aname = self.name_mapper.project(None, tenant)
a_vrf = aim_resource.VRF(tenant_name=tenant_aname,
name='DefaultVRF')
@ -3027,7 +3028,7 @@ class TestExternalConnectivityBase(object):
vrf_objs[tenant] = a_ext_net
# Remove the router interfaces
for tenant, router_list in objs.iteritems():
for tenant, router_list in six.iteritems(objs):
tenant_aname = self.name_mapper.project(None, tenant)
a_vrf = aim_resource.VRF(tenant_name=tenant_aname,
name='DefaultVRF')

3
gbpservice/neutron/tests/unit/services/grouppolicy/test_resource_mapping.py
View File

@ -13,6 +13,7 @@
import copy
import itertools
import six
from keystonemiddleware import auth_token # noqa
import mock
@ -3501,7 +3502,7 @@ class TestExternalSegment(ResourceMappingTestCase):
changes = {'port_address_translation': True}
es = self.create_external_segment(
subnet_id=sub['subnet']['id'])['external_segment']
for k, v in changes.iteritems():
for k, v in six.iteritems(changes):
res = self.update_external_segment(
es['id'], expected_res_status=400, **{k: v})
self.assertEqual('InvalidAttributeUpdateForES',

3
gbpservice/neutron/tests/unit/test_extension_group_policy_mapping.py
View File

@ -11,6 +11,7 @@
# under the License.
import copy
import six
from neutron.api.v2 import attributes as nattr
from neutron.plugins.common import constants
@ -24,7 +25,7 @@ from gbpservice.neutron.tests.unit import test_extension_group_policy as tgp
class GroupPolicyMappingExtTestCase(tgp.GroupPolicyExtensionTestCase):
def setUp(self):
self._saved_gp_attr_map = {}
for k, v in gp.RESOURCE_ATTRIBUTE_MAP.iteritems():
for k, v in six.iteritems(gp.RESOURCE_ATTRIBUTE_MAP):
self._saved_gp_attr_map[k] = v.copy()
self.addCleanup(self._restore_gp_attr_map)

3
gbpservice/nfp/common/utils.py
View File

@ -11,6 +11,7 @@
# under the License.
import os
import six
import yaml
from gbpservice.nfp.common import constants as nfp_constants
@ -30,7 +31,7 @@ def _parse_service_flavor_string(service_flavor_str):
service_flavor_dict = dict(item.split('=') for item
in service_flavor_str.split(','))
service_details = {key.strip(): value.strip() for key, value
in service_flavor_dict.iteritems()}
in six.iteritems(service_flavor_dict)}
return service_details

7
gbpservice/nfp/core/controller.py
View File

@ -19,6 +19,7 @@ import multiprocessing
import operator
import os
import pickle
import six
import sys
import time
import zlib
@ -348,7 +349,7 @@ class NfpController(nfp_launcher.NfpLauncher, NfpService):
def _update_manager(self):
childs = self.get_childrens()
for pid, wrapper in childs.iteritems():
for pid, wrapper in six.iteritems(childs):
pipe = wrapper.child_pipe_map[pid]
# Inform 'Manager' class about the new_child.
self._manager.new_child(pid, pipe)
@ -414,7 +415,7 @@ class NfpController(nfp_launcher.NfpLauncher, NfpService):
self._update_manager()
# create and launch rpc service agent for each topic
for key, value in self._rpc_agents.iteritems():
for key, value in six.iteritems(self._rpc_agents):
agents = value['agents']
# Register NFP RPC managers in priority order,
# so that on rpc, oslo invokes them in the given order,
@ -454,7 +455,7 @@ class NfpController(nfp_launcher.NfpLauncher, NfpService):
"""
graph_sig = {}
graph_nodes = []
for parent, childs in graph.iteritems():
for parent, childs in six.iteritems(graph):
puuid = parent.desc.uuid
assert puuid not in graph_sig.keys(), (
"Event - %s is already root of subgraph - %s" % (

3
gbpservice/nfp/core/executor.py
View File

@ -10,6 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
import six
from argparse import Namespace
@ -183,7 +184,7 @@ class EventGraphExecutor(object):
def _root(self, graph, of):
tree = graph['data']
for root, nodes in tree.iteritems():
for root, nodes in six.iteritems(tree):
if of in nodes:
return root
return None

5
gbpservice/nfp/core/manager.py
View File

@ -11,6 +11,7 @@
# under the License.
import os
import six
from gbpservice.nfp.core import event as nfp_event
from gbpservice.nfp.core import executor as nfp_executor
@ -345,7 +346,7 @@ class NfpResourceManager(NfpProcessManager, NfpEventManager):
# Get events from sequencer
events = self._event_sequencer.run()
events += nfp_path.run()
for pid, event_manager in self._resource_map.iteritems():
for pid, event_manager in six.iteritems(self._resource_map):
events += event_manager.event_watcher(timeout=0.01)
# Process the type of events received, dispatch only the
# required ones.
@ -401,7 +402,7 @@ class NfpResourceManager(NfpProcessManager, NfpEventManager):
def _load_init(self):
"""Intializes load with current information. """
load_info = []
for pid, event_manager in self._resource_map.iteritems():
for pid, event_manager in six.iteritems(self._resource_map):
load = event_manager.get_load()
load_info.append([event_manager, load, pid])

5
gbpservice/nfp/core/path.py
View File

@ -14,6 +14,7 @@
from gbpservice.nfp.core import log as nfp_logging
import collections
import six
deque = collections.deque
@ -62,7 +63,7 @@ paths = {}
def run():
for key, path in paths.iteritems():
for key, path in six.iteritems(paths):
if path['current'].count == 0:
path['current'].done()
if path['waiting'].name != 'INVALID':
@ -72,7 +73,7 @@ def run():
events = []
# Get any queued events in the current path
for key, path in paths.iteritems():
for key, path in six.iteritems(paths):
events += path['current'].pop()
return events

5
gbpservice/nfp/core/sequencer.py
View File

@ -11,6 +11,7 @@
# under the License.
import collections
import six
from gbpservice.nfp.core import log as nfp_logging
@ -97,7 +98,7 @@ class EventSequencer(object):
events = []
# Loop over copy and delete from original
sequencers = dict(self._sequencer)
for key, sequencer in sequencers.iteritems():
for key, sequencer in six.iteritems(sequencers):
try:
event = sequencer.run()
if event:
@ -118,7 +119,7 @@ class EventSequencer(object):
def pop(self):
events = []
sequencers = dict(self._sequencer)
for key, sequencer in sequencers.iteritems():
for key, sequencer in six.iteritems(sequencers):
events += sequencer.pop()
return events

3
gbpservice/nfp/lib/transport.py
View File

@ -26,6 +26,7 @@ import oslo_messaging as messaging
from oslo_serialization import jsonutils
import requests
import six
LOG = nfp_logging.getLogger(__name__)
Version = 'v1' # v1/v2/v3#
@ -344,5 +345,5 @@ def parse_service_flavor_string(service_flavor_str):
service_flavor_dict = dict(item.split('=') for item
in service_flavor_str.split(','))
service_details = {key.strip(): value.strip() for key, value
in service_flavor_dict.iteritems()}
in six.iteritems(service_flavor_dict)}
return service_details

22
gbpservice/nfp/orchestrator/db/common_db_mixin.py
View File

@ -14,6 +14,7 @@
# under the License.
from neutron.db import sqlalchemyutils
import six
import weakref
@ -71,16 +72,16 @@ class CommonDbMixin(object):
# define basic filter condition for model query
query_filter = None
# Execute query hooks registered from mixins and plugins
for _name, hooks in self._model_query_hooks.get(model,
{}).iteritems():
query_hooks = self._model_query_hooks.get(model, {})
for _name, hooks in six.iteritems(query_hooks):
query_hook = hooks.get('query')
if isinstance(query_hook, basestring):
if isinstance(query_hook, six.string_types):
query_hook = getattr(self, query_hook, None)
if query_hook:
query = query_hook(model, query)
filter_hook = hooks.get('filter')
if isinstance(filter_hook, basestring):
if isinstance(filter_hook, six.string_types):
filter_hook = getattr(self, filter_hook, None)
if filter_hook:
query_filter = filter_hook(model, query_filter)
@ -104,14 +105,15 @@ class CommonDbMixin(object):
def _apply_filters_to_query(self, query, model, filters):
if filters:
for key, value in filters.iteritems():
for key, value in six.iteritems(filters):
column = getattr(model, key, None)
if column:
query = query.filter(column.in_(value))
for _name, hooks in self._model_query_hooks.get(model,
{}).iteritems():
query_hooks = self._model_query_hooks.get(model, {})
for _name, hooks in six.iteritems(query_hooks):
result_filter = hooks.get('result_filters', None)
if isinstance(result_filter, basestring):
if isinstance(result_filter, six.string_types):
result_filter = getattr(self, result_filter, None)
if result_filter:
@ -123,7 +125,7 @@ class CommonDbMixin(object):
for func in self._dict_extend_functions.get(
resource_type, []):
args = (response, db_object)
if isinstance(func, basestring):
if isinstance(func, six.string_types):
func = getattr(self, func, None)
else:
# must call unbound method - use self as 1st argument
@ -172,4 +174,4 @@ class CommonDbMixin(object):
"""
columns = [c.name for c in model.__table__.columns]
return dict((k, v) for (k, v) in
data.iteritems() if k in columns)
six.iteritems(data) if k in columns)

3
gbpservice/tests/contrib/gbpfunctests/libs/config_libs.py
View File

@ -14,6 +14,7 @@ import commands
import logging
import os
import re
import six
import string
import sys
@ -250,7 +251,7 @@ class Gbp_Config(object):
# Build the command with mandatory params
cmd = 'gbp %s-update ' % cfgobj_dict[cfgobj] + str(name_uuid)
# Build the cmd string for optional/non-default args/values
for arg, value in attr.iteritems():
for arg, value in six.iteritems(attr):
if '_' in arg:
arg = string.replace(arg, '_', '-')
cmd = cmd + " --" + ("%s %s" % (arg, value))

3
gbpservice/tests/contrib/gbpfunctests/libs/utils_libs.py
View File

@ -14,6 +14,7 @@ import itertools
import paramiko
import prettytable
import re
import six
import subprocess
import sys
@ -58,7 +59,7 @@ def report_table(suite_name):
table = prettytable.PrettyTable(["TESTCASE_ID", "RESULTS",
"TESTCASE_HEADER"])
table.padding_width = 1
for key, val in tc_dict.iteritems():
for key, val in six.iteritems(tc_dict):
table.add_row(["%s" % (key), "%s" % (val[0]), "%s" % (val[1])])
return table

3
gbpservice/tests/contrib/gbpfunctests/testcases/tc_gbp_l3p_neg.py
View File

@ -12,6 +12,7 @@
import commands
import logging
import six
import sys
from libs import config_libs
@ -170,7 +171,7 @@ class test_gbp_l3p_neg(object):
# Testcase work-flow starts
mix_attr = {'x.y.0.0/24': '30', '20.20.20.0/24': '32'}
_pass = 0
for ip, pref in mix_attr.iteritems():
for ip, pref in six.iteritems(mix_attr):
self._log.info(
"\n## Step 1A: Create L3Policy with IP-Pool = %s & "
"Subnet-Pref-Len = %s ##" %

3
gbpservice/tests/contrib/gbpfunctests/testcases/tc_gbp_pr_pc_pa_shared_func.py
View File

@ -12,6 +12,7 @@
import commands
import logging
import six
import sys
from libs import config_libs
@ -123,7 +124,7 @@ class test_gbp_pr_pc_pa_shared_func(object):
self._log.info(
'## Step 2: Verify Policy Rule, Policy Classifier, Policy '
'Action with shared=True')
for obj, uuid in obj_uuid.iteritems():
for obj, uuid in six.iteritems(obj_uuid):
if self.gbpverify.gbp_policy_verify_all(
1, obj, uuid, shared=True) == 0:
self._log.info(

2
tox.ini
View File

@ -88,7 +88,7 @@ commands = python setup.py build_sphinx
# N325 Python 3: Do not use xrange
# N326 Python 3: do not use basestring
# N327 Python 3: do not use dict.iteritems
ignore = E125,E126,E128,E129,E251,E265,E713,F402,F811,F812,H104,H237,H305,H307,H401,H402,H404,H405,H904,N324,N325,N326,N327,N340,N341,N342,N343
ignore = E125,E126,E128,E129,E251,E265,E713,F402,F811,F812,H104,H237,H305,H307,H401,H402,H404,H405,H904,N324,N325,N340,N341,N342,N343
show-source = true
builtins = _
exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools,.ropeproject,rally-scenarios,