Merge "add required python modules(six,iso8601,fixtures) to requirements.txt"
diff --git a/tempest/api/network/base.py b/tempest/api/network/base.py
index 19c5f84..3ae718c 100644
--- a/tempest/api/network/base.py
+++ b/tempest/api/network/base.py
@@ -56,9 +56,15 @@
cls.networks = []
cls.subnets = []
cls.ports = []
+ cls.pools = []
+ cls.vips = []
@classmethod
def tearDownClass(cls):
+ for vip in cls.vips:
+ cls.client.delete_vip(vip['id'])
+ for pool in cls.pools:
+ cls.client.delete_pool(pool['id'])
for port in cls.ports:
cls.client.delete_port(port['id'])
for subnet in cls.subnets:
@@ -111,3 +117,21 @@
port = body['port']
cls.ports.append(port)
return port
+
+ @classmethod
+ def create_pool(cls, name, lb_method, protocol, subnet):
+ """Wrapper utility that returns a test pool."""
+ resp, body = cls.client.create_pool(name, lb_method, protocol,
+ subnet['id'])
+ pool = body['pool']
+ cls.pools.append(pool)
+ return pool
+
+ @classmethod
+ def create_vip(cls, name, protocol, protocol_port, subnet, pool):
+ """Wrapper utility that returns a test vip."""
+ resp, body = cls.client.create_vip(name, protocol, protocol_port,
+ subnet['id'], pool['id'])
+ vip = body['vip']
+ cls.vips.append(vip)
+ return vip
diff --git a/tempest/api/network/test_load_balancer.py b/tempest/api/network/test_load_balancer.py
new file mode 100644
index 0000000..1c8c355
--- /dev/null
+++ b/tempest/api/network/test_load_balancer.py
@@ -0,0 +1,102 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2013 OpenStack, LLC
+# 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.api.network import base
+from tempest.common.utils.data_utils import rand_name
+from tempest.test import attr
+
+
+class LoadBalancerJSON(base.BaseNetworkTest):
+ _interface = 'json'
+
+ """
+ Tests the following operations in the Neutron API using the REST client for
+ Neutron:
+
+ create vIP, and Pool
+ show vIP
+ list vIP
+ update vIP
+ delete vIP
+ update pool
+ delete pool
+ """
+
+ @classmethod
+ def setUpClass(cls):
+ super(LoadBalancerJSON, cls).setUpClass()
+ cls.network = cls.create_network()
+ cls.name = cls.network['name']
+ cls.subnet = cls.create_subnet(cls.network)
+ pool_name = rand_name('pool-')
+ vip_name = rand_name('vip-')
+ cls.pool = cls.create_pool(pool_name, "ROUND_ROBIN",
+ "HTTP", cls.subnet)
+ cls.vip = cls.create_vip(vip_name, "HTTP", 80, cls.subnet, cls.pool)
+
+ @attr(type='smoke')
+ def test_list_vips(self):
+ # Verify the vIP exists in the list of all vIPs
+ resp, body = self.client.list_vips()
+ self.assertEqual('200', resp['status'])
+ vips = body['vips']
+ found = None
+ for n in vips:
+ if (n['id'] == self.vip['id']):
+ found = n['id']
+ msg = "vIPs list doesn't contain created vip"
+ self.assertIsNotNone(found, msg)
+
+ def test_create_update_delete_pool_vip(self):
+ # Creates a vip
+ name = rand_name('vip-')
+ resp, body = self.client.create_pool(rand_name("pool-"),
+ "ROUND_ROBIN", "HTTP",
+ self.subnet['id'])
+ pool = body['pool']
+ resp, body = self.client.create_vip(name, "HTTP", 80,
+ self.subnet['id'], pool['id'])
+ self.assertEqual('201', resp['status'])
+ vip = body['vip']
+ vip_id = vip['id']
+ # Verification of vip update
+ new_name = "New_vip"
+ resp, body = self.client.update_vip(vip_id, new_name)
+ self.assertEqual('200', resp['status'])
+ updated_vip = body['vip']
+ self.assertEqual(updated_vip['name'], new_name)
+ # Verification of vip delete
+ resp, body = self.client.delete_vip(vip['id'])
+ self.assertEqual('204', resp['status'])
+ # Verification of pool update
+ new_name = "New_pool"
+ resp, body = self.client.update_pool(pool['id'], new_name)
+ self.assertEqual('200', resp['status'])
+ updated_pool = body['pool']
+ self.assertEqual(updated_pool['name'], new_name)
+ # Verification of pool delete
+ resp, body = self.client.delete_pool(pool['id'])
+ self.assertEqual('204', resp['status'])
+
+ @attr(type='smoke')
+ def test_show_vip(self):
+ # Verifies the details of a vip
+ resp, body = self.client.show_vip(self.vip['id'])
+ self.assertEqual('200', resp['status'])
+ vip = body['vip']
+ self.assertEqual(self.vip['id'], vip['id'])
+ self.assertEqual(self.vip['name'], vip['name'])
diff --git a/tempest/api/network/test_networks.py b/tempest/api/network/test_networks.py
index 66ca05f..7e116b9 100644
--- a/tempest/api/network/test_networks.py
+++ b/tempest/api/network/test_networks.py
@@ -234,6 +234,12 @@
self.assertRaises(exceptions.NotFound, self.client.show_subnet,
non_exist_id)
+ @attr(type=['negative', 'smoke'])
+ def test_show_non_existent_port(self):
+ non_exist_id = rand_name('port')
+ self.assertRaises(exceptions.NotFound, self.client.show_port,
+ non_exist_id)
+
@attr(type='smoke')
def test_bulk_create_delete_network(self):
# Creates 2 networks in one request
diff --git a/tempest/api/volume/test_volumes_get.py b/tempest/api/volume/test_volumes_get.py
index f7f428c..12b03b5 100644
--- a/tempest/api/volume/test_volumes_get.py
+++ b/tempest/api/volume/test_volumes_get.py
@@ -69,6 +69,10 @@
fetched_volume['metadata'],
'The fetched Volume is different '
'from the created Volume')
+ if 'imageRef' in kwargs:
+ self.assertEqual(fetched_volume['bootable'], True)
+ if 'imageRef' not in kwargs:
+ self.assertEqual(fetched_volume['bootable'], False)
@attr(type='gate')
def test_volume_get_metadata_none(self):
diff --git a/tempest/api/volume/test_volumes_list.py b/tempest/api/volume/test_volumes_list.py
index 8c39e08..5e64110 100644
--- a/tempest/api/volume/test_volumes_list.py
+++ b/tempest/api/volume/test_volumes_list.py
@@ -17,8 +17,11 @@
from tempest.api.volume import base
from tempest.common.utils.data_utils import rand_name
+from tempest.openstack.common import log as logging
from tempest.test import attr
+LOG = logging.getLogger(__name__)
+
class VolumesListTest(base.BaseVolumeTest):
@@ -64,22 +67,17 @@
resp, volume = cls.client.get_volume(volume['id'])
cls.volume_list.append(volume)
cls.volume_id_list.append(volume['id'])
- except Exception:
+ except Exception as exc:
+ LOG.exception(exc)
if cls.volume_list:
# We could not create all the volumes, though we were able
# to create *some* of the volumes. This is typically
# because the backing file size of the volume group is
- # too small. So, here, we clean up whatever we did manage
- # to create and raise a SkipTest
+ # too small.
for volid in cls.volume_id_list:
cls.client.delete_volume(volid)
cls.client.wait_for_resource_deletion(volid)
- msg = ("Failed to create ALL necessary volumes to run "
- "test. This typically means that the backing file "
- "size of the nova-volumes group is too small to "
- "create the 3 volumes needed by this test case")
- raise cls.skipException(msg)
- raise
+ raise exc
@classmethod
def tearDownClass(cls):
diff --git a/tempest/cli/output_parser.py b/tempest/cli/output_parser.py
index f22ec4e..bb3368f 100644
--- a/tempest/cli/output_parser.py
+++ b/tempest/cli/output_parser.py
@@ -158,7 +158,7 @@
def _table_columns(first_table_row):
"""Find column ranges in output line.
- Return list of touples (start,end) for each column
+ Return list of tuples (start,end) for each column
detected by plus (+) characters in delimiter line.
"""
positions = []
diff --git a/tempest/common/utils/linux/remote_client.py b/tempest/common/utils/linux/remote_client.py
index 2cbb74d..0d0e794 100644
--- a/tempest/common/utils/linux/remote_client.py
+++ b/tempest/common/utils/linux/remote_client.py
@@ -52,12 +52,12 @@
return self.ssh_client.test_connection_auth()
def hostname_equals_servername(self, expected_hostname):
- # Get hostname using command "hostname"
+ # Get host name using command "hostname"
actual_hostname = self.ssh_client.exec_command("hostname").rstrip()
return expected_hostname == actual_hostname
def get_files(self, path):
- # Return a list of comma seperated files
+ # Return a list of comma separated files
command = "ls -m " + path
return self.ssh_client.exec_command(command).rstrip('\n').split(', ')
diff --git a/tempest/scenario/orchestration/test_autoscaling.py b/tempest/scenario/orchestration/test_autoscaling.py
index 88f2ebd..1a4d802 100644
--- a/tempest/scenario/orchestration/test_autoscaling.py
+++ b/tempest/scenario/orchestration/test_autoscaling.py
@@ -85,7 +85,7 @@
def server_count():
# the number of servers is the number of resources
- # in the nexted stack
+ # in the nested stack
self.server_count = len(
self.client.resources.list(nested_stack_id))
return self.server_count
diff --git a/tempest/scenario/test_network_basic_ops.py b/tempest/scenario/test_network_basic_ops.py
index 662e919..9d7086c 100644
--- a/tempest/scenario/test_network_basic_ops.py
+++ b/tempest/scenario/test_network_basic_ops.py
@@ -62,7 +62,7 @@
Tempest host. A public network is assumed to be reachable from
the Tempest host, and it should be possible to associate a public
('floating') IP address with a tenant ('fixed') IP address to
- faciliate external connectivity to a potentially unroutable
+ facilitate external connectivity to a potentially unroutable
tenant IP address.
This test suite can be configured to test network connectivity to
diff --git a/tempest/services/network/json/network_client.py b/tempest/services/network/json/network_client.py
index 10e64f8..bc0a6cf 100644
--- a/tempest/services/network/json/network_client.py
+++ b/tempest/services/network/json/network_client.py
@@ -401,3 +401,80 @@
resp, body = self.post(uri, headers=self.headers, body=body)
body = json.loads(body)
return resp, body
+
+ def list_vips(self):
+ uri = '%s/lb/vips' % (self.uri_prefix)
+ resp, body = self.get(uri, self.headers)
+ body = json.loads(body)
+ return resp, body
+
+ def create_vip(self, name, protocol, protocol_port, subnet_id, pool_id):
+ post_body = {
+ "vip": {
+ "protocol": protocol,
+ "name": name,
+ "subnet_id": subnet_id,
+ "pool_id": pool_id,
+ "protocol_port": protocol_port
+ }
+ }
+ body = json.dumps(post_body)
+ uri = '%s/lb/vips' % (self.uri_prefix)
+ resp, body = self.post(uri, headers=self.headers, body=body)
+ body = json.loads(body)
+ return resp, body
+
+ def create_pool(self, name, lb_method, protocol, subnet_id):
+ post_body = {
+ "pool": {
+ "protocol": protocol,
+ "name": name,
+ "subnet_id": subnet_id,
+ "lb_method": lb_method
+ }
+ }
+ body = json.dumps(post_body)
+ uri = '%s/lb/pools' % (self.uri_prefix)
+ resp, body = self.post(uri, headers=self.headers, body=body)
+ body = json.loads(body)
+ return resp, body
+
+ def show_vip(self, uuid):
+ uri = '%s/lb/vips/%s' % (self.uri_prefix, uuid)
+ resp, body = self.get(uri, self.headers)
+ body = json.loads(body)
+ return resp, body
+
+ def delete_vip(self, uuid):
+ uri = '%s/lb/vips/%s' % (self.uri_prefix, uuid)
+ resp, body = self.delete(uri, self.headers)
+ return resp, body
+
+ def delete_pool(self, uuid):
+ uri = '%s/lb/pools/%s' % (self.uri_prefix, uuid)
+ resp, body = self.delete(uri, self.headers)
+ return resp, body
+
+ def update_vip(self, vip_id, new_name):
+ put_body = {
+ "vip": {
+ "name": new_name,
+ }
+ }
+ body = json.dumps(put_body)
+ uri = '%s/lb/vips/%s' % (self.uri_prefix, vip_id)
+ resp, body = self.put(uri, body=body, headers=self.headers)
+ body = json.loads(body)
+ return resp, body
+
+ def update_pool(self, pool_id, new_name):
+ put_body = {
+ "pool": {
+ "name": new_name,
+ }
+ }
+ body = json.dumps(put_body)
+ uri = '%s/lb/pools/%s' % (self.uri_prefix, pool_id)
+ resp, body = self.put(uri, body=body, headers=self.headers)
+ body = json.loads(body)
+ return resp, body
diff --git a/tempest/services/object_storage/container_client.py b/tempest/services/object_storage/container_client.py
index dd5f3ec..75f7a33 100644
--- a/tempest/services/object_storage/container_client.py
+++ b/tempest/services/object_storage/container_client.py
@@ -35,7 +35,7 @@
metadata_prefix='X-Container-Meta-'):
"""
Creates a container, with optional metadata passed in as a
- dictonary
+ dictionary
"""
url = str(container_name)
headers = {}
@@ -92,9 +92,9 @@
"""
Returns complete list of all objects in the container, even if
item count is beyond 10,000 item listing limit.
- Does not require any paramaters aside from container name.
+ Does not require any parameters aside from container name.
"""
- # TODO(dwalleck): Rewite using json format to avoid newlines at end of
+ # TODO(dwalleck): Rewrite using json format to avoid newlines at end of
# obj names. Set limit to API limit - 1 (max returned items = 9999)
limit = 9999
if params is not None:
diff --git a/tempest/services/object_storage/object_client.py b/tempest/services/object_storage/object_client.py
index 1c97869..c605a45 100644
--- a/tempest/services/object_storage/object_client.py
+++ b/tempest/services/object_storage/object_client.py
@@ -126,7 +126,7 @@
return resp, body
def get_object_using_temp_url(self, container, object_name, expires, key):
- """Retrieve object's data using temp URL."""
+ """Retrieve object's data using temporary URL."""
self._set_auth()
method = 'GET'
diff --git a/tempest/services/volume/xml/snapshots_client.py b/tempest/services/volume/xml/snapshots_client.py
index 51c46da..3596017 100644
--- a/tempest/services/volume/xml/snapshots_client.py
+++ b/tempest/services/volume/xml/snapshots_client.py
@@ -81,7 +81,7 @@
display_name: Optional snapshot Name.
display_description: User friendly snapshot description.
"""
- # NOTE(afazekas): it should use the volume namaspace
+ # NOTE(afazekas): it should use the volume namespace
snapshot = Element("snapshot", xmlns=XMLNS_11, volume_id=volume_id)
for key, value in kwargs.items():
snapshot.add_attr(key, value)
diff --git a/tempest/services/volume/xml/volumes_client.py b/tempest/services/volume/xml/volumes_client.py
index ecbfb19..9fa7a1e 100644
--- a/tempest/services/volume/xml/volumes_client.py
+++ b/tempest/services/volume/xml/volumes_client.py
@@ -60,6 +60,21 @@
"""Return the element 'attachment' from input volumes."""
return volume['attachments']['attachment']
+ def _check_if_bootable(self, volume):
+ """
+ Check if the volume is bootable, also change the value
+ of 'bootable' from string to boolean.
+ """
+ if volume['bootable'] == 'True':
+ volume['bootable'] = True
+ elif volume['bootable'] == 'False':
+ volume['bootable'] = False
+ else:
+ raise ValueError(
+ 'bootable flag is supposed to be either True or False,'
+ 'it is %s' % volume['bootable'])
+ return volume
+
def list_volumes(self, params=None):
"""List all the volumes created."""
url = 'volumes'
@@ -72,6 +87,8 @@
volumes = []
if body is not None:
volumes += [self._parse_volume(vol) for vol in list(body)]
+ for v in volumes:
+ v = self._check_if_bootable(v)
return resp, volumes
def list_volumes_with_detail(self, params=None):
@@ -86,14 +103,17 @@
volumes = []
if body is not None:
volumes += [self._parse_volume(vol) for vol in list(body)]
+ for v in volumes:
+ v = self._check_if_bootable(v)
return resp, volumes
def get_volume(self, volume_id):
"""Returns the details of a single volume."""
url = "volumes/%s" % str(volume_id)
resp, body = self.get(url, self.headers)
- body = etree.fromstring(body)
- return resp, self._parse_volume(body)
+ body = self._parse_volume(etree.fromstring(body))
+ body = self._check_if_bootable(body)
+ return resp, body
def create_volume(self, size, **kwargs):
"""Creates a new Volume.
diff --git a/tempest/stress/stressaction.py b/tempest/stress/stressaction.py
index 28251af..45a628d 100644
--- a/tempest/stress/stressaction.py
+++ b/tempest/stress/stressaction.py
@@ -42,7 +42,7 @@
def setUp(self, **kwargs):
"""This method is called before the run method
- to help the test initiatlize any structures.
+ to help the test initialize any structures.
kwargs contains arguments passed in from the
configuration json file.
@@ -59,7 +59,7 @@
def execute(self, shared_statistic):
"""This is the main execution entry point called
by the driver. We register a signal handler to
- allow us to gracefull tearDown, and then exit.
+ allow us to tearDown gracefully, and then exit.
We also keep track of how many runs we do.
"""
signal.signal(signal.SIGHUP, self._shutdown_handler)