← Back to branch summary

~cloudbuilders/nova/os-keypair-integration

« back to all changes in this revision

Viewing changes to nova/tests/test_compute.py

  • Committer: Jesse Andrews
  • Date: 2011-08-26 21:57:53 UTC
  • mfrom: (1455.1.45 nova)
  • Revision ID: anotherjesse@gmail.com-20110826215753-0sfp6dubujsl23wa
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/test_compute.py
2
2
 
3
3
# Copyright 2010 United States Government as represented by the
4
4
# Administrator of the National Aeronautics and Space Administration.
 
5
# Copyright 2011 Piston Cloud Computing, Inc.
5
6
# All Rights Reserved.
6
7
#
7
8
#    Licensed under the Apache License, Version 2.0 (the "License"); you may
159
160
            db.security_group_destroy(self.context, group['id'])
160
161
            db.instance_destroy(self.context, ref[0]['id'])
161
162
 
 
163
    def test_create_instance_associates_config_drive(self):
 
164
        """Make sure create associates a config drive."""
 
165
 
 
166
        instance_id = self._create_instance(params={'config_drive': True, })
 
167
 
 
168
        try:
 
169
            self.compute.run_instance(self.context, instance_id)
 
170
            instances = db.instance_get_all(context.get_admin_context())
 
171
            instance = instances[0]
 
172
 
 
173
            self.assertTrue(instance.config_drive)
 
174
        finally:
 
175
            db.instance_destroy(self.context, instance_id)
 
176
 
162
177
    def test_default_hostname_generator(self):
163
 
        cases = [(None, 'server_1'), ('Hello, Server!', 'hello_server'),
164
 
                 ('<}\x1fh\x10e\x08l\x02l\x05o\x12!{>', 'hello')]
 
178
        cases = [(None, 'server-1'), ('Hello, Server!', 'hello-server'),
 
179
                 ('<}\x1fh\x10e\x08l\x02l\x05o\x12!{>', 'hello'),
 
180
                 ('hello_server', 'hello-server')]
165
181
        for display_name, hostname in cases:
166
182
            ref = self.compute_api.create(self.context,
167
183
                instance_types.get_default_instance_type(), None,
347
363
        self.assertEquals(msg['priority'], 'INFO')
348
364
        self.assertEquals(msg['event_type'], 'compute.instance.create')
349
365
        payload = msg['payload']
350
 
        self.assertEquals(payload['tenant_id'], self.project_id)
 
366
        self.assertEquals(payload['project_id'], self.project_id)
351
367
        self.assertEquals(payload['user_id'], self.user_id)
352
368
        self.assertEquals(payload['instance_id'], instance_id)
353
369
        self.assertEquals(payload['instance_type'], 'm1.tiny')
371
387
        self.assertEquals(msg['priority'], 'INFO')
372
388
        self.assertEquals(msg['event_type'], 'compute.instance.delete')
373
389
        payload = msg['payload']
374
 
        self.assertEquals(payload['tenant_id'], self.project_id)
 
390
        self.assertEquals(payload['project_id'], self.project_id)
375
391
        self.assertEquals(payload['user_id'], self.user_id)
376
392
        self.assertEquals(payload['instance_id'], instance_id)
377
393
        self.assertEquals(payload['instance_type'], 'm1.tiny')
454
470
        self.assertEquals(msg['priority'], 'INFO')
455
471
        self.assertEquals(msg['event_type'], 'compute.instance.resize.prep')
456
472
        payload = msg['payload']
457
 
        self.assertEquals(payload['tenant_id'], self.project_id)
 
473
        self.assertEquals(payload['project_id'], self.project_id)
458
474
        self.assertEquals(payload['user_id'], self.user_id)
459
475
        self.assertEquals(payload['instance_id'], instance_id)
460
476
        self.assertEquals(payload['instance_type'], 'm1.tiny')