Rename image_ref -> image and get_image_info -> get_image

Change-Id: I85c2967935f9394b424beb1d79682700e41de1bf
This commit is contained in:
Dmitry Tantsur 2018-06-21 13:24:07 +02:00
parent 4e16c2f6f7
commit 72995b1117
5 changed files with 25 additions and 25 deletions

View File

@ -53,7 +53,7 @@ def _do_deploy(api, args, formatter):
node = api.reserve_node(args.resource_class, capabilities=capabilities)
instance = api.provision_node(node,
image_ref=args.image,
image=args.image,
nics=args.nics,
root_disk_size=args.root_disk_size,
ssh_keys=ssh_keys,

View File

@ -123,7 +123,7 @@ class API(object):
# Fetch the complete node record
return self.get_node(existing[0].uuid, accept_hostname=False)
def get_image_info(self, image_id):
def get_image(self, image_id):
return self.connection.image.find_image(image_id,
ignore_missing=False)

View File

@ -143,7 +143,7 @@ class Provisioner(object):
return hostname
def provision_node(self, node, image_ref, nics=None, root_disk_size=None,
def provision_node(self, node, image, nics=None, root_disk_size=None,
ssh_keys=None, hostname=None, netboot=False, wait=None):
"""Provision the node with the given image.
@ -158,7 +158,7 @@ class Provisioner(object):
:param node: Node object, UUID or name. Will be reserved first, if
not reserved already. Must be in the "available" state with
maintenance mode off.
:param image_ref: Image name or UUID to provision.
:param image: Image name or UUID to provision.
:param nics: List of virtual NICs to attach to physical ports.
Each item is a dict with a key describing the type of the NIC:
either a port (``{"port": "<port name or ID>"}``) or a network
@ -186,11 +186,11 @@ class Provisioner(object):
root_disk_size = _utils.get_root_disk(root_disk_size, node)
try:
image = self._api.get_image_info(image_ref)
image = self._api.get_image(image)
except Exception as exc:
raise exceptions.InvalidImage(
'Cannot find image %(image)s: %(error)s' %
{'image': image_ref, 'error': exc})
{'image': image, 'error': exc})
LOG.debug('Image: %s', image)

View File

@ -58,7 +58,7 @@ class TestDeploy(testtools.TestCase):
)
mock_pr.return_value.provision_node.assert_called_once_with(
mock_pr.return_value.reserve_node.return_value,
image_ref='myimg',
image='myimg',
nics=[{'network': 'mynet'}],
root_disk_size=None,
ssh_keys=[],
@ -101,7 +101,7 @@ class TestDeploy(testtools.TestCase):
)
mock_pr.return_value.provision_node.assert_called_once_with(
mock_pr.return_value.reserve_node.return_value,
image_ref='myimg',
image='myimg',
nics=[{'network': 'mynet'}],
root_disk_size=None,
ssh_keys=[],
@ -173,7 +173,7 @@ class TestDeploy(testtools.TestCase):
)
mock_pr.return_value.provision_node.assert_called_once_with(
mock_pr.return_value.reserve_node.return_value,
image_ref='myimg',
image='myimg',
nics=[{'network': 'mynet'}],
root_disk_size=None,
ssh_keys=[],
@ -195,7 +195,7 @@ class TestDeploy(testtools.TestCase):
)
mock_pr.return_value.provision_node.assert_called_once_with(
mock_pr.return_value.reserve_node.return_value,
image_ref='myimg',
image='myimg',
nics=[{'network': 'mynet'}],
root_disk_size=None,
ssh_keys=[],
@ -225,7 +225,7 @@ class TestDeploy(testtools.TestCase):
)
mock_pr.return_value.provision_node.assert_called_once_with(
mock_pr.return_value.reserve_node.return_value,
image_ref='myimg',
image='myimg',
nics=[{'network': 'mynet'}],
root_disk_size=None,
ssh_keys=[],
@ -257,7 +257,7 @@ class TestDeploy(testtools.TestCase):
)
mock_pr.return_value.provision_node.assert_called_once_with(
mock_pr.return_value.reserve_node.return_value,
image_ref='myimg',
image='myimg',
nics=[{'network': 'mynet'}],
root_disk_size=None,
ssh_keys=[],
@ -287,7 +287,7 @@ class TestDeploy(testtools.TestCase):
)
mock_pr.return_value.provision_node.assert_called_once_with(
mock_pr.return_value.reserve_node.return_value,
image_ref='myimg',
image='myimg',
nics=[{'network': 'mynet'}],
root_disk_size=None,
ssh_keys=[],
@ -317,7 +317,7 @@ class TestDeploy(testtools.TestCase):
)
mock_pr.return_value.provision_node.assert_called_once_with(
mock_pr.return_value.reserve_node.return_value,
image_ref='myimg',
image='myimg',
nics=[{'network': 'mynet'}],
root_disk_size=None,
ssh_keys=[],
@ -372,7 +372,7 @@ class TestDeploy(testtools.TestCase):
)
mock_pr.return_value.provision_node.assert_called_once_with(
mock_pr.return_value.reserve_node.return_value,
image_ref='myimg',
image='myimg',
nics=[{'network': 'mynet'}],
root_disk_size=None,
ssh_keys=[],
@ -397,7 +397,7 @@ class TestDeploy(testtools.TestCase):
)
mock_pr.return_value.provision_node.assert_called_once_with(
mock_pr.return_value.reserve_node.return_value,
image_ref='myimg',
image='myimg',
nics=[{'network': 'mynet'}],
root_disk_size=None,
ssh_keys=['foo'],
@ -418,7 +418,7 @@ class TestDeploy(testtools.TestCase):
)
mock_pr.return_value.provision_node.assert_called_once_with(
mock_pr.return_value.reserve_node.return_value,
image_ref='myimg',
image='myimg',
nics=[{'port': 'myport'}],
root_disk_size=None,
ssh_keys=[],
@ -438,7 +438,7 @@ class TestDeploy(testtools.TestCase):
)
mock_pr.return_value.provision_node.assert_called_once_with(
mock_pr.return_value.reserve_node.return_value,
image_ref='myimg',
image='myimg',
nics=None,
root_disk_size=None,
ssh_keys=[],
@ -460,7 +460,7 @@ class TestDeploy(testtools.TestCase):
)
mock_pr.return_value.provision_node.assert_called_once_with(
mock_pr.return_value.reserve_node.return_value,
image_ref='myimg',
image='myimg',
nics=[{'network': 'net1'}, {'port': 'port1'},
{'port': 'port2'}, {'network': 'net2'}],
root_disk_size=None,
@ -482,7 +482,7 @@ class TestDeploy(testtools.TestCase):
)
mock_pr.return_value.provision_node.assert_called_once_with(
mock_pr.return_value.reserve_node.return_value,
image_ref='myimg',
image='myimg',
nics=None,
root_disk_size=None,
ssh_keys=[],
@ -503,7 +503,7 @@ class TestDeploy(testtools.TestCase):
)
mock_pr.return_value.provision_node.assert_called_once_with(
mock_pr.return_value.reserve_node.return_value,
image_ref='myimg',
image='myimg',
nics=[{'network': 'mynet'}],
root_disk_size=None,
ssh_keys=[],
@ -524,7 +524,7 @@ class TestDeploy(testtools.TestCase):
)
mock_pr.return_value.provision_node.assert_called_once_with(
mock_pr.return_value.reserve_node.return_value,
image_ref='myimg',
image='myimg',
nics=[{'network': 'mynet'}],
root_disk_size=None,
ssh_keys=[],

View File

@ -97,7 +97,7 @@ class TestProvisionNode(Base):
def setUp(self):
super(TestProvisionNode, self).setUp()
image = self.api.get_image_info.return_value
image = self.api.get_image.return_value
self.node.instance_uuid = self.node.uuid
self.updates = {
'/instance_info/ramdisk': image.ramdisk_id,
@ -224,7 +224,7 @@ class TestProvisionNode(Base):
self.assertFalse(self.api.delete_port.called)
def test_whole_disk(self):
image = self.api.get_image_info.return_value
image = self.api.get_image.return_value
image.kernel_id = None
image.ramdisk_id = None
del self.updates['/instance_info/kernel']
@ -408,7 +408,7 @@ class TestProvisionNode(Base):
self.assertFalse(self.api.detach_port_from_node.called)
def test_missing_image(self):
self.api.get_image_info.side_effect = RuntimeError('Not found')
self.api.get_image.side_effect = RuntimeError('Not found')
self.assertRaisesRegex(exceptions.InvalidImage, 'Not found',
self.pr.provision_node,
self.node, 'image', [{'network': 'network'}])