more cleanup and pylint fixes

nova/auth/manager.py

@@ -574,7 +574,7 @@ class AuthManager(object):
 
         if not network_ref['vpn_public_port']:
             raise exception.NotFound('project network data has not been set')
-        return (network_ref['vpn_public_ip_str'],
+        return (network_ref['vpn_public_address'],
                 network_ref['vpn_public_port'])
 
     def delete_project(self, project, context=None):

nova/tests/network_unittest.py

@@ -28,7 +28,6 @@ from nova import flags
 from nova import test
 from nova import utils
 from nova.auth import manager
-from nova.network import service
 
 FLAGS = flags.FLAGS