← Back to branch summary

~rlane/nova/ldapimprovements

« back to all changes in this revision

Viewing changes to nova/tests/network_unittest.py

  • Committer: Ryan Lane
  • Date: 2010-11-24 15:46:32 UTC
  • mfrom: (382.48.1 trunk)
  • Revision ID: laner@controller-20101124154632-zh7kwjuyyd02a2lh
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/network_unittest.py
41
41
        #             flags in the corresponding section in nova-dhcpbridge
42
42
        self.flags(connection_type='fake',
43
43
                   fake_network=True,
44
 
                   auth_driver='nova.auth.ldapdriver.FakeLdapDriver',
45
44
                   network_size=16,
46
45
                   num_networks=5)
47
46
        logging.getLogger().setLevel(logging.DEBUG)
127
126
        self.network.deallocate_floating_ip(self.context, float_addr)
128
127
        self.network.deallocate_fixed_ip(self.context, fix_addr)
129
128
        release_ip(fix_addr)
 
129
        db.floating_ip_destroy(context.get_admin_context(), float_addr)
130
130
 
131
131
    def test_allocate_deallocate_fixed_ip(self):
132
132
        """Makes sure that we can allocate and deallocate a fixed ip"""