rename networkdata to vpn

4 files changed, 10 insertions, 10 deletions

diff --git a/nova/auth/manager.py b/nova/auth/manager.py
index 312b569aa..cf920d607 100644
--- a/nova/auth/manager.py
+++ b/nova/auth/manager.py
@@ -37,7 +37,7 @@ from nova import objectstore # for flags
 from nova import utils
 from nova.auth import ldapdriver # for flags
 from nova.auth import signer
-from nova.network import networkdata
+from nova.network import vpn
 
 FLAGS = flags.FLAGS
 
@@ -531,7 +531,7 @@ class AuthManager(object):
         @return: A tuple containing (ip, port) or None, None if vpn has
         not been allocated for user.
         """
-        network_data = networkdata.NetworkData.lookup(Project.safe_id(project))
+        network_data = vpn.NetworkData.lookup(Project.safe_id(project))
         if not network_data:
             raise exception.NotFound('project network data has not been set')
         return (network_data.ip, network_data.port)
@@ -672,7 +672,7 @@ class AuthManager(object):
         zippy.writestr(FLAGS.credential_key_file, private_key)
         zippy.writestr(FLAGS.credential_cert_file, signed_cert)
 
-        network_data = networkdata.NetworkData.lookup(pid)
+        network_data = vpn.NetworkData.lookup(pid)
         if network_data:
             configfile = open(FLAGS.vpn_client_template,"r")
             s = string.Template(configfile.read())
diff --git a/nova/network/service.py b/nova/network/service.py
index afc20c0d5..1a61f49d4 100644
--- a/nova/network/service.py
+++ b/nova/network/service.py
@@ -28,7 +28,7 @@ from nova.auth import manager
 from nova.exception import NotFound
 from nova.network import exception
 from nova.network import model
-from nova.network import networkdata
+from nova.network import vpn
 
 FLAGS = flags.FLAGS
 
@@ -215,7 +215,7 @@ class VlanNetworkService(BaseNetworkService):
     def _on_set_network_host(self, user_id, project_id,
                              *args, **kwargs):
         """Called when this host becomes the host for a project"""
-        networkdata.NetworkData.create(project_id)
+        vpn.NetworkData.create(project_id)
 
     @classmethod
     def setup_compute_network(self, user_id, project_id, security_group,
diff --git a/nova/network/networkdata.py b/nova/network/vpn.py
index cec84287c..cec84287c 100644
--- a/nova/network/networkdata.py
+++ b/nova/network/vpn.py
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()