openstack/python-openstackclient
Code Issues Proposed changes

Merge "Use class FakeServer in TestServerCreate."

Browse Source
This commit is contained in:
Jenkins 2015-11-25 01:49:20 +00:00 committed by Gerrit Code Review
commit 1f2fcb570d
1 changed files with 68 additions and 38 deletions

106
openstackclient/tests/compute/v2/test_server.py

@ -58,18 +58,16 @@ class TestServerCreate(TestServer):
def setUp(self): def setUp(self):
super(TestServerCreate, self).setUp() super(TestServerCreate, self).setUp()
self.servers_mock.create.return_value = fakes.FakeResource( attrs = {
None, 'networks': {},
copy.deepcopy(compute_fakes.SERVER), }
loaded=True, self.new_server = fakes.FakeServer.create_one_server(attrs=attrs)
)
new_server = fakes.FakeResource( # This is the return value for utils.find_resource().
None, # This is for testing --wait option.
copy.deepcopy(compute_fakes.SERVER), self.servers_mock.get.return_value = self.new_server
loaded=True,
) self.servers_mock.create.return_value = self.new_server
new_server.__dict__['networks'] = {}
self.servers_mock.get.return_value = new_server
self.image = fakes.FakeResource( self.image = fakes.FakeResource(
None, None,
@ -97,10 +95,10 @@ class TestServerCreate(TestServer):
def test_server_create_no_options(self): def test_server_create_no_options(self):
arglist = [ arglist = [
compute_fakes.server_name, self.new_server.name,
] ]
verifylist = [ verifylist = [
('server_name', compute_fakes.server_name), ('server_name', self.new_server.name),
] ]
try: try:
# Missing required args should bail here # Missing required args should bail here
@ -112,13 +110,13 @@ class TestServerCreate(TestServer):
arglist = [ arglist = [
'--image', 'image1', '--image', 'image1',
'--flavor', 'flavor1', '--flavor', 'flavor1',
compute_fakes.server_name, self.new_server.name,
] ]
verifylist = [ verifylist = [
('image', 'image1'), ('image', 'image1'),
('flavor', 'flavor1'), ('flavor', 'flavor1'),
('config_drive', False), ('config_drive', False),
('server_name', compute_fakes.server_name), ('server_name', self.new_server.name),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -143,19 +141,27 @@ class TestServerCreate(TestServer):
) )
# ServerManager.create(name, image, flavor, **kwargs) # ServerManager.create(name, image, flavor, **kwargs)
self.servers_mock.create.assert_called_with( self.servers_mock.create.assert_called_with(
compute_fakes.server_name, self.new_server.name,
self.image, self.image,
self.flavor, self.flavor,
**kwargs **kwargs
) )
collist = ('addresses', 'flavor', 'id', 'name', 'properties') collist = (
'addresses',
'flavor',
'id',
'name',
'networks',
'properties',
)
self.assertEqual(collist, columns) self.assertEqual(collist, columns)
datalist = ( datalist = (
'', '',
'Large ()', 'Large ()',
compute_fakes.server_id, self.new_server.id,
compute_fakes.server_name, self.new_server.name,
self.new_server.networks,
'', '',
) )
self.assertEqual(datalist, data) self.assertEqual(datalist, data)
@ -166,14 +172,14 @@ class TestServerCreate(TestServer):
'--flavor', 'flavor1', '--flavor', 'flavor1',
'--nic', 'net-id=net1', '--nic', 'net-id=net1',
'--nic', 'port-id=port1', '--nic', 'port-id=port1',
compute_fakes.server_name, self.new_server.name,
] ]
verifylist = [ verifylist = [
('image', 'image1'), ('image', 'image1'),
('flavor', 'flavor1'), ('flavor', 'flavor1'),
('nic', ['net-id=net1', 'port-id=port1']), ('nic', ['net-id=net1', 'port-id=port1']),
('config_drive', False), ('config_drive', False),
('server_name', compute_fakes.server_name), ('server_name', self.new_server.name),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -219,19 +225,27 @@ class TestServerCreate(TestServer):
) )
# ServerManager.create(name, image, flavor, **kwargs) # ServerManager.create(name, image, flavor, **kwargs)
self.servers_mock.create.assert_called_with( self.servers_mock.create.assert_called_with(
compute_fakes.server_name, self.new_server.name,
self.image, self.image,
self.flavor, self.flavor,
**kwargs **kwargs
) )
collist = ('addresses', 'flavor', 'id', 'name', 'properties') collist = (
'addresses',
'flavor',
'id',
'name',
'networks',
'properties',
)
self.assertEqual(collist, columns) self.assertEqual(collist, columns)
datalist = ( datalist = (
'', '',
'Large ()', 'Large ()',
compute_fakes.server_id, self.new_server.id,
compute_fakes.server_name, self.new_server.name,
self.new_server.networks,
'', '',
) )
self.assertEqual(datalist, data) self.assertEqual(datalist, data)
@ -246,14 +260,14 @@ class TestServerCreate(TestServer):
'--image', 'image1', '--image', 'image1',
'--flavor', 'flavor1', '--flavor', 'flavor1',
'--user-data', 'userdata.sh', '--user-data', 'userdata.sh',
compute_fakes.server_name, self.new_server.name,
] ]
verifylist = [ verifylist = [
('image', 'image1'), ('image', 'image1'),
('flavor', 'flavor1'), ('flavor', 'flavor1'),
('user_data', 'userdata.sh'), ('user_data', 'userdata.sh'),
('config_drive', False), ('config_drive', False),
('server_name', compute_fakes.server_name), ('server_name', self.new_server.name),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -284,19 +298,27 @@ class TestServerCreate(TestServer):
) )
# ServerManager.create(name, image, flavor, **kwargs) # ServerManager.create(name, image, flavor, **kwargs)
self.servers_mock.create.assert_called_with( self.servers_mock.create.assert_called_with(
compute_fakes.server_name, self.new_server.name,
self.image, self.image,
self.flavor, self.flavor,
**kwargs **kwargs
) )
collist = ('addresses', 'flavor', 'id', 'name', 'properties') collist = (
'addresses',
'flavor',
'id',
'name',
'networks',
'properties',
)
self.assertEqual(collist, columns) self.assertEqual(collist, columns)
datalist = ( datalist = (
'', '',
'Large ()', 'Large ()',
compute_fakes.server_id, self.new_server.id,
compute_fakes.server_name, self.new_server.name,
self.new_server.networks,
'', '',
) )
self.assertEqual(datalist, data) self.assertEqual(datalist, data)
@ -306,14 +328,14 @@ class TestServerCreate(TestServer):
'--image', 'image1', '--image', 'image1',
'--flavor', compute_fakes.flavor_id, '--flavor', compute_fakes.flavor_id,
'--block-device-mapping', compute_fakes.block_device_mapping, '--block-device-mapping', compute_fakes.block_device_mapping,
compute_fakes.server_name, self.new_server.name,
] ]
verifylist = [ verifylist = [
('image', 'image1'), ('image', 'image1'),
('flavor', compute_fakes.flavor_id), ('flavor', compute_fakes.flavor_id),
('block_device_mapping', [compute_fakes.block_device_mapping]), ('block_device_mapping', [compute_fakes.block_device_mapping]),
('config_drive', False), ('config_drive', False),
('server_name', compute_fakes.server_name), ('server_name', self.new_server.name),
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@ -345,19 +367,27 @@ class TestServerCreate(TestServer):
) )
# ServerManager.create(name, image, flavor, **kwargs) # ServerManager.create(name, image, flavor, **kwargs)
self.servers_mock.create.assert_called_with( self.servers_mock.create.assert_called_with(
compute_fakes.server_name, self.new_server.name,
self.image, self.image,
self.flavor, self.flavor,
**kwargs **kwargs
) )
collist = ('addresses', 'flavor', 'id', 'name', 'properties') collist = (
'addresses',
'flavor',
'id',
'name',
'networks',
'properties',
)
self.assertEqual(collist, columns) self.assertEqual(collist, columns)
datalist = ( datalist = (
'', '',
'Large ()', 'Large ()',
compute_fakes.server_id, self.new_server.id,
compute_fakes.server_name, self.new_server.name,
self.new_server.networks,
'', '',
) )
self.assertEqual(datalist, data) self.assertEqual(datalist, data)