openstack/horizon
Code Issues Proposed changes

Merge "Replaces uuid.uuid4 with uuidutils.generate_uuid()"

Browse Source
This commit is contained in:
Jenkins 2016-11-14 11:38:25 +00:00 committed by Gerrit Code Review
commit 1d1b3cf1b8
7 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
horizon/forms/fields.py
View File

@ -17,7 +17,8 @@ import re
import netaddr
import six
import uuid
from oslo_utils import uuidutils
from django.core.exceptions import ValidationError # noqa
from django.core import urlresolvers
@ -350,7 +351,7 @@ class ThemableCheckboxInput(widgets.CheckboxInput):
label_for = attrs.get('id', '')
if not label_for:
attrs['id'] = uuid.uuid4()
attrs['id'] = uuidutils.generate_uuid()
label_for = attrs['id']
return html.format_html(

9
openstack_dashboard/test/api_tests/network_tests.py
View File

@ -14,13 +14,14 @@
import collections
import copy
import uuid
from django import http
from django.test.utils import override_settings
from mox3.mox import IsA # noqa
import six
from oslo_utils import uuidutils
from novaclient.v2 import floating_ip_pools
from openstack_dashboard import api
@ -508,7 +509,7 @@ class NetworkApiNeutronSecurityGroupTests(NetworkApiNeutronTestBase):
instance_ports = []
for _i in range(2):
p = copy.deepcopy(instance_port)
p['id'] = str(uuid.uuid4())
p['id'] = uuidutils.generate_uuid()
p['security_groups'] = cur_sg_ids
instance_ports.append(p)
return (instance_id, instance_ports)
@ -653,8 +654,8 @@ class NetworkApiNeutronFloatingIpTests(NetworkApiNeutronTestBase):
def test_floating_ip_get_associated_with_loadbalancer_vip(self):
assoc_port = copy.deepcopy(self.api_ports.list()[1])
assoc_port['device_owner'] = 'neutron:LOADBALANCER'
assoc_port['device_id'] = str(uuid.uuid4())
assoc_port['name'] = 'vip-' + str(uuid.uuid4())
assoc_port['device_id'] = uuidutils.generate_uuid()
assoc_port['name'] = 'vip-' + uuidutils.generate_uuid()
self._test_floating_ip_get_associated(assoc_port, 'loadbalancer')
def test_floating_ip_get_unassociated(self):

5
openstack_dashboard/test/api_tests/neutron_tests.py
View File

@ -12,13 +12,14 @@
# License for the specific language governing permissions and limitations
# under the License.
import copy
import uuid
from mox3.mox import IsA # noqa
from django import http
from django.test.utils import override_settings
from oslo_utils import uuidutils
from neutronclient.common import exceptions as neutron_exc
from openstack_dashboard import api
@ -703,7 +704,7 @@ class NeutronApiTests(test.APITestCase):
# As a result three API calls with 4, 4, 2 port ID
# are expected.
ports = [{'id': str(uuid.uuid4()),
ports = [{'id': uuidutils.generate_uuid(),
'name': 'port%s' % i,
'admin_state_up': True}
for i in range(10)]

5
openstack_dashboard/test/integration_tests/helpers.py
View File

@ -20,7 +20,8 @@ import subprocess
import tempfile
import time
import traceback
import uuid
from oslo_utils import uuidutils
from selenium.webdriver.common import action_chains
from selenium.webdriver.common import by
@ -63,7 +64,7 @@ def gen_random_resource_name(resource="", timestamp=True):
if timestamp:
tstamp = time.strftime("%d-%m-%H-%M-%S")
fields.append(tstamp)
fields.append(str(uuid.uuid4()).replace("-", ""))
fields.append(uuidutils.generate_uuid().replace("-", ""))
return "_".join(fields)

15
openstack_dashboard/test/test_data/neutron_data.py
View File

@ -13,7 +13,8 @@
# under the License.
import copy
import uuid
from oslo_utils import uuidutils
from openstack_dashboard.api import base
from openstack_dashboard.api import fwaas
@ -475,7 +476,7 @@ def data(TEST):
def add_rule_to_group(secgroup, default_only=True):
rule_egress_ipv4 = {
'id': str(uuid.uuid4()),
'id': uuidutils.generate_uuid(),
'direction': u'egress', 'ethertype': u'IPv4',
'port_range_min': None, 'port_range_max': None,
'protocol': None, 'remote_group_id': None,
@ -483,7 +484,7 @@ def data(TEST):
'security_group_id': secgroup['id'],
'tenant_id': secgroup['tenant_id']}
rule_egress_ipv6 = {
'id': str(uuid.uuid4()),
'id': uuidutils.generate_uuid(),
'direction': u'egress', 'ethertype': u'IPv6',
'port_range_min': None, 'port_range_max': None,
'protocol': None, 'remote_group_id': None,
@ -492,7 +493,7 @@ def data(TEST):
'tenant_id': secgroup['tenant_id']}
rule_tcp_80 = {
'id': str(uuid.uuid4()),
'id': uuidutils.generate_uuid(),
'direction': u'ingress', 'ethertype': u'IPv4',
'port_range_min': 80, 'port_range_max': 80,
'protocol': u'tcp', 'remote_group_id': None,
@ -500,7 +501,7 @@ def data(TEST):
'security_group_id': secgroup['id'],
'tenant_id': secgroup['tenant_id']}
rule_icmp = {
'id': str(uuid.uuid4()),
'id': uuidutils.generate_uuid(),
'direction': u'ingress', 'ethertype': u'IPv4',
'port_range_min': 5, 'port_range_max': 8,
'protocol': u'icmp', 'remote_group_id': None,
@ -508,7 +509,7 @@ def data(TEST):
'security_group_id': secgroup['id'],
'tenant_id': secgroup['tenant_id']}
rule_group = {
'id': str(uuid.uuid4()),
'id': uuidutils.generate_uuid(),
'direction': u'ingress', 'ethertype': u'IPv4',
'port_range_min': 80, 'port_range_max': 80,
'protocol': u'tcp', 'remote_group_id': sec_group_1['id'],
@ -516,7 +517,7 @@ def data(TEST):
'security_group_id': secgroup['id'],
'tenant_id': secgroup['tenant_id']}
rule_all_tcp = {
'id': str(uuid.uuid4()),
'id': uuidutils.generate_uuid(),
'direction': u'egress', 'ethertype': u'IPv4',
'port_range_min': 1, 'port_range_max': 65535,
'protocol': u'tcp', 'remote_group_id': None,

9
openstack_dashboard/test/test_data/nova_data.py
View File

@ -13,7 +13,8 @@
# under the License.
import json
import uuid
from oslo_utils import uuidutils
from novaclient.v2 import aggregates
from novaclient.v2 import availability_zones
@ -316,7 +317,7 @@ def data(TEST):
def get_id(is_uuid):
global current_int_id
if is_uuid:
return str(uuid.uuid4())
return uuidutils.generate_uuid()
else:
get_id.current_int_id += 1
return get_id.current_int_id
@ -523,12 +524,12 @@ def data(TEST):
nova.FloatingIp(generate_fip(fip_3)))
# Floating IP with UUID id (for Floating IP with Neutron Proxy)
fip_3 = {'id': str(uuid.uuid4()),
fip_3 = {'id': uuidutils.generate_uuid(),
'fixed_ip': '10.0.0.4',
'instance_id': server_1.id,
'ip': '58.58.58.58',
'pool': 'pool1'}
fip_4 = {'id': str(uuid.uuid4()),
fip_4 = {'id': uuidutils.generate_uuid(),
'fixed_ip': None,
'instance_id': None,
'ip': '58.58.58.58',

5
openstack_dashboard/test/tests/utils.py
View File

@ -14,7 +14,8 @@
# under the License.
import datetime
import uuid
from oslo_utils import uuidutils
from openstack_dashboard.test import helpers as test
from openstack_dashboard.utils import filters
@ -33,7 +34,7 @@ class UtilsFilterTests(test.TestCase):
self.assertEqual(int(val), ret)
def test_accept_valid_uuid(self):
val = str(uuid.uuid4())
val = uuidutils.generate_uuid()
ret = filters.get_int_or_uuid(val)
self.assertEqual(val, ret)