Merge tag '1.0.0'
This is a null-merge of the 1.0.0 release tag back into the master
branch so that the 1.0.0 tag will appear in the git commit history of
the master branch. It contains no actual changes to the master branch,
regardless of how our code review system's UI represents it. Please
ask in #openstack-infra if you have any questions, and otherwise try
to merge this as quickly as possible to avoid later conflicts on the
master branch.
Change-Id: I9f6bd68468f837c1f28e1428ef10d1562a5c1340
diff --git a/manila_tempest_tests/tests/api/base.py b/manila_tempest_tests/tests/api/base.py
index 3c422b8..a8f2b83 100644
--- a/manila_tempest_tests/tests/api/base.py
+++ b/manila_tempest_tests/tests/api/base.py
@@ -15,6 +15,7 @@
import copy
import inspect
+import random
import traceback
from oslo_concurrency import lockutils
@@ -33,6 +34,18 @@
LOG = log.getLogger(__name__)
+def rand_ip():
+ """This uses the TEST-NET-3 range of reserved IP addresses.
+
+ Using this range, which are reserved solely for use in
+ documentation and example source code, should avoid any potential
+ conflicts in real-world testing.
+ """
+ TEST_NET_3 = '203.0.113.'
+ final_octet = six.text_type(random.randint(0, 255))
+ return TEST_NET_3 + final_octet
+
+
class handle_cleanup_exceptions(object):
"""Handle exceptions raised with cleanup operations.
@@ -612,8 +625,8 @@
data = {
"name": data_utils.rand_name("ss-name"),
"description": data_utils.rand_name("ss-desc"),
- "dns_ip": data_utils.rand_name("ss-dns_ip"),
- "server": data_utils.rand_name("ss-server"),
+ "dns_ip": rand_ip(),
+ "server": rand_ip(),
"domain": data_utils.rand_name("ss-domain"),
"user": data_utils.rand_name("ss-user"),
"password": data_utils.rand_name("ss-password"),