← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nova/tests/api/openstack/compute/contrib/test_networks.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/api/openstack/compute/contrib/test_networks.py
24
24
 
25
25
from nova.api.openstack.compute.contrib import networks
26
26
from nova import exception
 
27
from nova.openstack.common import cfg
27
28
from nova import test
28
29
from nova.tests.api.openstack import fakes
29
30
 
30
 
from nova import flags
31
 
 
32
 
 
33
 
FLAGS = flags.FLAGS
34
 
 
 
31
CONF = cfg.CONF
35
32
 
36
33
FAKE_NETWORKS = [
37
34
    {
137
134
 
138
135
    def create(self, context, **kwargs):
139
136
        subnet_bits = int(math.ceil(math.log(kwargs.get(
140
 
                        'network_size', FLAGS.network_size), 2)))
 
137
                        'network_size', CONF.network_size), 2)))
141
138
        fixed_net_v4 = netaddr.IPNetwork(kwargs['cidr'])
142
139
        prefixlen_v4 = 32 - subnet_bits
143
140
        subnets_v4 = list(fixed_net_v4.subnet(
144
141
                prefixlen_v4,
145
 
                count=kwargs.get('num_networks', FLAGS.num_networks)))
 
142
                count=kwargs.get('num_networks', CONF.num_networks)))
146
143
        new_networks = []
147
144
        new_id = max((net['id'] for net in self.networks))
148
145
        for index, subnet_v4 in enumerate(subnets_v4):