From 31336b35b4604f70150d0073d77dbf63b9bf7598 Mon Sep 17 00:00:00 2001
From: Chuck Short <chuck.short@canonical.com>
Date: Wed, 6 Jun 2012 22:45:25 -0400
Subject: Add CPU arch filter scheduler support

In a mixed environment of running different CPU architecutres,
one would not want to run an ARM instance on a X86_64 host and
vice versa.

This scheduler filter option will prevent instances running
on a host that it is not intended for.

The libvirt driver queries the guest capabilities of the
host and stores the guest arches in the permitted_instances_types
list in the cpu_info dict of the host.

The Xen equivalent will be done later in another commit.

The arch filter will compare the instance arch against
the permitted_instances_types of a host
and filter out invalid hosts.

Also adds ARM as a valid arch to the filter.

The ArchFilter is not turned on by default.

Change-Id: I17bd103f00c25d6006a421252c9c8dcfd2d2c49b
Signed-off-by: Chuck Short <chuck.short@canonical.com>
---
 nova/tests/scheduler/test_host_filters.py | 54 +++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

(limited to 'nova/tests')

diff --git a/nova/tests/scheduler/test_host_filters.py b/nova/tests/scheduler/test_host_filters.py
index 60f3577ac..80da5acd2 100644
--- a/nova/tests/scheduler/test_host_filters.py
+++ b/nova/tests/scheduler/test_host_filters.py
@@ -793,3 +793,57 @@ class HostFiltersTestCase(test.TestCase):
         request = self._make_zone_request('bad')
         host = fakes.FakeHostState('host1', 'compute', {'service': service})
         self.assertFalse(filt_cls.host_passes(host, request))
+
+    def test_arch_filter_same(self):
+        permitted_instances = ['x86_64']
+        filt_cls = self.class_map['ArchFilter']()
+        filter_properties = {
+            'request_spec': {
+                'instance_properties': {'architecture': 'x86_64'}
+            }
+        }
+        capabilities = {'enabled': True,
+                            'cpu_info': {
+                                'permitted_instance_types': permitted_instances
+                            }
+                        }
+        service = {'disabled': False}
+        host = fakes.FakeHostState('host1', 'compute',
+            {'capabilities': capabilities, 'service': service})
+        self.assertTrue(filt_cls.host_passes(host, filter_properties))
+
+    def test_arch_filter_different(self):
+        permitted_instances = ['arm']
+        filt_cls = self.class_map['ArchFilter']()
+        filter_properties = {
+            'request_spec': {
+                    'instance_properties': {'architecture': 'x86_64'}
+                }
+            }
+        capabilities = {'enabled': True,
+                            'cpu_info': {
+                                'permitted_instance_types': permitted_instances
+                            }
+                        }
+        service = {'disabled': False}
+        host = fakes.FakeHostState('host1', 'compute',
+            {'capabilities': capabilities, 'service': service})
+        self.assertFalse(filt_cls.host_passes(host, filter_properties))
+
+    def test_arch_filter_without_permitted_instances(self):
+        permitted_instances = []
+        filt_cls = self.class_map['ArchFilter']()
+        filter_properties = {
+             'request_spec': {
+                'instance_properties': {'architecture': 'x86_64'}
+            }
+        }
+        capabilities = {'enabled': True,
+                            'cpu_info': {
+                                'permitted_instance_types': permitted_instances
+                            }
+                        }
+        service = {'disabled': False}
+        host = fakes.FakeHostState('host1', 'compute',
+            {'capabilities': capabilities, 'service': service})
+        self.assertFalse(filt_cls.host_passes(host, filter_properties))
-- 
cgit