diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-17 17:48:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-17 17:48:52 +0000 |
| commit | d6ce08fd8f2b0bf7bcf16a8bea5cec864ab3779b (patch) | |
| tree | 2851e206d3f5fdd83feaf7fb24379d25e3ef3679 | |
| parent | ef317edb704deb0c19660525e6f9690d8ebb79c5 (diff) | |
| parent | 5e0239f93407e03f45a0514c15969509931b9c9c (diff) | |
| download | nova-d6ce08fd8f2b0bf7bcf16a8bea5cec864ab3779b.tar.gz nova-d6ce08fd8f2b0bf7bcf16a8bea5cec864ab3779b.tar.xz nova-d6ce08fd8f2b0bf7bcf16a8bea5cec864ab3779b.zip | |
Merge "xenapi: ensure agent check respects image flags"
| -rw-r--r-- | nova/tests/virt/xenapi/test_agent.py | 10 | ||||
| -rw-r--r-- | nova/virt/xenapi/agent.py | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nova/tests/virt/xenapi/test_agent.py b/nova/tests/virt/xenapi/test_agent.py index 9a4d7c345..c81c9ec79 100644 --- a/nova/tests/virt/xenapi/test_agent.py +++ b/nova/tests/virt/xenapi/test_agent.py @@ -24,28 +24,28 @@ class AgentEnabledCase(test.TestCase): def test_agent_is_present(self): self.flags(xenapi_use_agent_default=False) instance = {"system_metadata": - {"image_xenapi_use_agent": "true"}} + [{"key": "image_xenapi_use_agent", "value": "true"}]} self.assertTrue(agent.should_use_agent(instance)) def test_agent_is_disabled(self): self.flags(xenapi_use_agent_default=True) instance = {"system_metadata": - {"image_xenapi_use_agent": "false"}} + [{"key": "image_xenapi_use_agent", "value": "false"}]} self.assertFalse(agent.should_use_agent(instance)) def test_agent_uses_deafault_when_prop_invalid(self): self.flags(xenapi_use_agent_default=True) instance = {"system_metadata": - {"image_xenapi_use_agent": "bob"}, + [{"key": "image_xenapi_use_agent", "value": "bob"}], "uuid": "uuid"} self.assertTrue(agent.should_use_agent(instance)) def test_agent_default_not_present(self): self.flags(xenapi_use_agent_default=False) - instance = {"system_metadata": {}} + instance = {"system_metadata": []} self.assertFalse(agent.should_use_agent(instance)) def test_agent_default_present(self): self.flags(xenapi_use_agent_default=True) - instance = {"system_metadata": {}} + instance = {"system_metadata": []} self.assertTrue(agent.should_use_agent(instance)) diff --git a/nova/virt/xenapi/agent.py b/nova/virt/xenapi/agent.py index 273c7bb97..c9e011856 100644 --- a/nova/virt/xenapi/agent.py +++ b/nova/virt/xenapi/agent.py @@ -328,7 +328,7 @@ def find_guest_agent(base_dir): def should_use_agent(instance): - sys_meta = instance["system_metadata"] + sys_meta = utils.instance_sys_meta(instance) if USE_AGENT_SM_KEY not in sys_meta: return CONF.xenapi_use_agent_default else: |