Remove hv_type translation shim for powervm

Commit d05567cc3f added a temporary
translation shim so that the 'powervm' hypervisor type name in older
images used by the powervc driver in stackforge would not fail to
schedule due to an invalid (unregistered) hypervisor type.

The agreement from the powervc driver maintainers in stackforge was that
they'd put an image metadata translation shim in their driver so this
could be removed from nova in Liberty, which is now.

UpgradeImpact: Users of the nova-powervc driver from stackforge will
               need to move to a version of that driver which
               translates 'powervm' image metadata properly for
               scheduling, or update the image metadata manually.

Change-Id: I31be654c817a00df2b4b51c184600c0c51c86443
This commit is contained in:
Matt Riedemann 2015-06-17 12:51:00 -07:00
parent 5793d5693b
commit 2a01a1b3eb
3 changed files with 1 additions and 8 deletions

View File

@ -95,9 +95,6 @@ def canonicalize(name):
if newname == "xapi":
newname = XEN
elif newname == "powervm":
# TODO(mriedem): Remove the translation shim in the 2015.2 'L' release.
newname = PHYP
if not is_valid(newname):
raise exception.InvalidHypervisorVirtType(hv_type=name)

View File

@ -40,9 +40,6 @@ class HvTypeTest(test.NoDBTestCase):
def test_canonicalize_xapi(self):
self.assertEqual(hv_type.XEN, hv_type.canonicalize("xapi"))
def test_canonicalize_powervm(self):
self.assertEqual(hv_type.PHYP, hv_type.canonicalize("POWERVM"))
def test_canonicalize_invalid(self):
self.assertRaises(exception.InvalidHypervisorVirtType,
hv_type.canonicalize,

View File

@ -283,8 +283,7 @@ class TestHVType(TestField):
('bhyve', 'bhyve'),
('fake', 'fake'),
('kvm', 'kvm'),
('xapi', 'xen'),
('powervm', 'phyp')]
('xapi', 'xen')]
self.coerce_bad_values = ['acme']
self.to_primitive_values = self.coerce_good_values[0:1]
self.from_primitive_values = self.coerce_good_values[0:1]