diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-08-05 12:29:50 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-08-05 12:29:50 -0700 |
| commit | 024ad9951dcf33f5a3468e9a790f1636770b2837 (patch) | |
| tree | 7017e71c9f51602fbab144ee9419b51828f9dfc0 /nova/tests | |
| parent | d1709793045de2f77f4a1fb06f63d27cbcf640d1 (diff) | |
rename networkdata to vpn
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/network_unittest.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nova/tests/network_unittest.py b/nova/tests/network_unittest.py index 49147d4ec..c7d3e86f0 100644 --- a/nova/tests/network_unittest.py +++ b/nova/tests/network_unittest.py @@ -25,8 +25,8 @@ from nova import test from nova import utils from nova.auth import manager from nova.network import model -from nova.network import networkdata from nova.network import service +from nova.network import vpn from nova.network.exception import NoMoreAddresses FLAGS = flags.FLAGS @@ -156,16 +156,16 @@ class NetworkTestCase(test.TrialTestCase): self.dnsmasq.release_ip(mac, firstaddress, hostname, net.bridge_name) def test_212_vpn_ip_and_port_looks_valid(self): - networkdata.NetworkData.create(self.projects[0].id) + vpn.NetworkData.create(self.projects[0].id) self.assert_(self.projects[0].vpn_ip) self.assert_(self.projects[0].vpn_port >= FLAGS.vpn_start_port) self.assert_(self.projects[0].vpn_port <= FLAGS.vpn_end_port) def test_too_many_vpns(self): vpns = [] - for i in xrange(networkdata.NetworkData.num_ports_for_ip(FLAGS.vpn_ip)): - vpns.append(networkdata.NetworkData.create("vpnuser%s" % i)) - self.assertRaises(networkdata.NoMorePorts, networkdata.NetworkData.create, "boom") + for i in xrange(vpn.NetworkData.num_ports_for_ip(FLAGS.vpn_ip)): + vpns.append(vpn.NetworkData.create("vpnuser%s" % i)) + self.assertRaises(vpn.NoMorePorts, vpn.NetworkData.create, "boom") for vpn in vpns: vpn.destroy() |