diff options
| author | Jim Fehlig <jfehlig@suse.com> | 2012-08-24 13:34:30 -0600 |
|---|---|---|
| committer | Jim Fehlig <jfehlig@suse.com> | 2012-08-24 14:00:48 -0600 |
| commit | 61839b33db42e1865e8df019655f25b70ec97669 (patch) | |
| tree | 07d54640681fdaf02f0d11f44e2726f583c60fcf /nova | |
| parent | 4b7c87a17affe530a8c196df993992cfe5202911 (diff) | |
| download | nova-61839b33db42e1865e8df019655f25b70ec97669.tar.gz nova-61839b33db42e1865e8df019655f25b70ec97669.tar.xz nova-61839b33db42e1865e8df019655f25b70ec97669.zip | |
Remove unused permitted_instance_types
Commit 5ea7db9b removed the ArchFilter and moved its functionality
to the ImagePropertiesFilter, which uses 'supported_instances' from
the compute nodes to determine if a node satisfies the arch,
preferred hypervisor, and virtual machine mode requested by the
instance. permitted_instance_types is no longer used and can be
removed.
Change-Id: Idf9d72746d7c3dcd2a7385913823df122eaa7cd6
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/tests/test_libvirt.py | 1 | ||||
| -rw-r--r-- | nova/utils.py | 9 | ||||
| -rw-r--r-- | nova/virt/libvirt/driver.py | 5 |
3 files changed, 0 insertions, 15 deletions
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index cd7688c80..da2a7e306 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -2279,7 +2279,6 @@ class LibvirtConnTestCase(test.TestCase): want = {"vendor": "AMD", "features": ["extapic", "3dnow"], - "permitted_instance_types": ["x86_64", "i686"], "model": "Opteron_G4", "arch": "x86_64", "topology": {"cores": 2, "threads": 1, "sockets": 4}} diff --git a/nova/utils.py b/nova/utils.py index a14263eaf..c1a12cade 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -1226,15 +1226,6 @@ def strcmp_const_time(s1, s2): return result == 0 -def sys_platform_translate(arch): - """Translate cpu architecture into supported platforms.""" - if (arch[0] == 'i' and arch[1].isdigit() and arch[2:4] == '86'): - arch = 'i686' - elif arch.startswith('arm'): - arch = 'arm' - return arch - - def walk_class_hierarchy(clazz, encountered=None): """Walk class hierarchy, yielding most derived classes first""" if not encountered: diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index c4ebcf931..4e6e77a8d 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -2127,11 +2127,6 @@ class LibvirtDriver(driver.ComputeDriver): features.append(f.name) cpu_info['features'] = features - guest_arches = list() - for g in caps.guests: - guest_arches.append(g.arch) - cpu_info['permitted_instance_types'] = guest_arches - # TODO(berrange): why do we bother converting the # libvirt capabilities XML into a special JSON format ? # The data format is different across all the drivers |