Rui Chen 6aceca218a Replace "Display Name" by "Name" in volume list
Current "volume list --name" command use "display_name" as search_opts
to send to cinder API, and show the result table with "Display Name"
column title in osc, cinder list API support "name" as search opts too,
and there is "name" attribute in volume response body, so we can replace
all "Display Name" by "Name" in order to keep "volume list" command
consistent with other commands, like: server list, network list and so
on, only use "Name" attribute for all objects.

Support a mapping for volume list -c "Display Name" (Volume v1 and v2)
and volume create/show -c "display_name" (Volume v1) for minimal
backward compatibility until R release.

Change-Id: I120be0118e7bb30093b4237c5eeb69a9eedef077
Closes-Bug: #1657956
Depends-On: I1fb62219b092346ea380099811cbd082cae5bafe
2017-05-26 11:37:09 +08:00

305 lines
9.0 KiB
Python

# 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.
import json
import time
import uuid
from tempest.lib import exceptions
from openstackclient.tests.functional.volume.v2 import common
class VolumeTests(common.BaseVolumeTests):
"""Functional tests for volume. """
def test_volume_delete(self):
"""Test create, delete multiple"""
name1 = uuid.uuid4().hex
cmd_output = json.loads(self.openstack(
'volume create -f json ' +
'--size 1 ' +
name1
))
self.assertEqual(
1,
cmd_output["size"],
)
name2 = uuid.uuid4().hex
cmd_output = json.loads(self.openstack(
'volume create -f json ' +
'--size 2 ' +
name2
))
self.assertEqual(
2,
cmd_output["size"],
)
self.wait_for("volume", name1, "available")
self.wait_for("volume", name2, "available")
del_output = self.openstack('volume delete ' + name1 + ' ' + name2)
self.assertOutput('', del_output)
def test_volume_list(self):
"""Test create, list filter"""
name1 = uuid.uuid4().hex
cmd_output = json.loads(self.openstack(
'volume create -f json ' +
'--size 1 ' +
name1
))
self.addCleanup(self.openstack, 'volume delete ' + name1)
self.assertEqual(
1,
cmd_output["size"],
)
self.wait_for("volume", name1, "available")
name2 = uuid.uuid4().hex
cmd_output = json.loads(self.openstack(
'volume create -f json ' +
'--size 2 ' +
name2
))
self.addCleanup(self.openstack, 'volume delete ' + name2)
self.assertEqual(
2,
cmd_output["size"],
)
self.wait_for("volume", name2, "available")
raw_output = self.openstack(
'volume set ' +
'--state error ' +
name2
)
self.assertOutput('', raw_output)
# Test list --long
cmd_output = json.loads(self.openstack(
'volume list -f json ' +
'--long'
))
names = [x["Name"] for x in cmd_output]
self.assertIn(name1, names)
self.assertIn(name2, names)
# Test list --status
cmd_output = json.loads(self.openstack(
'volume list -f json ' +
'--status error'
))
names = [x["Name"] for x in cmd_output]
self.assertNotIn(name1, names)
self.assertIn(name2, names)
# TODO(qiangjiahui): Add project option to filter tests when we can
# specify volume with project
def test_volume_set_and_unset(self):
"""Tests create volume, set, unset, show, delete"""
name = uuid.uuid4().hex
new_name = name + "_"
cmd_output = json.loads(self.openstack(
'volume create -f json ' +
'--size 1 ' +
'--description aaaa ' +
'--property Alpha=a ' +
name
))
self.addCleanup(self.openstack, 'volume delete ' + new_name)
self.assertEqual(
name,
cmd_output["name"],
)
self.assertEqual(
1,
cmd_output["size"],
)
self.assertEqual(
'aaaa',
cmd_output["description"],
)
self.assertEqual(
"Alpha='a'",
cmd_output["properties"],
)
self.assertEqual(
'false',
cmd_output["bootable"],
)
self.wait_for("volume", name, "available")
# Test volume set
raw_output = self.openstack(
'volume set ' +
'--name ' + new_name +
' --size 2 ' +
'--description bbbb ' +
'--no-property ' +
'--property Beta=b ' +
'--property Gamma=c ' +
'--image-property a=b ' +
'--image-property c=d ' +
'--bootable ' +
name,
)
self.assertOutput('', raw_output)
cmd_output = json.loads(self.openstack(
'volume show -f json ' +
new_name
))
self.assertEqual(
new_name,
cmd_output["name"],
)
self.assertEqual(
2,
cmd_output["size"],
)
self.assertEqual(
'bbbb',
cmd_output["description"],
)
self.assertEqual(
"Beta='b', Gamma='c'",
cmd_output["properties"],
)
self.assertEqual(
{'a': 'b', 'c': 'd'},
cmd_output["volume_image_metadata"],
)
self.assertEqual(
'true',
cmd_output["bootable"],
)
# Test volume unset
raw_output = self.openstack(
'volume unset ' +
'--property Beta ' +
'--image-property a ' +
new_name,
)
self.assertOutput('', raw_output)
cmd_output = json.loads(self.openstack(
'volume show -f json ' +
new_name
))
self.assertEqual(
"Gamma='c'",
cmd_output["properties"],
)
self.assertEqual(
{'c': 'd'},
cmd_output["volume_image_metadata"],
)
def test_volume_snapshot(self):
"""Tests volume create from snapshot"""
volume_name = uuid.uuid4().hex
snapshot_name = uuid.uuid4().hex
# Make a snapshot
cmd_output = json.loads(self.openstack(
'volume create -f json ' +
'--size 1 ' +
volume_name
))
self.wait_for("volume", volume_name, "available")
self.assertEqual(
volume_name,
cmd_output["name"],
)
cmd_output = json.loads(self.openstack(
'volume snapshot create -f json ' +
snapshot_name +
' --volume ' + volume_name
))
self.wait_for("volume snapshot", snapshot_name, "available")
name = uuid.uuid4().hex
cmd_output = json.loads(self.openstack(
'volume create -f json ' +
'--snapshot ' + snapshot_name +
' ' + name
))
self.addCleanup(self.openstack, 'volume delete ' + name)
self.addCleanup(self.openstack, 'volume delete ' + volume_name)
self.assertEqual(
name,
cmd_output["name"],
)
self.wait_for("volume", name, "available")
# Delete snapshot
raw_output = self.openstack(
'volume snapshot delete ' + snapshot_name)
self.assertOutput('', raw_output)
def test_volume_list_backward_compatibility(self):
"""Test backward compatibility of list command"""
name1 = uuid.uuid4().hex
cmd_output = json.loads(self.openstack(
'volume create -f json ' +
'--size 1 ' +
name1
))
self.addCleanup(self.openstack, 'volume delete ' + name1)
self.assertEqual(
1,
cmd_output["size"],
)
self.wait_for("volume", name1, "available")
# Test list -c "Display Name"
cmd_output = json.loads(self.openstack(
'volume list -f json ' +
'-c "Display Name"'
))
for each_volume in cmd_output:
self.assertIn('Display Name', each_volume)
# Test list -c "Name"
cmd_output = json.loads(self.openstack(
'volume list -f json ' +
'-c "Name"'
))
for each_volume in cmd_output:
self.assertIn('Name', each_volume)
def wait_for(self, check_type, check_name, desired_status, wait=120,
interval=5, failures=['ERROR']):
status = "notset"
total_sleep = 0
opts = self.get_opts(['status'])
while total_sleep < wait:
try:
status = self.openstack(
check_type + ' show ' + check_name + opts
)
except exceptions.CommandFailed:
# Show command raise Exception when object had been deleted
status = 'disappear'
status = status.rstrip()
print('Checking {} {} Waiting for {} current status: {}'
.format(check_type, check_name, desired_status, status))
if status == desired_status:
break
self.assertNotIn(status, failures)
time.sleep(interval)
total_sleep += interval
self.assertEqual(desired_status, status)