← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nova/tests/utils.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
https://launchpad.net/bugs/1073289
https://launchpad.net/bugs/1076442
[ 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:
nova/tests/utils.py
14
14
#    License for the specific language governing permissions and limitations
15
15
#
16
16
 
 
17
import platform
 
18
 
17
19
import nova.context
18
20
import nova.db
19
 
import nova.flags
20
21
from nova.image import glance
 
22
from nova.openstack.common import cfg
21
23
 
22
 
FLAGS = nova.flags.FLAGS
 
24
CONF = cfg.CONF
 
25
CONF.import_opt('use_ipv6', 'nova.config')
23
26
 
24
27
 
25
28
def get_test_admin_context():
72
75
 
73
76
 
74
77
def get_test_network_info(count=1):
75
 
    ipv6 = FLAGS.use_ipv6
 
78
    ipv6 = CONF.use_ipv6
76
79
    fake = 'fake'
77
80
    fake_ip = '0.0.0.0/0'
78
81
    fake_ip_2 = '0.0.0.1/0'
95
98
                           {'ip': fake_ip_2},
96
99
                           {'ip': fake_ip_3}]
97
100
    return [(network, mapping) for x in xrange(0, count)]
 
101
 
 
102
 
 
103
def is_osx():
 
104
    return platform.mac_ver()[0] != ''