~ubuntu-branches/ubuntu/raring/nova/raring-proposed

« back to all changes in this revision

Viewing changes to nova/tests/test_pipelib.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Adam Gandelman, Chuck Short
  • Date: 2012-11-23 09:04:58 UTC
  • mfrom: (1.1.66)
  • Revision ID: package-import@ubuntu.com-20121123090458-91565o7aev1i1h71
Tags: 2013.1~g1-0ubuntu1
[ Adam Gandelman ]
* debian/control: Ensure novaclient is upgraded with nova,
  require python-keystoneclient >= 1:2.9.0. (LP: #1073289)
* debian/patches/{ubuntu/*, rbd-security.patch}: Dropped, applied
  upstream.
* debian/control: Add python-testtools to Build-Depends.

[ Chuck Short ]
* New upstream version.
* Refreshed debian/patches/avoid_setuptools_git_dependency.patch.
* debian/rules: FTBFS if missing binaries.
* debian/nova-scheudler.install: Add missing rabbit-queues and
  nova-rpc-zmq-receiver.
* Remove nova-volume since it doesnt exist anymore, transition to cinder-*.
* debian/rules: install apport hook in the right place.
* debian/patches/ubuntu-show-tests.patch: Display test failures.
* debian/control: Add depends on genisoimage
* debian/control: Suggest guestmount.
* debian/control: Suggest websockify. (LP: #1076442)
* debian/nova.conf: Disable nova-volume service.
* debian/control: Depend on xen-system-* rather than the hypervisor.
* debian/control, debian/mans/nova-conductor.8, debian/nova-conductor.init,
  debian/nova-conductor.install, debian/nova-conductor.logrotate
  debian/nova-conductor.manpages, debian/nova-conductor.postrm
  debian/nova-conductor.upstart.in: Add nova-conductor service.
* debian/control: Add python-fixtures as a build deps.

Show diffs side-by-side

added added

removed removed

Lines of Context:
16
16
from nova.cloudpipe import pipelib
17
17
from nova import context
18
18
from nova import crypto
19
 
from nova import flags
 
19
from nova.openstack.common import cfg
20
20
from nova import test
21
21
from nova import utils
22
22
 
23
 
 
24
 
FLAGS = flags.FLAGS
 
23
CONF = cfg.CONF
 
24
CONF.import_opt('vpn_key_suffix', 'nova.config')
25
25
 
26
26
 
27
27
class PipelibTest(test.TestCase):
50
50
            self.cloudpipe.launch_vpn_instance(self.context)
51
51
 
52
52
    def test_setup_security_group(self):
53
 
        group_name = "%s%s" % (self.project, FLAGS.vpn_key_suffix)
 
53
        group_name = "%s%s" % (self.project, CONF.vpn_key_suffix)
54
54
 
55
55
        # First attemp, does not exist (thus its created)
56
56
        res1_group = self.cloudpipe.setup_security_group(self.context)
61
61
        self.assertEqual(res1_group, res2_group)
62
62
 
63
63
    def test_setup_key_pair(self):
64
 
        key_name = "%s%s" % (self.project, FLAGS.vpn_key_suffix)
 
64
        key_name = "%s%s" % (self.project, CONF.vpn_key_suffix)
65
65
        with utils.tempdir() as tmpdir:
66
66
            self.flags(keys_path=tmpdir)
67
67