Skip to content

Commit

Permalink
Don't store system_metadata in xenstore
Browse files Browse the repository at this point in the history 
Fixes bug 1029774

system_metadata should not be exposed to users.

This reverts part of commit 82afe7a / ChangeID I88a59f1b783

Change-Id: Id454dbcbafef861db3f88620a56d8dd2ccd30e1d
  • Loading branch information
@comstud
comstud committed Jul 27, 2012
1 parent 0626def commit 1ca9d3c
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 46 deletions.
1 change: 0 additions & 1 deletion nova/db/sqlalchemy/api.py
View file
Expand Up @@ -1483,7 +1483,6 @@ def _build_instance_get(context, session=None):
options(joinedload_all('security_groups.rules')).\
options(joinedload('info_cache')).\
options(joinedload('metadata')).\
options(joinedload('system_metadata')).\
options(joinedload('instance_type'))


Expand Down
41 changes: 2 additions & 39 deletions nova/tests/test_xenapi.py
View file
Expand Up @@ -2252,6 +2252,8 @@ def __init__(self, key, value):
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)],
Expand All @@ -2265,9 +2267,6 @@ def __init__(self, key, value):
'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': {},
})
Expand All @@ -2279,17 +2278,11 @@ def test_change_instance_metadata_add(self):
'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',
},
}

Expand All @@ -2301,18 +2294,12 @@ def test_change_instance_metadata_add(self):
'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',
},
})

Expand All @@ -2323,17 +2310,11 @@ def test_change_instance_metadata_update(self):
'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',
},
}

Expand All @@ -2344,17 +2325,11 @@ def test_change_instance_metadata_update(self):
'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',
},
})

Expand All @@ -2365,17 +2340,11 @@ def test_change_instance_metadata_delete(self):
'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',
},
}

Expand All @@ -2385,15 +2354,9 @@ def test_change_instance_metadata_delete(self):
'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',
},
})
6 changes: 0 additions & 6 deletions nova/virt/xenapi/vmops.py
View file
Expand Up @@ -22,9 +22,7 @@
import cPickle as pickle
import functools
import itertools
import os
import time
import uuid

from eventlet import greenthread
import netaddr
Expand All @@ -46,7 +44,6 @@
from nova.virt import driver
from nova.virt.xenapi import agent
from nova.virt.xenapi import firewall
from nova.virt.xenapi import network_utils
from nova.virt.xenapi import vm_utils
from nova.virt.xenapi import volume_utils

Expand Down Expand Up @@ -856,9 +853,6 @@ def store_meta(topdir, data_list):
# Store user metadata
store_meta('vm-data/user-metadata', instance['metadata'])

# Store system metadata
store_meta('vm-data/system-metadata', instance['system_metadata'])

def change_instance_metadata(self, instance, diff):
"""Apply changes to instance metadata to xenstore."""
vm_ref = self._get_vm_opaque_ref(instance)
Expand Down

0 comments on commit 1ca9d3c

Please sign in to comment.