diff options
| author | Chris Behrens <cbehrens@codestud.com> | 2012-07-27 06:20:16 +0000 |
|---|---|---|
| committer | Chris Behrens <cbehrens@codestud.com> | 2012-07-27 06:20:16 +0000 |
| commit | 1ca9d3c9df58f7ea28609cccac97a74d28fda4db (patch) | |
| tree | 8bfa3936cd9fe97e680af5b1f062260ca0937980 /nova/tests | |
| parent | 0626def72e8c2271ef72910c1a2f64015ac9c38b (diff) | |
Don't store system_metadata in xenstore
Fixes bug 1029774
system_metadata should not be exposed to users.
This reverts part of commit 82afe7ad5 / ChangeID I88a59f1b783
Change-Id: Id454dbcbafef861db3f88620a56d8dd2ccd30e1d
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_xenapi.py | 41 |
1 files changed, 2 insertions, 39 deletions
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py index 069a98c14..61a4c8149 100644 --- a/nova/tests/test_xenapi.py +++ b/nova/tests/test_xenapi.py @@ -2252,6 +2252,8 @@ class XenAPIInjectMetadataTestCase(stubs.XenAPITestBase): self.key = key self.value = value + # Add some system_metadata to ensure it doesn't get added + # to xenstore instance = dict(metadata=[FakeMetaItem("a", 1), FakeMetaItem("b", 2), FakeMetaItem("c", 3)], @@ -2265,9 +2267,6 @@ class XenAPIInjectMetadataTestCase(stubs.XenAPITestBase): 'vm-data/user-metadata/a': '1', 'vm-data/user-metadata/b': '2', 'vm-data/user-metadata/c': '3', - 'vm-data/system-metadata/sys_a': '1', - 'vm-data/system-metadata/sys_b': '2', - 'vm-data/system-metadata/sys_c': '3', }, 'ephem': {}, }) @@ -2279,17 +2278,11 @@ class XenAPIInjectMetadataTestCase(stubs.XenAPITestBase): 'vm-data/user-metadata/a': '1', 'vm-data/user-metadata/b': '2', 'vm-data/user-metadata/c': '3', - 'vm-data/system-metadata/sys_a': '1', - 'vm-data/system-metadata/sys_b': '2', - 'vm-data/system-metadata/sys_c': '3', }, 'ephem': { 'vm-data/user-metadata/a': '1', 'vm-data/user-metadata/b': '2', 'vm-data/user-metadata/c': '3', - 'vm-data/system-metadata/sys_a': '1', - 'vm-data/system-metadata/sys_b': '2', - 'vm-data/system-metadata/sys_c': '3', }, } @@ -2301,18 +2294,12 @@ class XenAPIInjectMetadataTestCase(stubs.XenAPITestBase): 'vm-data/user-metadata/b': '2', 'vm-data/user-metadata/c': '3', 'vm-data/user-metadata/d': '4', - 'vm-data/system-metadata/sys_a': '1', - 'vm-data/system-metadata/sys_b': '2', - 'vm-data/system-metadata/sys_c': '3', }, 'ephem': { 'vm-data/user-metadata/a': '1', 'vm-data/user-metadata/b': '2', 'vm-data/user-metadata/c': '3', 'vm-data/user-metadata/d': '4', - 'vm-data/system-metadata/sys_a': '1', - 'vm-data/system-metadata/sys_b': '2', - 'vm-data/system-metadata/sys_c': '3', }, }) @@ -2323,17 +2310,11 @@ class XenAPIInjectMetadataTestCase(stubs.XenAPITestBase): 'vm-data/user-metadata/a': '1', 'vm-data/user-metadata/b': '2', 'vm-data/user-metadata/c': '3', - 'vm-data/system-metadata/sys_a': '1', - 'vm-data/system-metadata/sys_b': '2', - 'vm-data/system-metadata/sys_c': '3', }, 'ephem': { 'vm-data/user-metadata/a': '1', 'vm-data/user-metadata/b': '2', 'vm-data/user-metadata/c': '3', - 'vm-data/system-metadata/sys_a': '1', - 'vm-data/system-metadata/sys_b': '2', - 'vm-data/system-metadata/sys_c': '3', }, } @@ -2344,17 +2325,11 @@ class XenAPIInjectMetadataTestCase(stubs.XenAPITestBase): 'vm-data/user-metadata/a': '1', 'vm-data/user-metadata/b': '4', 'vm-data/user-metadata/c': '3', - 'vm-data/system-metadata/sys_a': '1', - 'vm-data/system-metadata/sys_b': '2', - 'vm-data/system-metadata/sys_c': '3', }, 'ephem': { 'vm-data/user-metadata/a': '1', 'vm-data/user-metadata/b': '4', 'vm-data/user-metadata/c': '3', - 'vm-data/system-metadata/sys_a': '1', - 'vm-data/system-metadata/sys_b': '2', - 'vm-data/system-metadata/sys_c': '3', }, }) @@ -2365,17 +2340,11 @@ class XenAPIInjectMetadataTestCase(stubs.XenAPITestBase): 'vm-data/user-metadata/a': '1', 'vm-data/user-metadata/b': '2', 'vm-data/user-metadata/c': '3', - 'vm-data/system-metadata/sys_a': '1', - 'vm-data/system-metadata/sys_b': '2', - 'vm-data/system-metadata/sys_c': '3', }, 'ephem': { 'vm-data/user-metadata/a': '1', 'vm-data/user-metadata/b': '2', 'vm-data/user-metadata/c': '3', - 'vm-data/system-metadata/sys_a': '1', - 'vm-data/system-metadata/sys_b': '2', - 'vm-data/system-metadata/sys_c': '3', }, } @@ -2385,15 +2354,9 @@ class XenAPIInjectMetadataTestCase(stubs.XenAPITestBase): 'persist': { 'vm-data/user-metadata/a': '1', 'vm-data/user-metadata/c': '3', - 'vm-data/system-metadata/sys_a': '1', - 'vm-data/system-metadata/sys_b': '2', - 'vm-data/system-metadata/sys_c': '3', }, 'ephem': { 'vm-data/user-metadata/a': '1', 'vm-data/user-metadata/c': '3', - 'vm-data/system-metadata/sys_a': '1', - 'vm-data/system-metadata/sys_b': '2', - 'vm-data/system-metadata/sys_c': '3', }, }) |