← Back to branch summary

~ubuntu-branches/ubuntu/vivid/ceilometer/vivid-proposed

« back to all changes in this revision

Viewing changes to ceilometer/tests/compute/pollsters/test_location_metadata.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2014-06-13 13:20:35 UTC
  • mfrom: (1.1.17)
  • Revision ID: package-import@ubuntu.com-20140613132035-42ibzh8j7ww2q31i
Tags: 2014.2~b1-0ubuntu1
* New upstream release.
* debian/control: Open up juno release
* debian/patches/fix-requirements.patch: Refreshed.
* debian/rules: Patch the ceilometer.conf.sample directly since
  the configuration files are generated by a tool.
* debian/ceilometer-common.install: Drop sources.json.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ceilometer/tests/compute/pollsters/test_location_metadata.py
1
 
# -*- encoding: utf-8 -*-
2
1
#
3
 
# Copyright © 2012 eNovance <licensing@enovance.com>
4
 
# Copyright © 2012 Red Hat, Inc
 
2
# Copyright 2012 eNovance <licensing@enovance.com>
 
3
# Copyright 2012 Red Hat, Inc
5
4
#
6
5
# Author: Julien Danjou <julien@danjou.info>
7
6
# Author: Eoghan Glynn <eglynn@redhat.com>
61
60
                                    'kernel_id': 'kernel id',
62
61
                                    'os_type': 'linux',
63
62
                                    'ramdisk_id': 'ramdisk id',
 
63
                                    'status': 'active',
64
64
                                    'ephemeral_gb': 0,
65
65
                                    'root_gb': 20,
66
66
                                    'disk_gb': 20,
98
98
        self.assertEqual(1, len(user_metadata))
99
99
 
100
100
    def test_metadata_empty_image(self):
101
 
        self.INSTANCE_PROPERTIES['image'] = ''
 
101
        self.INSTANCE_PROPERTIES['image'] = None
102
102
        self.instance = FauxInstance(**self.INSTANCE_PROPERTIES)
103
103
        md = util._get_metadata_from_object(self.instance)
 
104
        self.assertIsNone(md['image'])
104
105
        self.assertIsNone(md['image_ref'])
105
106
        self.assertIsNone(md['image_ref_url'])
 
107
 
 
108
    def test_metadata_image_through_conductor(self):
 
109
        # There should be no links here, should default to None
 
110
        self.INSTANCE_PROPERTIES['image'] = {'id': 1}
 
111
        self.instance = FauxInstance(**self.INSTANCE_PROPERTIES)
 
112
        md = util._get_metadata_from_object(self.instance)
 
113
        self.assertEqual(1, md['image_ref'])
 
114
        self.assertIsNone(md['image_ref_url'])