f49f0fead2
Nothing too complicated here. I fixed a bunch of spacing issues that I saw in OSC. Change-Id: I935ab48e7c5bac5f88ecdb3a05f73fb44fc9f41d
383 lines
12 KiB
Python
383 lines
12 KiB
Python
# Copyright 2013 OpenStack Foundation
|
|
#
|
|
# 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 copy
|
|
import mock
|
|
|
|
from openstackclient.api import object_store_v1 as object_store
|
|
from openstackclient.object.v1 import object as obj
|
|
from openstackclient.tests.object.v1 import fakes as object_fakes
|
|
|
|
|
|
AUTH_TOKEN = "foobar"
|
|
AUTH_URL = "http://0.0.0.0"
|
|
|
|
|
|
class TestObject(object_fakes.TestObjectv1):
|
|
|
|
def setUp(self):
|
|
super(TestObject, self).setUp()
|
|
self.app.client_manager.object_store = object_store.APIv1(
|
|
session=mock.Mock(),
|
|
service_type="object-store",
|
|
)
|
|
self.api = self.app.client_manager.object_store
|
|
|
|
|
|
@mock.patch(
|
|
'openstackclient.api.object_store_v1.APIv1.object_list'
|
|
)
|
|
class TestObjectList(TestObject):
|
|
|
|
columns = ('Name',)
|
|
datalist = (
|
|
(
|
|
object_fakes.object_name_2,
|
|
),
|
|
)
|
|
|
|
def setUp(self):
|
|
super(TestObjectList, self).setUp()
|
|
|
|
# Get the command object to test
|
|
self.cmd = obj.ListObject(self.app, None)
|
|
|
|
def test_object_list_objects_no_options(self, o_mock):
|
|
o_mock.return_value = [
|
|
copy.deepcopy(object_fakes.OBJECT),
|
|
copy.deepcopy(object_fakes.OBJECT_2),
|
|
]
|
|
|
|
arglist = [
|
|
object_fakes.container_name,
|
|
]
|
|
verifylist = [
|
|
('container', object_fakes.container_name),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# In base command class Lister in cliff, abstract method take_action()
|
|
# returns a tuple containing the column names and an iterable
|
|
# containing the data to be listed.
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
o_mock.assert_called_with(
|
|
container=object_fakes.container_name,
|
|
)
|
|
|
|
self.assertEqual(self.columns, columns)
|
|
datalist = (
|
|
(object_fakes.object_name_1, ),
|
|
(object_fakes.object_name_2, ),
|
|
)
|
|
self.assertEqual(datalist, tuple(data))
|
|
|
|
def test_object_list_objects_prefix(self, o_mock):
|
|
o_mock.return_value = [
|
|
copy.deepcopy(object_fakes.OBJECT_2),
|
|
]
|
|
|
|
arglist = [
|
|
'--prefix', 'floppy',
|
|
object_fakes.container_name_2,
|
|
]
|
|
verifylist = [
|
|
('prefix', 'floppy'),
|
|
('container', object_fakes.container_name_2),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# In base command class Lister in cliff, abstract method take_action()
|
|
# returns a tuple containing the column names and an iterable
|
|
# containing the data to be listed.
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
# Set expected values
|
|
kwargs = {
|
|
'prefix': 'floppy',
|
|
}
|
|
o_mock.assert_called_with(
|
|
container=object_fakes.container_name_2,
|
|
**kwargs
|
|
)
|
|
|
|
self.assertEqual(self.columns, columns)
|
|
self.assertEqual(self.datalist, tuple(data))
|
|
|
|
def test_object_list_objects_delimiter(self, o_mock):
|
|
o_mock.return_value = [
|
|
copy.deepcopy(object_fakes.OBJECT_2),
|
|
]
|
|
|
|
arglist = [
|
|
'--delimiter', '=',
|
|
object_fakes.container_name_2,
|
|
]
|
|
verifylist = [
|
|
('delimiter', '='),
|
|
('container', object_fakes.container_name_2),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# In base command class Lister in cliff, abstract method take_action()
|
|
# returns a tuple containing the column names and an iterable
|
|
# containing the data to be listed.
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
# Set expected values
|
|
kwargs = {
|
|
'delimiter': '=',
|
|
}
|
|
o_mock.assert_called_with(
|
|
container=object_fakes.container_name_2,
|
|
**kwargs
|
|
)
|
|
|
|
self.assertEqual(self.columns, columns)
|
|
self.assertEqual(self.datalist, tuple(data))
|
|
|
|
def test_object_list_objects_marker(self, o_mock):
|
|
o_mock.return_value = [
|
|
copy.deepcopy(object_fakes.OBJECT_2),
|
|
]
|
|
|
|
arglist = [
|
|
'--marker', object_fakes.object_name_2,
|
|
object_fakes.container_name_2,
|
|
]
|
|
verifylist = [
|
|
('marker', object_fakes.object_name_2),
|
|
('container', object_fakes.container_name_2),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# In base command class Lister in cliff, abstract method take_action()
|
|
# returns a tuple containing the column names and an iterable
|
|
# containing the data to be listed.
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
# Set expected values
|
|
kwargs = {
|
|
'marker': object_fakes.object_name_2,
|
|
}
|
|
o_mock.assert_called_with(
|
|
container=object_fakes.container_name_2,
|
|
**kwargs
|
|
)
|
|
|
|
self.assertEqual(self.columns, columns)
|
|
self.assertEqual(self.datalist, tuple(data))
|
|
|
|
def test_object_list_objects_end_marker(self, o_mock):
|
|
o_mock.return_value = [
|
|
copy.deepcopy(object_fakes.OBJECT_2),
|
|
]
|
|
|
|
arglist = [
|
|
'--end-marker', object_fakes.object_name_2,
|
|
object_fakes.container_name_2,
|
|
]
|
|
verifylist = [
|
|
('end_marker', object_fakes.object_name_2),
|
|
('container', object_fakes.container_name_2),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# In base command class Lister in cliff, abstract method take_action()
|
|
# returns a tuple containing the column names and an iterable
|
|
# containing the data to be listed.
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
# Set expected values
|
|
kwargs = {
|
|
'end_marker': object_fakes.object_name_2,
|
|
}
|
|
o_mock.assert_called_with(
|
|
container=object_fakes.container_name_2,
|
|
**kwargs
|
|
)
|
|
|
|
self.assertEqual(self.columns, columns)
|
|
self.assertEqual(self.datalist, tuple(data))
|
|
|
|
def test_object_list_objects_limit(self, o_mock):
|
|
o_mock.return_value = [
|
|
copy.deepcopy(object_fakes.OBJECT_2),
|
|
]
|
|
|
|
arglist = [
|
|
'--limit', '2',
|
|
object_fakes.container_name_2,
|
|
]
|
|
verifylist = [
|
|
('limit', 2),
|
|
('container', object_fakes.container_name_2),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# In base command class Lister in cliff, abstract method take_action()
|
|
# returns a tuple containing the column names and an iterable
|
|
# containing the data to be listed.
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
# Set expected values
|
|
kwargs = {
|
|
'limit': 2,
|
|
}
|
|
o_mock.assert_called_with(
|
|
container=object_fakes.container_name_2,
|
|
**kwargs
|
|
)
|
|
|
|
self.assertEqual(self.columns, columns)
|
|
self.assertEqual(self.datalist, tuple(data))
|
|
|
|
def test_object_list_objects_long(self, o_mock):
|
|
o_mock.return_value = [
|
|
copy.deepcopy(object_fakes.OBJECT),
|
|
copy.deepcopy(object_fakes.OBJECT_2),
|
|
]
|
|
|
|
arglist = [
|
|
'--long',
|
|
object_fakes.container_name,
|
|
]
|
|
verifylist = [
|
|
('long', True),
|
|
('container', object_fakes.container_name),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# In base command class Lister in cliff, abstract method take_action()
|
|
# returns a tuple containing the column names and an iterable
|
|
# containing the data to be listed.
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
# Set expected values
|
|
kwargs = {
|
|
}
|
|
o_mock.assert_called_with(
|
|
container=object_fakes.container_name,
|
|
**kwargs
|
|
)
|
|
|
|
collist = ('Name', 'Bytes', 'Hash', 'Content Type', 'Last Modified')
|
|
self.assertEqual(collist, columns)
|
|
datalist = (
|
|
(
|
|
object_fakes.object_name_1,
|
|
object_fakes.object_bytes_1,
|
|
object_fakes.object_hash_1,
|
|
object_fakes.object_content_type_1,
|
|
object_fakes.object_modified_1,
|
|
),
|
|
(
|
|
object_fakes.object_name_2,
|
|
object_fakes.object_bytes_2,
|
|
object_fakes.object_hash_2,
|
|
object_fakes.object_content_type_2,
|
|
object_fakes.object_modified_2,
|
|
),
|
|
)
|
|
self.assertEqual(datalist, tuple(data))
|
|
|
|
def test_object_list_objects_all(self, o_mock):
|
|
o_mock.return_value = [
|
|
copy.deepcopy(object_fakes.OBJECT),
|
|
copy.deepcopy(object_fakes.OBJECT_2),
|
|
]
|
|
|
|
arglist = [
|
|
'--all',
|
|
object_fakes.container_name,
|
|
]
|
|
verifylist = [
|
|
('all', True),
|
|
('container', object_fakes.container_name),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# In base command class Lister in cliff, abstract method take_action()
|
|
# returns a tuple containing the column names and an iterable
|
|
# containing the data to be listed.
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
# Set expected values
|
|
kwargs = {
|
|
'full_listing': True,
|
|
}
|
|
o_mock.assert_called_with(
|
|
container=object_fakes.container_name,
|
|
**kwargs
|
|
)
|
|
|
|
self.assertEqual(self.columns, columns)
|
|
datalist = (
|
|
(object_fakes.object_name_1, ),
|
|
(object_fakes.object_name_2, ),
|
|
)
|
|
self.assertEqual(datalist, tuple(data))
|
|
|
|
|
|
@mock.patch(
|
|
'openstackclient.api.object_store_v1.APIv1.object_show'
|
|
)
|
|
class TestObjectShow(TestObject):
|
|
|
|
def setUp(self):
|
|
super(TestObjectShow, self).setUp()
|
|
|
|
# Get the command object to test
|
|
self.cmd = obj.ShowObject(self.app, None)
|
|
|
|
def test_object_show(self, c_mock):
|
|
c_mock.return_value = copy.deepcopy(object_fakes.OBJECT)
|
|
|
|
arglist = [
|
|
object_fakes.container_name,
|
|
object_fakes.object_name_1,
|
|
]
|
|
verifylist = [
|
|
('container', object_fakes.container_name),
|
|
('object', object_fakes.object_name_1),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# In base command class ShowOne in cliff, abstract method take_action()
|
|
# returns a two-part tuple with a tuple of column names and a tuple of
|
|
# data to be shown.
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
|
|
# Set expected values
|
|
kwargs = {
|
|
}
|
|
# lib.container.show_container(api, url, container)
|
|
c_mock.assert_called_with(
|
|
container=object_fakes.container_name,
|
|
object=object_fakes.object_name_1,
|
|
**kwargs
|
|
)
|
|
|
|
collist = ('bytes', 'content_type', 'hash', 'last_modified', 'name')
|
|
self.assertEqual(collist, columns)
|
|
datalist = (
|
|
object_fakes.object_bytes_1,
|
|
object_fakes.object_content_type_1,
|
|
object_fakes.object_hash_1,
|
|
object_fakes.object_modified_1,
|
|
object_fakes.object_name_1,
|
|
)
|
|
self.assertEqual(datalist, data)
|